Merge branch 'dev' into 'test'

Dev See merge request !444

Merge branch 'dev' into 'test'
Dev See merge request !444
后端研发-苏明海
2 parents ab16f4f3 345d37fc
Showing 3 changed files with 76 additions and 66 deletions
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -481,6 +481,12 @@ Page({
                 if(gg.prom_type==5){
                       t.data.data.prom_id = gg.prom_id ;
                       t.data.data.prom_type =5;
+
+                      //--主商品要有导购id和导购类型--
+                      if(gg.guide_id){
+                          t.data.data.guide_id=gg.guide_id;
+                          t.data.data.guide_type=gg.guide_type;
+                      }
                       th.setData({collocation_goods:gg.collocation_goods});
                       var cart_arr=new  Array();
@@ -1649,7 +1655,6 @@ Page({
     if (pdata.length==0) return;
     var str = JSON.stringify(pdata);
-    
     wx.showLoading({title: "加载中"});
     wx.request({
       url: oo.url + '/api/weshop/order/createWxdOrder',
@@ -370,72 +370,76 @@ Page({
         th.data.fir_def_store={}; //赋值空对象
         return false;
       }
-      var g_distr_type=th.data.data.distr_type;
-      //--如果默认门店的配送方式不对，就不能被选择--
-      if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
-        th.data.fir_def_store={}; //赋值空对象
-        return false;
-      }
+      //--定时器推迟一下--
+      setTimeout(function () {
+        var g_distr_type=th.data.data.distr_type;
+        //--如果默认门店的配送方式不对，就不能被选择--
+        if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
+          th.data.fir_def_store={}; //赋值空对象
+          return false;
+        }
+
+        var appd=getApp().globalData;
+        var w_time = setInterval(function() {
+          if (that.data.is_get_local_ok == 0) return false;
+          clearInterval(w_time);
+          var distance = null;
+          var e=JSON.parse(JSON.stringify(ee));
+
+          //如果有开启近距离的话,同时距离优不一样了
+          if (that.data.lat != null) {
+            //如果经纬度有变化的话
+            if( appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
+              that.data.fir_def_store=e;
+              that.setData({
+                def_pick_store: e,
+                sto_sele_name: e.pickup_name,
+                sto_sele_id: e.pickup_id,
+                sto_sele_distr: e.distr_type
+              })
+            }else{
+              //要用接口是获取距离，js的计算不准
+              getApp().request.promiseGet("/api/weshop/pickup/list",{
+                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
+              }).then(res=>{
+                if(res.data.code==0){
+                  e=res.data.data.pageData[0];
+                  if (e){
+                    appd.pk_store=e;
+                    that.data.fir_def_store=e;
+                    that.setData({
+                      def_pick_store: e,
+                      sto_sele_name: e.pickup_name,
+                      sto_sele_id: e.pickup_id,
+                      sto_sele_distr: e.distr_type
+                    })
+                  }
+
+                }
+              })
+            }
+
+            //e.distance = distance;
+            appd.lat=that.data.lat;
+            appd.lon=that.data.lon;
+
+          }else{
+            if (e) {
+              e.distance = null;
+              that.data.fir_def_store=e;
+              that.setData({
+                def_pick_store: e,
+                sto_sele_name: e.pickup_name,
+                sto_sele_id: e.pickup_id,
+                sto_sele_distr: e.distr_type
+              })
+            }
+          }
+
+        }, 500)
+      },1000)
-	  var appd=getApp().globalData;
-      var w_time = setInterval(function() {
-        if (that.data.is_get_local_ok == 0) return false;
-		clearInterval(w_time);
-        var distance = null;
-		var e=JSON.parse(JSON.stringify(ee));
-		
-		//如果有开启近距离的话,同时距离优不一样了
-        if (that.data.lat != null) {        
-		  //如果经纬度有变化的话
-		  if( appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
-			  that.data.fir_def_store=e;
-			  that.setData({
-			    def_pick_store: e,
-			    sto_sele_name: e.pickup_name,
-			    sto_sele_id: e.pickup_id,
-			    sto_sele_distr: e.distr_type
-			  })
-		  }else{			    
-				//要用接口是获取距离，js的计算不准
-				getApp().request.promiseGet("/api/weshop/pickup/list",{
-					data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, 			 		  
-				}).then(res=>{				 
-					if(res.data.code==0){
-						   e=res.data.data.pageData[0];				 
-						   if (e){
-								appd.pk_store=e;	
-								that.data.fir_def_store=e;
-								that.setData({
-								  def_pick_store: e,
-								  sto_sele_name: e.pickup_name,
-								  sto_sele_id: e.pickup_id,
-								  sto_sele_distr: e.distr_type
-								})
-						   }
-																						  
-					}		 						 
-				})				  
-		  }
-		  		  
-          //e.distance = distance;
-		  appd.lat=that.data.lat; 
-		  appd.lon=that.data.lon; 	  
-		 	  
-        }else{
-			 if (e) {
-				 e.distance = null;
-				 that.data.fir_def_store=e;
-				 that.setData({
-				   def_pick_store: e,
-				   sto_sele_name: e.pickup_name,
-				   sto_sele_id: e.pickup_id,
-				   sto_sele_distr: e.distr_type
-				 })
-			 }			
-		}
-             
-      }, 500)
     });
   },
@@ -344,7 +344,8 @@
                   <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view>
                 </view>
                 <view class="xc-val-price"> 
-                  <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                  <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                  <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view>
                   <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view>
                 </view>
               </view>