From b695770c3e3515eb66d10569569054f3e3d5cba2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 16 Jul 2021 18:29:06 +0800
Subject: [PATCH] 小程序bug 优化  1.  搭配购的物流  2.  订单详情页  3. 批量预约

---
 packageA/pages/my_service2/appment_main.js   |  7 ++++---
 packageA/pages/my_service2/appment_main.wxml |  2 +-
 packageA/pages/prom_list/prom_list.wxml      |  2 +-
 packageA/pages/prom_list/prom_list.wxss      | 12 +++++-------
 pages/cart/cart2/cart2.js                    |  8 +++++++-
 pages/user/order_detail/order_detail.wxml    |  2 +-
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js
index 87f4e4a..458fa0c 100644
--- a/packageA/pages/my_service2/appment_main.js
+++ b/packageA/pages/my_service2/appment_main.js
@@ -100,6 +100,7 @@ Page({
   
   //单个预约的提交成功及发送模版代码
   success: function() {
+    var user_id=getApp().globalData.userInfo.user_id;	    
 	wx.showLoading({ title: '加载中', });  		
     var th = this;
     var store = th.data.store_name; //门店名称
@@ -109,7 +110,7 @@ Page({
 	var req_arr={
 		"storageId": th.data.storageId,
 		"storeId": a.stoid,
-		"userId": getApp().globalData.userInfo.user_id,
+		"userId": user_id,
 		"remark": '',
 		"isxz": 1,
 		"states": 0,
@@ -152,13 +153,13 @@ Page({
 			if(res.data.data.length>1){
 				 var number = res.data.data[0].Number;
 				 wx.redirectTo({
-				   url: "/packageA/pages/my_service/tment_order_list?number=" + number+"&userid="+th.data.options.userid,
+				   url: "/packageA/pages/my_service/tment_order_list?number=" + number+"&userid="+user_id,
 				 });
 				
 			}else{
 				 var number = res.data.data[0].Number;
 				 wx.redirectTo({
-				   url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
+				   url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+user_id,
 				 });
 			}
 		    
diff --git a/packageA/pages/my_service2/appment_main.wxml b/packageA/pages/my_service2/appment_main.wxml
index 795ce28..34b26f9 100644
--- a/packageA/pages/my_service2/appment_main.wxml
+++ b/packageA/pages/my_service2/appment_main.wxml
@@ -93,7 +93,7 @@
 	</navigator>
 	<form report-submit='true' bindtap="sub_success">	
 		<button wx:if="{{is_sub}}" class="sub_appment flex-center">预约中..</button>
-		<button wx:else form-type="submit" class="sub_appment flex-center">帮你预约</button>
+		<button wx:else form-type="submit" class="sub_appment flex-center">提交预约</button>
 	</form>
 </view>
 
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index ea700e8..09192b3 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -137,7 +137,7 @@
             <view class="b_num">
                 <view>购买数量</view>
                 <view class="count">
-                    <view bindtap="subCartNum" class="sub">-</view>
+                    <view bindtap="subCartNum" class="sub {{goodsInputNum<=1?'gray':''}}">-</view>
                     <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
                     <view bindtap="addCartNum" class="add">+</view>
                 </view>
diff --git a/packageA/pages/prom_list/prom_list.wxss b/packageA/pages/prom_list/prom_list.wxss
index d7b4120..7bdbf97 100644
--- a/packageA/pages/prom_list/prom_list.wxss
+++ b/packageA/pages/prom_list/prom_list.wxss
@@ -30,7 +30,6 @@
     font-size: 32rpx;
     box-sizing: border-box;
     border-radius: 20rpx;
-    height: 72%;
 }
 
 .spec-model .pding{padding: 0 30rpx;}
@@ -138,12 +137,10 @@
 .spec-cart-btns {
     width: 92%;
     line-height: 70rpx;
-    margin: 0rpx auto;
-    margin-top: 160rpx;
+    margin-top: 40rpx;
+    margin-bottom: 20rpx;
     border-radius: 20rpx;
-    position: fixed;
-    bottom: 50rpx;
-    left: 4%;
+    margin-left: 4%;
 }
 
 .spec-cart-btn {
@@ -362,4 +359,5 @@
   .join-cart>view.no_store {
     width: 58%; background-color: #adadad;
   }
-.no_store{color:#d60021; font-size: 26rpx;}
\ No newline at end of file
+.no_store{color:#d60021; font-size: 26rpx;}
+.gray{color: #ccc;}
\ No newline at end of file
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 82bde84..648ea4c 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -746,7 +746,13 @@ Page({
 							  distr_t=dis_t;
 						  }
 					  }
-					  		  
+					  
+					  //自选的时候，系统配置了默认的配送方式是物流的时候
+					  if(distr_t==0 && th.data.json_d.pickupway && th.data.json_d.pickupway==1 ){
+						 et=0;
+					  }
+					  
+		
                       var ie = {
                          pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,bn_t_exp_t: distr_t,
                          goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0};
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index a048d97..f88cd54 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -77,7 +77,7 @@
             <view class="leave-word">{{order.user_note!=''?order.user_note:'无'}}</view>
         </view>
     </view>
-    <view class="price-information information">
+    <view class="price-information information" style="margin-bottom: 120rpx;">
            <view class="title" style="margin-bottom:10rpx" >价格信息</view>
            <view class="item pnew"  wx:if="{{order.is_zsorder==4}}">
                 <view>商品总价</view>
--
libgit2 0.21.4