From 6d6d51615f73b9b9dbc1f05d0e4d32e182b558e8 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 18 Sep 2021 11:11:43 +0800
Subject: [PATCH] 组合购选择了门店，再次点击还要能购选择！ 但是再添加了商品的时候，门店不能更换

---
 packageB/pages/zuhegou/index/index.js   | 5 +++--
 packageB/pages/zuhegou/index/index.wxml | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 0d7eac4..aec9511 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -1411,9 +1411,10 @@ Page({
             item = th.data.sec_sto.s_arr[index];
         }
 
-        if (!th.data.sele_g) return false;
         //判断门店的配送方式是不是匹配
-        var g_distr_type = th.data.sele_g.distr_type;
+        var g_distr_type=0;
+        if (th.data.sele_g)
+            g_distr_type = th.data.sele_g.distr_type;
         if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) {
             wx.showToast({
                 title: "门店配送方式不匹配",
diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml
index 55fa95d..3528c56 100644
--- a/packageB/pages/zuhegou/index/index.wxml
+++ b/packageB/pages/zuhegou/index/index.wxml
@@ -17,7 +17,11 @@
 
 
     <view class="c_w mt20 fs32">门店:
-       <text wx:if="{{def_pick_store}}">{{def_pick_store.pickup_name}}</text>
+       <block  wx:if="{{def_pick_store}}">
+           <text wx:if="{{all_price>0}}">{{def_pick_store.pickup_name}}</text>
+           <text wx:else  bindtap="choose_store">{{def_pick_store.pickup_name}}</text>
+       </block>
+
        <text wx:else bindtap="choose_store" >请选择门店</text>
     </view>
 
--
libgit2 0.21.4