From a4266f6eaf0f5b726ddececfcc7c5e24c2cb1a7e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 22 Dec 2023 15:39:53 +0800
Subject: [PATCH] 商品的多规格的优化

---
 pages/goods/goodsInfo/buy_com_pop.wxml  |   2 +-
 pages/goods/goodsInfo/buy_integral.wxml |   2 +-
 pages/goods/goodsInfo/buy_pt.wxml       |   2 +-
 pages/goods/goodsInfo/goodsInfo.js      |  26 +++++++++++++++++++++++---
 pages/goods/goodsInfo/goodsInfo.wxml    | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------
 5 files changed, 95 insertions(+), 74 deletions(-)

diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index eb86ef4..4ab63e1 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -72,7 +72,7 @@
     <view class="xc-goods-attribute">
         <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
         <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-            <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1"
+            <view class="spec_bt {{sele_g.goods_id==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1"
                   data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
                 {{item.gg}}
             </view>
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index b413b66..a65dd47 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -61,7 +61,7 @@
 		              <view  class="xc-goods-attribute">
 		                  <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
 		                  <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-		                   <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
+		                   <view class="spec_bt {{sele_g.goods_id==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
 		                      {{item.gg}}
 		                    </view>
 		                 </view>
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 8d0de58..03015ca 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -85,7 +85,7 @@
       <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
       <block wx:if="{{is_normal==0}}">
         <view hidden="{{ismend==1}}" class="flex">
