多规格的优化

yvan.ni
1 parent ea12e918
Showing 6 changed files with 81 additions and 32 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
pages/goods/goodsInfo/buy_integral.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -200,7 +200,7 @@
 		  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
 		  					 </block>					 
 		  					 <block wx:else>	 						 						  																	
-		  							 <block wx:if="{{data.store_count<=0}}">
+		  							 <block wx:if="{{sele_g.store_count<=0}}">
 		  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
 		  							 </block>
 		  							 <block wx:else>								 
@@ -297,7 +297,11 @@ Page({
     nav_backgroundColor: "#ffffff",
     nav_type: 2,  //导航类型
     istop: 0, //是否置顶风格为1
-    searchbox_transparent: 1
+    searchbox_transparent: 1,
+
+    front_g:null,
+    fir_set_sto:1,     //最初始的一下，获取门店
+    front_pick:null,  //在详情页面上显示的门店
   },
@@ -1145,7 +1149,8 @@ Page({
           ee.setData({
             data: t.data.data,
             sele_g: t.data.data,
-            userInfo: getApp().globalData.userInfo
+            userInfo: getApp().globalData.userInfo,
+            front_g:ut.deep_cp(t.data.data)
           });
@@ -2332,12 +2337,11 @@ Page({
     if (this.data.openSpecModal_pt && this.data.is_normal) {
       this.get_sto();
       this.setData({
-        sele_g: this.data.data,
-        gid: this.data.data.goods_id
+        sele_g: this.data.front_g,
+        gid: this.data.front_g.goods_id
       })
       this.sele_spec_chech_activity();
-
     }
     this.setData({
@@ -3369,6 +3373,27 @@ Page({
     }
   },
+
+  //-- 处理首页的显示门店 ---
+  deal_front_pk(){
+    var th=this;
+    if(this.data.fir_set_sto==1){
+      this.data.fir_set_sto=0;
+      var cp_data=null
+      if(th.data.def_pick_store && th.data.def_pick_store.pickup_id){
+        cp_data=JSON.parse(JSON.stringify(th.data.def_pick_store));
+      }
+      th.setData({
+        front_pick:cp_data,
+        front_only_pk:th.data.only_pk,
+        front_def_pickpu_list:th.data.def_pickpu_list,
+        front_pickpu_listt:th.data.pickpu_list,
+        front_all_sto:th.data.all_sto,
+        front_is_show_sto_cat:th.data.is_show_sto_cat,
+      })
+    }
+  },
+
   //------------处理门店---------------
   deal_pickup(e) {
     var th = this;
@@ -3502,15 +3527,21 @@ Page({
                 th.setData({ def_pick_store: e.data.data.pageData[0] })
               }
             }
+
+            //-- 设置商品详情页面的门店显示情况 ---
+            th.deal_front_pk();
+
           } else {
-            th.setData({
-              is_show_sto_cat: -1,
-              only_pk: e.data.data.pageData
-            });
-            //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
-            if (!th.data.def_pick_store) {
-              th.setData({ def_pick_store: e.data.data.pageData[0] })
-            }
+              th.setData({
+                is_show_sto_cat: -1,
+                only_pk: e.data.data.pageData
+              });
+              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+              if (!th.data.def_pick_store) {
+                th.setData({ def_pick_store: e.data.data.pageData[0] })
+              }
+              //-- 设置商品详情页面的门店显示情况 ---
+              th.deal_front_pk();
           }
         }
@@ -3529,6 +3560,9 @@ Page({
           sto_sele_distr: e.data.data.pageData[0].distr_type
         })
       }
+
+      //-- 设置商品详情页面的门店显示情况 ---
+      th.deal_front_pk();
     }
   },
@@ -3998,6 +4032,7 @@ Page({
     }
     if(prom_type==9){
+      ee.get_sto();
       this.setData({ isshow: 1, });
     }
@@ -4500,6 +4535,7 @@ Page({
           var th = this;
           var ind = parseInt(e.currentTarget.dataset.ind);
+          th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
           //ind == 1是普通购买
           if (ind == 1) {
@@ -5940,7 +5976,10 @@ Page({
     var th = this;
     var ind = ee.currentTarget.dataset.ind;
+    var isfront = ee.currentTarget.dataset.isfront;
     var bconfig = th.data.bconfig;
+    th.data.isfront=0;
+    if(isfront) th.data.isfront=1;
       //如果开启了，则不在选择门店
       if(this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store){
@@ -6187,6 +6226,10 @@ Page({
     if (!th.data.sele_g) return false;
     //判断门店的配送方式是不是匹配
     var g_distr_type = th.data.sele_g.distr_type;
+    if(th.data.isfront==1){
+      g_distr_type = th.data.data.distr_type;
+    }
+
     if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) {
       wx.showToast({
         title: "门店配送方式不匹配",
@@ -6208,6 +6251,12 @@ Page({
         fir_pick_index: 0
       });
+      if(th.data.isfront){
+        th.setData({
+          front_pick: ut.deep_cp(item)
+        })
+      }
+
       if (openindstore == 1) {
         th.setData({
           openSpecModal: !0,
@@ -418,8 +418,8 @@
         </block>
         <!-- 门店收货地址 -->
-        <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
-          <view class="address_frame" bindtap="choice_store" data-ind="0">
+        <view class="xc-address_frame bdt16 flex-vertical xc-ash {{front_pick!=null?'sn_height':'on_height'}}">
+          <view class="address_frame" bindtap="choice_store" data-ind="0" data-isfront="1"  >
             <view class="flex-vertical-between ">
               <view class="flex-vertical select_store_height">
                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
@@ -427,30 +427,30 @@
               </view>
               <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
             </view>
-            <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <view wx:if="{{front_pick && front_pick.pickup_name}}">
               <view class="flex-space-between address ai_end pdv10">
                 <view>
-                  <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
+                  <text class="fs30 xc-black3 shop_name bold">{{front_pick.pickup_name}}</text>
                 </view>
-                <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
-                  距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                <view class="distance fs24" wx:if="{{front_pick.distance!=null}}">
+                  距离：{{front_pick.distance>1000?filters.toFix(front_pick.distance/1000,2)+"km":filters.toFix(front_pick.distance,0)+"m"}}
                 </view>
               </view>
-              <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+              <view class="no_store" wx:if="{{front_only_pk && !front_only_pk.length}}">(库存不足)</view>
               <block wx:else>
-                <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+                <view class="no_store" wx:if="{{front_def_pickpu_list && !front_def_pickpu_list.length}}">
                   (库存不足)
                 </view>
                 <block wx:else>
-                  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
+                  <view class="no_store" wx:if="{{front_pick && front_pick.is_no_dis}}">
                     (配送不匹配)
                   </view>
-                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
+                  <view class="no_store" wx:elif="{{front_pick && !front_pick.CanOutQty && !filters.is_virtual_gd(front_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
                     (库存不足)
                   </view>
                 </block>
               </block>
-              <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
+              <view class="fs24 xc-ash-9f">地址:{{front_pick.fulladdress}}</view>
             </view>
           </view>
         </view>
@@ -3,9 +3,9 @@
 		  <view class="pding"> 
 		            <icon bindtap="closeSpecModal_inte" class="modal-close" color="black" size="22" type="cancel"></icon>
 		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{front_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
 		              <view class="spec-goods-info">
-		                <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
+		                <view class="spec-goods-name ellipsis-2">{{front_g.goods_name}}</view>
 		                <view class="flex ai_end xc-val-money">            
 		                     <view class="spec-goods-price">
 		      				   <text wx:if="{{prom_integral}}">{{prom_integral}}积分</text>
@@ -105,7 +105,7 @@
 				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
 				  					 </block>					 
 				  					 <block wx:else>	 						 						  																	
-				  							 <block wx:if="{{data.store_count<=0}}">
+				  							 <block wx:if="{{sele_g.store_count<=0}}">
 				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
 				  							 </block>
 				  							 <block wx:else>								 
@@ -1203,7 +1203,7 @@ Page({
                   data: t.data.data,
                   sele_g: t.data.data,
                   userInfo: getApp().globalData.userInfo,
-                  front_g: t.data.data,
+                  front_g:  ut.deep_cp(t.data.data),
                 });
                 //获取统一条形码,普通商品和优惠促销的商品
@@ -5934,7 +5934,7 @@ Page({
                     //----------立即购买_pt-----------
                     buyNow_pt: function (e) {
-        
+
                       this.setData({
                         openSpecModal: 0,
                         openSpecModal_inte: 0,
@@ -8545,7 +8545,7 @@ Page({
                               });
                               //要进行还原    
                               this.setData({
-                                sele_g: this.data.front_g,
+                                sele_g: ut.deep_cp(this.data.front_g),
                                 gid: this.data.front_g.goods_id
                               })
                               this.get_sto();
@@ -728,7 +728,7 @@
                   <view class="no_store" wx:elif="{{front_pick && front_pick.is_no_dis_act}}">
                     (该店不可售)
                   </view>
-                  <view class="no_store" wx:elif="{{front_pick && !front_pick.CanOutQty && sales_rules>=2 && prom_type==0 && !front_g.whsle_id}}">
+                  <view class="no_store" wx:elif="{{front_pick && !front_pick.CanOutQty && !filters.is_virtual_gd(front_g.is_virtual)  && sales_rules>=2 && prom_type==0 && !front_g.whsle_id}}">
                     (库存不足)
                   </view>
                 </block>