预售的功能优化

yvan.ni
1 parent e352ca04
Showing 14 changed files with 275 additions and 169 deletions
app.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/goodsInfo/g_filter.wxs
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageC/pages/presell/list/list.js
packageC/pages/presell/list/list.wxml
pages/goods/goodsList/g_filter.wxs
pages/goods/search/g_filter.wxs
pages/goods/search/search.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/index/index/index.wxss
utils/auth.js
@@ -51,7 +51,7 @@ App({
       config2: null,  //门店配置
       code: null,
       heigth:0,
-      user_id:null,//13324010,//4755274,
+      user_id:null,//5682094,
       buy_now:null,
       picklist:null,    //门店列表
       wuliuprice: null, //物流价格表
@@ -129,47 +129,70 @@ App({
         var th=this;
         var pages = getCurrentPages();             //获取加载的页面
         var currentPage = pages[pages.length - 1];  //获取当前页面的对象
-		var turl="/api/weshop/storeconfig/get/" + th.globalData.setting.stoid;
-		
-		th.promiseGet(turl,{}).then(res=>{
-			var o=res;
-			if(o.data.code==0){
-			                       th.globalData.config2 = o.data.data;
-									//有配置成要验证过期，因为过期的小程序没有办法审核
-									if(th.globalData.config2 && th.globalData.config2.is_overdue){
-																				
-										 //要开始验证，小程序有没有购买和过期 
-										 if(!currentPage || currentPage.route.indexOf('error/error')==-1 || currentPage.route.indexOf('index/index')==-1){
-										     var tt=this.globalData.wxapp_buy_obj;
-										     if (!tt){
-										         this.get_isbuy(function (){
-										             tt=th.globalData.wxapp_buy_obj;
-										             if (tt.isout == 1){
-										                 th.promiseGet('/api/weshop/store/get/'+t.stoid,{}).then(res=>{
-															 
-															 if(!th.err_going){
-																 wx.reLaunch({
-																	 url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:"+res.data.data.store_tel,
-																 });
-															 }
-										                 })
-										             }
-										             else if (tt.isbuy == 0){
-														 
-														  if(!th.err_going){
-															  wx.reLaunch({
-															      url: "/pages/error/error?msg=还未购买小程序",
-															  });
-														  }
-														 
-													 }
-										                
-										         })
-										     }
-										 }
-									}
-			}
-		})
+
+        if(!th.globalData.wxapp_buy_obj) {
+            var turl = "/api/weshop/storeconfig/get/" + th.globalData.setting.stoid;
+            th.promiseGet(turl, {}).then(res => {
+                var o = res;
+                if (o.data.code == 0) {
+                    th.globalData.config2 = o.data.data;
+                    //有配置成要验证过期，因为过期的小程序没有办法审核
+                    if (th.globalData.config2 && th.globalData.config2.is_overdue) {
+
+                        //要开始验证，小程序有没有购买和过期
+                        if (!currentPage || currentPage.route.indexOf('error/error') == -1 || currentPage.route.indexOf('index/index') == -1) {
+                            var tt = this.globalData.wxapp_buy_obj;
+                            if (!tt) {
+                                this.get_isbuy(function () {
+                                    tt = th.globalData.wxapp_buy_obj;
+                                    if (tt && tt.isout == 1) {
+                                        th.promiseGet('/api/weshop/store/get/' + t.stoid, {}).then(res => {
+
+                                            if (!th.err_going) {
+                                                wx.reLaunch({
+                                                    url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
+                                                });
+                                            }
+                                        })
+                                    }
+                                    else if (tt && tt.isbuy == 0) {
+
+                                        if (!th.err_going) {
+                                            wx.reLaunch({
+                                                url: "/pages/error/error?msg=还未购买小程序",
+                                            });
+                                        }
+
+                                    }
+
+                                })
+                            }
+                        }
+                    }
+                }
+            })
+
+        }
+        else{
+            var tt = th.globalData.wxapp_buy_obj;
+            if (tt && tt.isout == 1) {
+                th.promiseGet('/api/weshop/store/get/' + t.stoid, {}).then(res => {
+                    if (!th.err_going) {
+                        wx.reLaunch({
+                            url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
+                        });
+                    }
+                })
+            }
+            else if (tt && tt.isbuy == 0) {
+                if (!th.err_going) {
+                    wx.reLaunch({
+                        url: "/pages/error/error?msg=还未购买小程序",
+                    });
+                }
+
+            }
+        }
         //获取一下门店的基本信息
         this.getConfig();
@@ -417,11 +440,11 @@ App({
            arr.splice(0, 2);
        }
         var arr_tabbar=["/pages/index/index/index",
-												"/pages/goods/categoryList/categoryList",
+						"/pages/goods/categoryList/categoryList",
                        "/pages/goods/categoryList/categoryList?type=2",
                        "/pages/goods/categoryList/categoryList?type=1",
                        "/pages/cart/cart/cart","/pages/user/index/index",
-											 "/pages/distribution/distribution"];
+					   "/pages/distribution/distribution"];
         if(arr_tabbar.indexOf(url)!=-1){
              if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
              if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;        
@@ -481,8 +504,8 @@ App({
 					    success:function (res) {
 					        th.globalData.pk_store=null;
 					        if(res.data.code==0 && res.data.data && res.data.data.isstop==0){
-					            //--门店的数量大于5个才要关心门店的分类有没有关闭--
-								if(res.data.data.category_id && num>5){
+					            //--门店的数量大于10个才要关心门店的分类有没有关闭--
+								if(res.data.data.category_id && num>10){
 					                th.request.get( "/api/weshop/storagecategory/get/"+os.stoid+"/"+res.data.data.category_id, {
 					                    data: {},
 					                    success: function (ee) {
@@ -537,7 +560,8 @@ App({
                 store_id: this.globalData.setting.stoid,
                 user_id: this.globalData.user_id,
                 state:0,
-                is_gift:0
+                is_gift:0,
+                pageSize:300
             },
             success: function(e) {
                 var num = 0;
@@ -546,13 +570,11 @@ App({
                         num += e.data.data.pageData[i].goods_num;
                     }
                 }
-
                 /*---
                 wx.setTabBarBadge({ //tabbar右上角添加文本
                     index: 2, ////tabbar下标
                     text: '' + num //显示的内容
                 });--*/
-
                 //-- 读取服务卡的数量 --
                 that.promiseGet("/api/weshop/cartService/page",{
                     data:{
@@ -619,6 +641,7 @@ App({
         this.globalData.config=null;                       //清除config的缓存	
 		this.globalData.gr_index=0;                        //商品分组的序列
         this.globalData.pk_store=null;
+        this.globalData.wxapp_buy_obj=null
     },
@@ -719,12 +742,6 @@ App({
 					resolve(user_info);
 				};
 			});
-
-
-
-
-
-
 		},
@@ -404,9 +404,9 @@ Page({
         var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, goods_id: order_goods.goods_id };
         if(presell.deposit_pay_time>0){
-            pre_data.timetype=2;
+            pre_data.timetype=12;
         }
-        
+
         pre_data.user_id = order.user_id;
         var isok=1;
         await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
@@ -423,11 +423,6 @@ Page({
             return false;
         }
-
-
-
-
-
         //等待定金
         if(order.order_status<2 && presell.deposit_pay_time<=0 ){
             th.setData({wait_dj:1})
@@ -447,6 +442,17 @@ Page({
         }
+        //------获取预售主表----------
+        await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellForm/get/"+os.stoid+"/"+presell.prom_id, {}).then(res => {
+            if (res.data.code == 0 && res.data.data) {
+                th.setData({
+                   act: res.data.data,
+                });
+
+            }
+        })
+
+
         //---获取商品---
         await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + order_goods.goods_id, {}).then(res => {
             goods = res.data.data;
@@ -1939,21 +1945,47 @@ Page({
     //-- 获取时间差 --
     get_diff(){
-        if(this.data.presell.kw_start_time>ut.gettimestamp()){
-            this.setData({no_start:1})
-        }else if(this.data.presell.kw_end_time<ut.gettimestamp()){
-            this.setData({is_end:1})
-        }else {
-            var end_time=this.data.presell.kw_end_time;
-            var e_str=ut.formatTime(end_time);
-            var new_date = new Date(); //新建一个日期对象，默认现在的时间
-            var old_date = new Date(e_str.replace(/-/g,'/')); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
-            var difftime = (new_date - old_date)/1000; //计算时间差,并把毫秒转换成秒
-            var days = parseInt(difftime/86400); // 天  24*60*60*1000
-            var hours = parseInt(difftime/3600)-24*days;    // 小时 60*60 总小时数-过去的小时数=现在的小时数
-            var minutes = parseInt(difftime%3600/60); // 分钟 -(day*24) 以60秒为一整份 取余 剩下秒数 秒数/60 就是分钟数
-            var seconds = parseInt(difftime%60);  // 以60秒为一整份 取余 剩下秒数
-            this.setData({days:days,hours:hours,minutes:minutes,seconds:seconds})
+
+        switch (this.data.act.presell_type) {
+            //部分定金
+            case 0:
+                if (this.data.act.pay_begindate > ut.gettimestamp()) {
+                    this.setData({no_start: 1})
+                } else if (this.data.act.pay_enddate < ut.gettimestamp()) {
+                    this.setData({is_end: 1})
+                } else {
+                    var end_time = this.data.act.pay_enddate;
+                    var e_str = ut.formatTime(end_time);
+                    var new_date = new Date(); //新建一个日期对象，默认现在的时间
+                    var old_date = new Date(e_str.replace(/-/g, '/')); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
+                    var difftime = (new_date - old_date) / 1000; //计算时间差,并把毫秒转换成秒
+                    var days = parseInt(difftime / 86400); // 天  24*60*60*1000
+                    var hours = parseInt(difftime / 3600) - 24 * days;    // 小时 60*60 总小时数-过去的小时数=现在的小时数
+                    var minutes = parseInt(difftime % 3600 / 60); // 分钟 -(day*24) 以60秒为一整份 取余 剩下秒数 秒数/60 就是分钟数
+                    var seconds = parseInt(difftime % 60);  // 以60秒为一整份 取余 剩下秒数
+                    this.setData({days: days, hours: hours, minutes: minutes, seconds: seconds})
+                }
+                break;
+            //全额付款
+            case 1:
+                if (this.data.act.start_time > ut.gettimestamp()) {
+                    this.setData({no_start: 1})
+                } else if (this.data.act.end_time < ut.gettimestamp()) {
+                    this.setData({is_end: 1})
+                } else {
+                    var end_time = this.data.act.end_time;
+                    var e_str = ut.formatTime(end_time);
+                    var new_date = new Date(); //新建一个日期对象，默认现在的时间
+                    var old_date = new Date(e_str.replace(/-/g, '/')); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
+                    var difftime = (new_date - old_date) / 1000; //计算时间差,并把毫秒转换成秒
+                    var days = parseInt(difftime / 86400); // 天  24*60*60*1000
+                    var hours = parseInt(difftime / 3600) - 24 * days;    // 小时 60*60 总小时数-过去的小时数=现在的小时数
+                    var minutes = parseInt(difftime % 3600 / 60); // 分钟 -(day*24) 以60秒为一整份 取余 剩下秒数 秒数/60 就是分钟数
+                    var seconds = parseInt(difftime % 60);  // 以60秒为一整份 取余 剩下秒数
+                    this.setData({days: days, hours: hours, minutes: minutes, seconds: seconds})
+                }
+                break;
+
         }
     },
@@ -2028,7 +2060,7 @@ Page({
         if(th.data.user_note){
             dd.user_note=th.data.user_note;
         }
-        dd.order_amount=th.data.order_m-th.data.presell.presell_deposit;
+        dd.order_amount= parseFloat(th.data.order_m-th.data.presell.presell_deposit).toFixed(2);
         console.log(JSON.stringify(dd));
         wx.request({
@@ -2048,23 +2080,31 @@ Page({
                         function () {
                             //---用余额支付---
                             getApp().my_warnning("支付成功", 1, th);
+
+
+                            var send_time=th.data.pre_arr.delivery_date;
+                            if(th.data.pre_arr.delivery_type==2){
+                                send_time=th.data.pre_arr.delivery_daynum*3600;
+                            }
+
                             setTimeout(function () {
-                                th.setData({isclose: 0});
-                                th.onShow();
+                                th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_sh':1,send_time:send_time});
                             }, 1000)
-
                         }, function () {
                             getApp().my_warnning("支付失败", 0, th);
                         })
                 } else {
                     if (t.data.code == 0) {
+
+                        var send_time=th.data.pre_arr.delivery_date;
+                        if(th.data.pre_arr.delivery_type==2){
+                            send_time=th.data.pre_arr.delivery_daynum*3600;
+                        }
                         //---用余额支付---
                         getApp().my_warnning("支付成功", 1, th);
                         setTimeout(function () {
-                            th.setData({isclose: 0});
-
-                            th.onShow();
+                            th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_sh':1,send_time:send_time});
                         }, 1000)
                     } else {
                         getApp().my_warnning(t.data.msg, 1, th);
@@ -97,10 +97,24 @@ var g_filters = {
 			} else {
 				return value.toFixed(0);
 			};
-		}, 
+		},
+
+		//跳转的接口
+		get_goods_url:function(item){
+
+		   console.log(item,111)
+		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
+		   if(item.prom_type==8){
+		    url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&pre_id="+item.id
+		   }
+		   return url1;
+		}
+
+
 }
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
 	  get_card_price:g_filters.get_card_price,
-		num:g_filters.num,
+	  num:g_filters.num,
+	  get_goods_url:g_filters.get_goods_url,
 }
 \ No newline at end of file
@@ -255,6 +255,7 @@ Page({
     var ee = this, that = ee, th = ee,
       pre_id = t.pre_id,
       gid = t.goods_id,
+      presell_id = t.prom_id,
       first_leader = t.first_leader,
       room_id = t.room_id,
       room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
@@ -306,7 +307,7 @@ Page({
     }
     this.setData({
-        gid:gid,pre_id:pre_id
+        gid:gid,pre_id:pre_id,presell_id:presell_id
     })
     if (first_leader) {
@@ -3557,7 +3558,6 @@ Page({
             //s.showWarning("设置默认门店地址失败", null, 500, !1);
             getApp().my_warnning("设置默认门店地址失败", 0, th)
           }
-
         }
       });
@@ -3904,16 +3904,43 @@ Page({
     var th = this;
     var presell_id = null;
     var pre_arr = null;
-    //------获取预售从表----------
-    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(!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,
+                })
+            }
+        })
+    }
+
+
     if (!presell_id) {
       wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 })
       return false;
@@ -3940,7 +3967,7 @@ Page({
         th.data.all_pre_goods=e.data.data.pageData;
         var idx=e.data.data.pageData.findIndex(function (ele) {
-            return ele.id== th.data.pre_id;
+            return ele.id== th.data.presellList.id;
         })
         pre_arr = e.data.data.pageData[idx];
         th.setData({ pre_arr: pre_arr })
@@ -495,15 +495,15 @@
     </navigator>
   </view>
-  <view class="fs24 f1 flex ai-center bg-FF4732 t-c white" style="border-radius:10rpx ">
-    <view class="pdh20">
+  <view class="fs24 f1 flex ai-center bg-FF4732 t-c white" style="border-radius:10rpx;justify-content: center">
+    <view style="padding: 0 6rpx">
       <view class="">{{filters.format_time(presellForm.end_time,2)}} 预售结束</view>
       <!-- <view class="">08.30 23:59:59 开始发货</view> -->
       <view class="" wx:if="{{presellForm.delivery_type==1}}">{{filters.format_time(presellForm.delivery_date,2)}} 开始发货</view>
       <view class="" wx:else>付款{{presellForm.delivery_daynum}} 天后发货</view>
     </view>
-    <view class="pdh20 line" bindtap="openSpecModel" data-ind="2">
+    <view class="line" bindtap="openSpecModel" data-ind="2" style="margin-left: 10rpx; padding-left: 10rpx">
       <view class="">支付定金</view>
       <view class="flex">
         定金
@@ -51,7 +51,7 @@ Page({
         })
         var userInfo=getApp().globalData.userInfo;
-        if(userInfo && goodlist.length==0){
+        if(userInfo && this.data.goodlist.length==0){
             //调用列表
             this.get_list();
         }else{
@@ -62,7 +62,7 @@
                 </view>
                 <view class="kill-btn ">
-                    <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">去抢购</navigator>
+                    <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
                 </view>
             </view>
         </view>
@@ -79,8 +79,20 @@ var g_filters = {
 				 if(min_name.length>4)	min_name=min_name.substring(0, 8);
 			     return min_name;
 		},
+		//跳转的接口
+        		get_goods_url:function(item){
+
+        		   console.log(item,111)
+        		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
+        		   if(item.prom_type==8){
+        		    url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
+        		   }
+        		   return url1;
+        		}
 }
+
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
 	  get_card_price:g_filters.get_card_price,   
+	  get_goods_url:g_filters.get_goods_url,
 }
 \ No newline at end of file
@@ -80,8 +80,20 @@ var g_filters = {
 				 if(min_name.length>7 )	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
+
+
+        		get_goods_url:function(item){
+        		   console.log(item,111)
+        		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
+        		   if(item.prom_type==8){
+        		      url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
+        		   }
+        		   return url1;
+        		}
 }
+
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
-	  get_card_price:g_filters.get_card_price,   
+	  get_card_price:g_filters.get_card_price,
+	  get_goods_url:g_filters.get_goods_url
 }
 \ No newline at end of file
@@ -28,7 +28,7 @@
     </navigator>
   </view>
   <view class="choice_list">
-    <navigator class="choice_item flex ai-center" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+    <navigator class="choice_item flex ai-center" url="{{g_filter.get_goods_url(item)}}" wx:for="{{requestData}}" wx:key="{{index}}">
       <view class="img-wrap">
         <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
       </view>
@@ -292,38 +292,45 @@ Page({
   },
   async onShow() {
-    var th = this;
-    //-- 登录回来判断弹框 --
-    var userInfo = getApp().globalData.userInfo;
-    if (userInfo) {
-      th.is_festival();
-      var new_nav = th.data.new_nav;
-      if (new_nav == "") {
-        th.is_new();
-      }
-    }
+        var th = this;
+        //-- 登录回来判断弹框 --
+        var user_id=getApp().globalData.user_id;
-      var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
-      if(userInfo){
-          pre_data.user_id= userInfo.user_id;
-      }
+        if(!user_id){
+          var userinfo=wx.getStorageSync('userinfo');
+          if(userinfo) user_id=userinfo.user_id
+        }
-      getApp().request.get("/api/weshop/marketing/marketingPresellList/page",{
-          data:pre_data,
-          success:function (e) {
-              if(e.data.code==0 && e.data.data.pageData && e.data.data.pageData.length>0 ){
-                  var pre_data=e.data.data.pageData;
-                  var arr = new Array();
-                  //--三个三个一组---
-                  for (var i = 0; i < pre_data.length; i += 3) {
-                      arr.push(pre_data.slice(i, i + 3));
-                  }
-                  th.setData({
-                      preGoods: arr
-                  });
-              }
+        if (user_id) {
+          th.is_festival();
+          var new_nav = th.data.new_nav;
+          if (new_nav == "") {
+            th.is_new();
           }
-      })
+        }
+
+        var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
+        if(user_id){
+            pre_data.user_id= user_id;
+        }
+
+        getApp().request.get("/api/weshop/marketing/marketingPresellList/page",{
+            data:pre_data,
+            success:function (e) {
+                if(e.data.code==0 && e.data.data.pageData && e.data.data.pageData.length>0 ){
+                    var pre_data=e.data.data.pageData;
+                    var arr = new Array();
+                    //--三个三个一组---
+                    for (var i = 0; i < pre_data.length; i += 3) {
+                        arr.push(pre_data.slice(i, i + 3));
+                    }
+                    th.setData({
+                        preGoods: arr
+                    });
+                }
+            }
+        })
+
       //优惠券要实时更新
@@ -367,7 +374,7 @@ Page({
       } else {
         getApp().globalData.isLoad_ad = 1;
       }
-    }, 500)
+    }, 1500)
@@ -485,34 +492,7 @@ Page({
         //th.countDown();
       }
     });
-    //-----预售----
-    //调用接口获取数据
-    await getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
-      data: {
-        is_end: 0,
-        store_id: os.stoid,
-        pageSize: 10,
-        timetype: 1
-      },
-      success: function (res) {
-        if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
-          var list = th.data.goodlist ? th.data.goodlist : [];
-          var arr = res.data.data.pageData;
-          //数组合起来
-          for (var i in arr) {
-            list.push(arr[i]);
-          }
-          th.setData({ goodlist: list });
-          if (arr.length < 10) {
-            th.setData({ no_more: 1 })
-          }
-        } else {
-          th.setData({ no_more: 1 })
-        }
-        th.setData({ is_get: 1 })
-      }
-    });
     //----拼单-----
     await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
@@ -153,8 +153,8 @@
 			</view>
 		</navigator>
 		<view class="seckill-list">
-			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="25rpx">
-				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods">
+			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="105rpx">
+				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="750rpx !important;">
 					<navigator class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
 						<view class="imgview ">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
@@ -203,7 +203,7 @@
 						<view class="imgview presell">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="preGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
 						</view>
-						<view class="ellipsis-2 mar-top10" style="height: 70rpx;">{{aitem.goods_name}}</view>
+						<view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.goods_name}}</view>
 						<view class="co-red mar-top10 flex jc_sb ali-c">
 							<view>
 								<text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
@@ -433,7 +433,7 @@
 .p_swiper {
 	display: flex;
 	padding: 0 10rpx;
-	box-sizing: border-box;
+	box-sizing: content-box;
 }
 .nav {
@@ -153,8 +153,10 @@ module.exports = {
         ab.get("/api/weshop/users/get/" + oo.stoid+"/"+app_d.user_id, {
 		  data:{r:Math.random()},				
           success: function (e) {
-            app_d.userInfo = e.data.data;
-            "function" == typeof t && t(e.data.data);
+              app_d.userInfo = e.data.data;
+              app_d.user_id = e.data.data.user_id;
+              wx.setStorageSync("userinfo",app_d.userInfo);
+             "function" == typeof t && t(e.data.data);
           },
         });
       }else{
@@ -186,7 +188,9 @@ module.exports = {
       ab.get("/api/weshop/users/get/" + oo.stoid + "/" + app_d.user_id, {
 		isShowLoading:0,
         success: function (e) {
-          app_d.userInfo = e.data.data;
+            app_d.userInfo = e.data.data;
+            app_d.user_id = e.data.data.user_id;
+            wx.setStorageSync("userinfo",app_d.userInfo);
           "function" == typeof t && t(e.data.data);
         },
       });