-          <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
+          <view class="spec_bt {{sele_g.goods_id==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
           </view>
         </view>
       </block>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 070db57..d19f07e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1195,7 +1195,8 @@ Page({
                 ee.setData({
                   data: t.data.data,
                   sele_g: t.data.data,
-                  userInfo: getApp().globalData.userInfo
+                  userInfo: getApp().globalData.userInfo,
+                  front_g: t.data.data,
                 });
 
                 //获取统一条形码,普通商品和优惠促销的商品
@@ -3469,8 +3470,9 @@ Page({
               item['disc'] = txt;
               if (item) this.setData({
                 sele_g: item,
-                gid: gid,
                 data: item,
+                //gid: gid,
+
               });
 
 
@@ -4267,10 +4269,13 @@ Page({
                 }
 
                 if(this.data.fir_set_sto==1){
+                     this.data.fir_set_sto=0;
                      if(th.data.def_pick_store && th.data.def_pick_store.pickup_id){
                          let cp_data=JSON.parse(JSON.stringify(th.data.def_pick_store));
                          th.setData({
-                           front_pick:cp_data
+                           front_pick:cp_data,
+                           front_only_pk:th.data.only_pk,
+                           front_def_pickpu_list:th.data.def_pickpu_list,
                          })
                      }
                 }
@@ -7317,6 +7322,11 @@ Page({
                       choice_store: function (ee) {
                         var th = this;
                         var ind = ee.currentTarget.dataset.ind;
+                        var isfront = ee.currentTarget.dataset.isfront;
+
+                        if(isfront)
+                            th.data.isfront=1;
+
                         var bconfig = th.data.bconfig;
                         this.setData({
                           keyword:''
@@ -7645,9 +7655,19 @@ 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: "门店配送方式不匹配，请选择其他门店",
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index a11ce83..449f0ed 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -115,8 +115,8 @@
  
           <view class="abs flex fs36" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
 
-            <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
-            <view wx:else class="word-line no_line_x fs24" style="margin-left: 10rpx;position: relative;top: -6rpx;color:#fff !important">￥{{filters.toFix(data.shop_price,2)}}</view>
+            <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(front_g.market_price,2)}}</view>
+            <view wx:else class="word-line no_line_x fs24" style="margin-left: 10rpx;position: relative;top: -6rpx;color:#fff !important">￥{{filters.toFix(front_g.shop_price,2)}}</view>
           </view>
 
           <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
@@ -143,8 +143,8 @@
                 <view class="flex fs35 xc-qtsign">￥</view>
                 <view class="fs50 val">{{prom_price}}</view>
               </view>
-              <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price no_line_c" style="color:#fff !important ">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
-              <view wx:else class="word-line no_line_x fs20 xc-qtunit-price" style="color:#fff !important ">￥{{filters.toFix(data.shop_price,2)}}</view>
+              <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price no_line_c" style="color:#fff !important ">零售价：￥{{filters.toFix(front_g.market_price,2)}}</view>
+              <view wx:else class="word-line no_line_x fs20 xc-qtunit-price" style="color:#fff !important ">￥{{filters.toFix(front_g.shop_price,2)}}</view>
             </view>
 
             <view class="abs white xc-nanber">
@@ -199,7 +199,7 @@
               <!-- 许程 商家团主页 -->
               <view class="xc-goods-explain flex-vertical-between">
                 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}">
-                  {{data.goods_name}}
+                  {{front_g.goods_name}}
                 </view>
                 <!-- 这个是分享按钮 -->
                 <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
@@ -236,7 +236,7 @@
 
             <block wx:for="{{teamgroup}}" wx:for-index="t_ind">
               <view class='group' wx:if="{{item.open_num>0}}" >
-              <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}" data-goodsid="{{data.goods_id}}">
+              <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}" data-goodsid="{{front_g.goods_id}}">
                 <!-- <view class="flex ai_c"> -->
                 <!-- //选项框头像 -->
                 <view class='gtou'>
@@ -283,11 +283,11 @@
                 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
 
                 <text wx:if="{{is_retail_price}}" class="rel_txt fs22 no_line_x" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
-                  &nbsp;&nbsp;&nbsp;零售价：￥{{filters.toFix(data.market_price,2)}}
+                  &nbsp;&nbsp;&nbsp;零售价：￥{{filters.toFix(front_g.market_price,2)}}
                 </text>
 
                 <text wx:else class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
-                  &nbsp;&nbsp;&nbsp;￥{{filters.toFix(data.shop_price,2)}}
+                  &nbsp;&nbsp;&nbsp;￥{{filters.toFix(front_g.shop_price,2)}}
                 </text>
 
               </view>
@@ -304,13 +304,13 @@
               {{prom_act.show_time_off}}开始兑换
             </view>
             <view class="goods-title">
-              <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
-              <view class="goods-name elli">{{data.goods_name}}</view>
+              <image wx:if="{{front_g.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
+              <view class="goods-name elli">{{front_g.goods_name}}</view>
             </view>
             <view class="goods-num">
               <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
               <view class="stock">
-                折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折
+                折扣：{{g_filters.num((prom_price?prom_price:0)*10/front_g.shop_price)}}折
               </view>
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
@@ -327,21 +327,21 @@
               <view class="co-red" wx:if="{{prom_type==0 || prom_type==3}}">
 
                 <view class="market-price flex" style="align-items: baseline;">
-                  <block wx:if="{{card_field && data[card_field]>0}}">
+                  <block wx:if="{{card_field && front_g[card_field]>0}}">
                     <view class="flex ai-center  grade-card-frame">
                       <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                       <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
                     </view>
                     <text class="rel yuan">￥</text>
-                    {{filters.toFix(data[card_field],2)}}
+                    {{filters.toFix(front_g[card_field],2)}}
                   </block>
 
                   <block  wx:else >
-                    <text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}
+                    <text class="rel yuan">￥</text>{{filters.toFix(front_g.shop_price,2)}}
                   </block>
 
                   <view  wx:if="{{is_retail_price}}"  class='yj' style="margin-left:10rpx">
-                    <text class="no_line_x">零售价：￥{{filters.toFix(data.market_price,2)}}</text>
+                    <text class="no_line_x">零售价：￥{{filters.toFix(front_g.market_price,2)}}</text>
                   </view>
 
                 </view>
@@ -355,33 +355,33 @@
             </view>
             <!-- 不是秒杀 -->
             <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
-            <view class="flex ai_and" wx:if="{{!card_field && is_no_plus && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && prom_type!=2 && prom_type!=4 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
+            <view class="flex ai_and" wx:if="{{!card_field && is_no_plus && g_filters.is_has_rank(rank_switch,front_g) && prom_type!=1 && prom_type!=2 && prom_type!=4 && card_list && card_list.length>0 && g_filters.get_card_price(front_g,card_list,1)!=''}}">
               <view class="flex ai-center  grade-card-frame card-frame">
                 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                 <view class="fs24 white view card-name ellipsis-1">
-                  {{g_filters.get_card_price(data,card_list,1)}}
+                  {{g_filters.get_card_price(front_g,card_list,1)}}
                 </view>
               </view>
               <view class="fs32 xc-black3 ai_and carde_frame">
-                <text class="fs26">￥</text>{{g_filters.get_card_price(data,card_list,0)}}
+                <text class="fs26">￥</text>{{g_filters.get_card_price(front_g,card_list,0)}}
               </view>
             </view>
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
-            <block wx:if="{{g_filters.is_has_rank(rank_switch,data) && is_no_plus}}">
+            <block wx:if="{{g_filters.is_has_rank(rank_switch,front_g) && is_no_plus}}">
               <!-- 不是秒杀，且会员不是等级会员 -->
-              <view wx:if="{{!card_field && prom_type!=1 && prom_type!=2  && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
+              <view wx:if="{{!card_field && prom_type!=1 && prom_type!=2  && card_list && card_list.length>0 && g_filters.get_card_price(front_g,card_list,1)!=''}}">
                 <view class="beauty-makeup-frame flex ai-center">
                   <view class="left flex ai-center jc_sa">
                     <view class="flex ai-center  grade-card-frame card-frame advert-card">
                       <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                       <view class="fs24 white view card-name ellipsis-1">
-                        {{g_filters.get_card_price(data,card_list,1)}}
+                        {{g_filters.get_card_price(front_g,card_list,1)}}
                       </view>
                     </view>
                     <view class="card-effect">
                       <view class="fs24 xc-black3">
-                        成为{{g_filters.get_card_price(data,card_list,1)}}立
-                        <text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元
+                        成为{{g_filters.get_card_price(front_g,card_list,1)}}立
+                        <text class="co-red">省{{filters.toFix(front_g.shop_price-g_filters.get_card_price(front_g,card_list,0),2)}}</text>元
                       </view>
                       <view class="fs22 xc-ash">开通会员 尽享更多优惠</view>
                     </view>
@@ -393,7 +393,7 @@
                 </view>
               </view>
               <!-- 立即续费的显示 -->
-              <view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1 && prom_type!=2 && card_name!=''}}">
+              <view wx:elif="{{is_near_date && front_g[card_field]>0 && prom_type!=1 && prom_type!=2 && card_name!=''}}">
                 <view class="beauty-makeup-frame flex ai-center">
                   <view class="left flex ai-center jc_sa">
                     <view class="flex ai-center grade-card-frame card-frame advert-card">
@@ -404,7 +404,7 @@
                       <view class="fs24 xc-black3">
                         成为{{card_name}}立
                         <text class="co-red">
-                          省{{filters.toFix(data.shop_price[card_field],2)}}
+                          省{{filters.toFix(front_g.shop_price[card_field],2)}}
                         </text>
                         元
                       </view>
@@ -422,13 +422,13 @@
             <!-- 许程商品名字 -->
             <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
               <view class="goods-title">
-                <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
-                <view class="goods-name elli">{{data.goods_name}}</view>
+                <image wx:if="{{front_g.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
+                <view class="goods-name elli">{{front_g.goods_name}}</view>
               </view>
             </view>
             <view class="goods-num" wx:if="{{prom_type!=1 && prom_type!=2}}">
-              <view class="sales">销量：{{data.sales_sum}}件</view>
-              <view class="stock">折扣：{{g_filters.num(data.disc)}}折</view>
+              <view class="sales">销量：{{front_g.sales_sum}}件</view>
+              <view class="stock">折扣：{{g_filters.num(front_g.disc)}}折</view>
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
 
@@ -439,8 +439,8 @@
                     <text class="fs30">￥</text>
                     {{prom_price}}
                   </view>
-                  <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
-                  <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
+                  <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x">零售价：￥{{filters.toFix(front_g.market_price,2)}}</view>
+                  <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(front_g.shop_price,2)}}</view>
                 </view>
                 <!-- 这个是分享按钮 -->
                 <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
