diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index 63cc9bc..a77b892 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -319,7 +319,7 @@
         <view class="information bdr14 mgt20">
             <block wx:if="{{act.presell_type==0}}">
                 <view class="item">
-                <view>阶段一：定金（待付款）</view>
+                <view>阶段一：定金</view>
                 <view class="co-red">￥{{filters.toFix(pre_arr.presell_money*order.order_goods.goods_num,2)}}元</view>
             </view>
             <view class="item">
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index f3561eb..e505955 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -3900,109 +3900,115 @@ Page({
   },
 
   //获取预售的信息
-  async get_pre_prom(func) {
-    var th = this;
-    var presell_id = null;
-    var pre_arr = null;
-
-    if(!th.data.pre_id){
-        var presell_id=th.data.presell_id;
-        var url="/api/weshop/marketing/marketingPresellList/list"
-        var rd={
-            store_id:os.stoid,
-            presell_id:presell_id,
-            goods_id:th.data.gid
-        }
-        //------获取预售从表----------
-        await getApp().request.promiseGet(url, {
-           data:rd
-        }).then(res => {
-            if (res.data.code == 0 && res.data.data && res.data.data.length>0) {
-                var arr =res.data.data[0];
-                presell_id = arr.presell_id;
-                th.setData({
-                    presellList: arr,
-                })
+   async get_pre_prom(func) {
+        var th = this;
+        var presell_id = null;
+        var pre_arr = null;
+
+        if (!th.data.pre_id) {
+            var presell_id = th.data.presell_id;
+            var url = "/api/weshop/marketing/marketingPresellList/list"
+            var rd = {
+                store_id: os.stoid,
+                presell_id: presell_id,
+                goods_id: th.data.gid
             }
-        })
+            //------获取预售从表----------
+            await getApp().request.promiseGet(url, {
+                data: rd
+            }).then(res => {
+                if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                    var arr = res.data.data[0];
+                    presell_id = arr.presell_id;
+                    th.setData({
+                        presellList: arr,
+                    })
+                }
+            })
 
 
-    }else{
-        //------获取预售从表----------
-        await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + th.data.pre_id, {}).then(res => {
-            if (res.data.code == 0 && res.data.data) {
-                var arr = res.data.data;
-                presell_id = arr.presell_id;
-                th.setData({
-                    presellList: arr,
-                })
-            }
-        })
-    }
+        } else {
+            //------获取预售从表----------
+            await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + th.data.pre_id, {}).then(res => {
+                if (res.data.code == 0 && res.data.data) {
+                    var arr = res.data.data;
+                    presell_id = arr.presell_id;
+                    th.setData({
+                        presellList: arr,
+                    })
+                }
+            })
+        }
 
 
-    if (!presell_id) {
-      wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
-      ut.wx_back();
-      return false;
-    }
-    //------获取预售主表----------
-    await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {}).then(res => {
-      if (res.data.code == 0 && res.data.data) {
-        var act_data=res.data.data;
-        if(act_data.is_end){
-            wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
+        if (!presell_id) {
+            wx.showToast({title: "未找到活动商品", icon: 'none', duration: 3000});
             ut.wx_back();
             return false;
         }
-        if(act_data.isuse==0){
-              wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
-              ut.wx_back();
-              return false;
-         }
-
-         var end_time=act_data.pay_enddate;
-         if(act_data.presell_type==1){
-             end_time=act_data.end_time;
-         }
-         if(end_time<ut.gettimestamp()){
-             wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
-             ut.wx_back();
-             return false;
-         }
+        //------获取预售主表----------
+        await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {}).then(res => {
+            if (res.data.code == 0 && res.data.data) {
+                var act_data = res.data.data;
+                if (act_data.is_end) {
+                    wx.showToast({title: "活动已经结束", icon: 'none', duration: 3000});
+                    setTimeout(function () {
+                        ut.wx_back();
+                    }, 1100)
+                    return false;
+                }
+                if (act_data.isuse == 0) {
+                    wx.showToast({title: "活动未启用", icon: 'none', duration: 3000});
+                    setTimeout(function () {
+                        ut.wx_back();
+                    }, 1100)
+                    return false;
+                }
 
-        th.setData({
-          presellForm: res.data.data,
-        });
-        th.countDown(res.data.data.end_time)
-      }
-    })
-    var userInfo = getApp().globalData.userInfo;
-    var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1,prom_type:8,prom_id:presell_id };
-    if (userInfo) {
-      pre_data.user_id = userInfo.user_id;
-    }
-    await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
-      data: pre_data,
-    }).then(e => {
-      if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
+                var end_time = act_data.pay_enddate;
+                if (act_data.presell_type == 1) {
+                    end_time = act_data.end_time;
+                }
+                if (end_time < ut.gettimestamp()) {
+                    wx.showToast({title: "活动已经结束", icon: 'none', duration: 3000});
+                    setTimeout(function () {
+                        ut.wx_back();
+                    }, 1100)
+                    return false;
+                }
+
+                th.setData({
+                    presellForm: res.data.data,
+                });
+                th.countDown(res.data.data.end_time)
+            }
+        })
+        var userInfo = getApp().globalData.userInfo;
+        var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id};
+        if (userInfo) {
+            pre_data.user_id = userInfo.user_id;
+        }
+        await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
+            data: pre_data,
+        }).then(e => {
+            if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
 
-        th.data.all_pre_goods=e.data.data.pageData;
+                th.data.all_pre_goods = e.data.data.pageData;
 
-        var idx=e.data.data.pageData.findIndex(function (ele) {
-            return ele.id== th.data.presellList.id;
+                var idx = e.data.data.pageData.findIndex(function (ele) {
+                    return ele.id == th.data.presellList.id;
+                })
+                pre_arr = e.data.data.pageData[idx];
+                th.setData({pre_arr: pre_arr})
+                th.data.prom_buy_limit = pre_arr.vip_butyqty;
+            }
         })
-        pre_arr = e.data.data.pageData[idx];
-        th.setData({ pre_arr: pre_arr })
-        th.data.prom_buy_limit=pre_arr.vip_butyqty;
-      }
-    })
-    if (!pre_arr) {
-      wx.showToast({ title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000 })
-    }
-    if (func) {
-      func();
+        if (!pre_arr) {
+            wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000})
+        }
+        if (func) {
+            func();
+        }
     }
