From 803c5e266b57dd54e954320b3c4cfda18b9f7fbf Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 3 May 2021 01:01:28 +0800
Subject: [PATCH] 拼团的bug优化

---
 pages/team/team_show/team_show.js   |  5 +++--
 pages/team/team_show/team_show.wxml | 15 +++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 0b4cbdb..c8af4a1 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -721,11 +721,12 @@ Page({
   go_pay:function () {
       var th=this;
 	  var def_pick_store=this.data.def_pick_store;
-	  if(def_pick_store) {
+	  if(def_pick_store && def_pick_store.pickup_id) {
 		  th.data.pick_id=def_pick_store.pickup_id;  //选择门店	 
 		  th.data.end_name=def_pick_store.pickup_name; 
 	  } 	  
-      if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th);
+      if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
+	  if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
 
       //----判断起购数----
       var qnum=parseFloat(th.data.teamlist.minbuynum);
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 21e42ec..4f03bb6 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -215,26 +215,29 @@
 				<view style="margin-top: 20rpx">
 					<view class="flex-space-between address ai_end xc-width ">
 						
-						<view class="flex ai_end" wx:if="{{def_pick_store}}">
+						<view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 							<text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 						
 							<view class="distance fs24 xc-ash" 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>
 						</view>
-						<view class="red-co fs28" bindtap="choice_store" wx:if="{{def_pick_store}}">
-							更多门店
-							<text class="right-arrow"></text>
-						</view>						
+						
+										
 						<view class="flex" bindtap="choice_store" wx:else>
 								<image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
 								<view class="fs28 xc-ash-9f">选择门店</view>
 					    </view>
+						
+						<view class="red-co fs28" bindtap="choice_store">
+							更多门店
+							<text class="right-arrow"></text>
+						</view>		
 
 						
 					</view>
 					<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
-					<view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store}}">地址:5{{def_pick_store.fulladdress}}</view>
+					<view class="fs24 xc-ash-9f xc-distance-top " wx:elif="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
 					
 				</view>
 				<!-- 商品的属性项目 -->
--
libgit2 0.21.4