@@ -453,11 +453,11 @@
 
             <!-- 秒杀的活动名称 -->
             <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4  && prom_type!=2}}">
-              {{sele_g.goods_name}}
+              {{front_g.goods_name}}
             </view>
 
             <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}">
-              <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{sele_g.goods_name}}</view>
+              <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{front_g.goods_name}}</view>
               <!-- 这个是分享按钮 -->
               <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
                 <view class="iconfont icon-share"></view>
@@ -676,7 +676,7 @@
 
 
         <!-- 许程 7.24暂时注释 -->
-        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1 && fir_quan.length>0 }}">
+        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && front_g.is_xz_yh !=1 && fir_quan.length>0 }}">
           <view data-coupon="1" bindtap="switchCoupon" class="cx-frame flex" style="position: relative">
             <view class="cx-sizs fs30">领券</view>
             <view class="flex ai_c f1 pdh20">
@@ -695,8 +695,8 @@
         </view>
 
         <!-- 门店收货地址 -->
-        <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>
@@ -704,36 +704,36 @@
               </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.is_no_dis_nor && prom_type==0}}">
+                  <view class="no_store" wx:elif="{{front_pick && front_pick.is_no_dis_nor && prom_type==0}}">
                     (该店不可售)
                   </view>
-                  <view class="no_store" wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}">
+                  <view class="no_store" wx:elif="{{front_pick && front_pick.is_no_dis_act}}">
                     (该店不可售)
                   </view>
