From 1037a9aa2c6e468e98cd9e4c8c5659edf887188a Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 21 Dec 2023 13:54:13 +0800
Subject: [PATCH] 商品多规格的优化

---
 pages/goods/goodsInfo/buy_com_pop.wxml |  2 +-
 pages/goods/goodsInfo/buy_pt.wxml      |  4 ++--
 pages/goods/goodsInfo/goodsInfo.js     | 10 +++++++---
 pages/goods/goodsInfo/goodsInfo.wxml   | 29 +++++++++++++++--------------
 4 files changed, 25 insertions(+), 20 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_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 8d0de58..f8283a4 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -85,14 +85,14 @@
       <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>
 
       <block wx:else>
         <view hidden="{{ismend==1}}" class="flex">
-          <view class="spec_bt {{sele_g.goods_id==item.goods_id?'act':''}}" 
+          <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>
         </view>
       </block>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2af60b2..ecedf9e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -285,6 +285,9 @@ Page({
         istop: 0, //是否置顶风格为1
         searchbox_transparent: 1,
         template_id:[],//订阅消息id
+
+        front_pick:null,  //商品详情页面的默认门店
+
       },
 
       //------初始化加载----------
@@ -1192,6 +1195,7 @@ Page({
                 ee.setData({
                   data: t.data.data,
                   sele_g: t.data.data,
+                  front_g:t.data.data,
                   userInfo: getApp().globalData.userInfo
                 });
 
@@ -2720,7 +2724,8 @@ Page({
 
             this.setData({
               openSpecModal: !1,
-              openSpecModal_pt: !1
+              openSpecModal_pt: !1,
+              openSpecModal_flash_normal: !1
             });
           },
 
@@ -3466,8 +3471,7 @@ Page({
               item['disc'] = txt;
               if (item) this.setData({
                 sele_g: item,
-                gid: gid,
-                data: item,
+                //data: item,
               });
 
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index a11ce83..075160b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -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">
@@ -728,7 +728,7 @@
                   <view class="no_store" wx:elif="{{def_pick_store && def_pick_store.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="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0 && !front_g.whsle_id}}">
                     (库存不足)
                   </view>
                 </block>
@@ -737,6 +737,7 @@
             </view>
           </view>
         </view>
+
         <!-- 保障服务 -->
         <view class="bz_view flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
@@ -1108,7 +1109,7 @@
     <!-- 普通商品购买 -->
     <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>
@@ -1178,10 +1179,10 @@
       <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>
@@ -1338,7 +1339,7 @@
                 已售：{{prom_act.buy_num+prom_act.virtual}}
               </view>
               <view class="spec-goods-stock" wx:else>已售：{{prom_act.buy_num}}</view>
-              <view class="spec-goods-stock">可售：{{(prom_act.is_virtual_count && prom_act.virtual) ? (prom_act.goods_num - prom_act.buy_num - prom_act.virtual) : (prom_act.goods_num-prom_act.buy_num)}}</view>
+              <view class="spec-goods-stock">可售：{{(prom_act.is_virtual_count && prom_act.virtual)?(prom_act.goods_num - prom_act.buy_num - prom_act.virtual) : (prom_act.goods_num-prom_act.buy_num)}}</view>
             </view>
           </block>
           <block wx:if="{{prom_type==2}}">
@@ -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