-  }
 
 });
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 82511e6..89b1b89 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -55,7 +55,7 @@
   </view>
 	
   <view class="choice_list" wx:if="{{!isToggle}}">
-    <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+    <navigator class="choice_item" url="{{g_filter.get_goods_url(item)}}" wx:for="{{requestData}}" wx:key="{{index}}">
       <view class="img-wrap">
         <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
       </view>
@@ -170,7 +170,7 @@
 		
 		
 		<view class="choice_list on" wx:else>
-		  <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+		  <navigator class="choice_item" url="{{g_filter.get_goods_url(item)}}" wx:for="{{requestData}}" wx:key="{{index}}">
 		    <view class="img-wrap">
 		      <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
 		    </view>
@@ -285,12 +285,8 @@
 			
 			
 			
-		
-		
 
 		
-		
-		
     <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">暂无相关商品</view>
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 1b04544..eec3d37 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -153,7 +153,6 @@ Page({
           }
         })
       }
-
       else {
         th.onload_init();
       }
@@ -623,11 +622,11 @@ Page({
 
   //--判断小程序是否过期--
   setappdata: function (t) {
-    if (t.isout == 1)
+    if (t && t.isout == 1)
       wx.reLaunch({
         url: "/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel,
       });
-    if (t.isbuy == 0)
+    if (t && t.isbuy == 0)
       wx.reLaunch({
         url: "/pages/error/error?msg=还未购买小程序",
       });