-                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
+                  <view class="no_store" wx:elif="{{front_pick && !front_pick.CanOutQty && sales_rules>=2 && prom_type==0 && !front_g.whsle_id}}">
                     (库存不足)
                   </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>
@@ -803,6 +803,7 @@
             </view>
           </scroll-view>
         </view>
+
         <!-- 图文详情 -->
         <view class="bdt16">
           <view class="t_g_info">
@@ -816,7 +817,7 @@
                   <text>商品名称</text>
                 </view>
                 <view class="item_right">
-                  <text>{{data.goods_name}}</text>
+                  <text>{{front_g.goods_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
@@ -824,7 +825,7 @@
                   <text>商品编号</text>
                 </view>
                 <view class="item_right">
-                  <text>{{data.goods_sn}}</text>
+                  <text>{{front_g.goods_sn}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
@@ -832,7 +833,7 @@
                   <text>商品条码</text>
                 </view>
                 <view class="item_right">
-                  <text>{{data.sku}}</text>
+                  <text>{{front_g.sku}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
@@ -864,7 +865,7 @@
                   <text>规格</text>
                 </view>
                 <view class="item_right">
-                  <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
+                  <text>{{filters.show_gui_ge(front_g.goods_spec,front_g.goods_color)}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
@@ -872,7 +873,7 @@
                   <text>上架时间</text>
                 </view>
                 <view class="item_right">
-                  <text>{{data.on_time}}</text>
+                  <text>{{front_g.on_time}}</text>
                 </view>
               </view>
             </view>
@@ -904,7 +905,7 @@
               <text>商品名称</text>
             </view>
             <view class="item_right">
-              <text>{{data.goods_name}}</text>
+              <text>{{front_g.goods_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
@@ -912,7 +913,7 @@
               <text>商品编号</text>
             </view>
             <view class="item_right">
-              <text>{{data.goods_sn}}</text>
+              <text>{{front_g.goods_sn}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
@@ -920,7 +921,7 @@
               <text>商品条码</text>
             </view>
             <view class="item_right">
-              <text>{{data.sku}}</text>
+              <text>{{front_g.sku}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
@@ -952,7 +953,7 @@
               <text>规格</text>
             </view>
             <view class="item_right">
-              <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
+              <text>{{front_g.goods_spec==""?"规格1":front_g.goods_spec}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
@@ -960,7 +961,7 @@
               <text>上架时间</text>
             </view>
             <view class="item_right">
-              <text>{{data.on_time}}</text>
+              <text>{{front_g.on_time}}</text>
             </view>
           </view>
         </view>
@@ -1102,13 +1103,13 @@
         <view>购物车</view>
       </navigator>
     </view>
-    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">
+    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{front_g.goods.is_virtual}}">
       立即购买
     </view>
     <!-- 普通商品购买 -->
     <block wx:if="{{prom_type==0 || prom_type==3}}">
       <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
-      <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules>=2 }}">
+      <block wx:if="{{(front_g.store_count>0 && sales_rules==1) || sales_rules>=2 }}">
         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
         <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
       </block>
@@ -1177,11 +1178,11 @@
     <block wx:if="{{prom_type==6}}">
       <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">
         <view class="fir-v">
-          <!-- ￥{{data.shop_price,2)}} -->
-          <block wx:if="{{card_field && sele_g[card_field]>0}}">
-            {{filters.toFix(sele_g[card_field],2)}}
+
+          <block wx:if="{{card_field && front_g[card_field]>0}}">
+            {{filters.toFix(front_g[card_field],2)}}
           </block>
-          <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block>
+          <block wx:else>{{filters.toFix(front_g.shop_price,2)}}</block>
         </view>
         <view>单独购买</view>
       </view>
@@ -1236,10 +1237,10 @@
       <block wx:if="{{is_shopbuy}}">
         <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h">
           <view class="fir-v">
-            <block wx:if="{{card_field && sele_g[card_field]>0}}">
-              {{filters.toFix(sele_g[card_field],2)}}
+            <block wx:if="{{card_field && front_g[card_field]>0}}">
+              {{filters.toFix(front_g[card_field],2)}}
             </block>
-            <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block>
+            <block wx:else>{{filters.toFix(front_g.shop_price,2)}}</block>
           </view>
           <view>单独购买</view>
         </view>
@@ -1390,12 +1391,12 @@
         <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
 
           <block wx:if="{{sku_g_pt}}">
-            <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
+            <view class="spec_bt {{sele_g.goods_id==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
               {{item.gg}}
             </view>
           </block>
           <block wx:else>
-            <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
+            <view class="spec_bt {{sele_g.goods_id==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
               {{item.gg}}
             </view>
           </block>
--
libgit2 0.21.4