Commit b695770c3e3515eb66d10569569054f3e3d5cba2

Authored by yvan.ni
1 parent b21b9e8c

小程序bug 优化 1. 搭配购的物流 2. 订单详情页 3. 批量预约

packageA/pages/my_service2/appment_main.js
@@ -100,6 +100,7 @@ Page({ @@ -100,6 +100,7 @@ Page({
100 100
101 //单个预约的提交成功及发送模版代码 101 //单个预约的提交成功及发送模版代码
102 success: function() { 102 success: function() {
  103 + var user_id=getApp().globalData.userInfo.user_id;
103 wx.showLoading({ title: '加载中', }); 104 wx.showLoading({ title: '加载中', });
104 var th = this; 105 var th = this;
105 var store = th.data.store_name; //门店名称 106 var store = th.data.store_name; //门店名称
@@ -109,7 +110,7 @@ Page({ @@ -109,7 +110,7 @@ Page({
109 var req_arr={ 110 var req_arr={
110 "storageId": th.data.storageId, 111 "storageId": th.data.storageId,
111 "storeId": a.stoid, 112 "storeId": a.stoid,
112 - "userId": getApp().globalData.userInfo.user_id, 113 + "userId": user_id,
113 "remark": '', 114 "remark": '',
114 "isxz": 1, 115 "isxz": 1,
115 "states": 0, 116 "states": 0,
@@ -152,13 +153,13 @@ Page({ @@ -152,13 +153,13 @@ Page({
152 if(res.data.data.length>1){ 153 if(res.data.data.length>1){
153 var number = res.data.data[0].Number; 154 var number = res.data.data[0].Number;
154 wx.redirectTo({ 155 wx.redirectTo({
155 - url: "/packageA/pages/my_service/tment_order_list?number=" + number+"&userid="+th.data.options.userid, 156 + url: "/packageA/pages/my_service/tment_order_list?number=" + number+"&userid="+user_id,
156 }); 157 });
157 158
158 }else{ 159 }else{
159 var number = res.data.data[0].Number; 160 var number = res.data.data[0].Number;
160 wx.redirectTo({ 161 wx.redirectTo({
161 - url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid, 162 + url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+user_id,
162 }); 163 });
163 } 164 }
164 165
packageA/pages/my_service2/appment_main.wxml
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 </navigator> 93 </navigator>
94 <form report-submit='true' bindtap="sub_success"> 94 <form report-submit='true' bindtap="sub_success">
95 <button wx:if="{{is_sub}}" class="sub_appment flex-center">预约中..</button> 95 <button wx:if="{{is_sub}}" class="sub_appment flex-center">预约中..</button>
96 - <button wx:else form-type="submit" class="sub_appment flex-center">帮你预约</button> 96 + <button wx:else form-type="submit" class="sub_appment flex-center">提交预约</button>
97 </form> 97 </form>
98 </view> 98 </view>
99 99
packageA/pages/prom_list/prom_list.wxml
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 <view class="b_num"> 137 <view class="b_num">
138 <view>购买数量</view> 138 <view>购买数量</view>
139 <view class="count"> 139 <view class="count">
140 - <view bindtap="subCartNum" class="sub">-</view> 140 + <view bindtap="subCartNum" class="sub {{goodsInputNum<=1?'gray':''}}">-</view>
141 <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> 141 <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
142 <view bindtap="addCartNum" class="add">+</view> 142 <view bindtap="addCartNum" class="add">+</view>
143 </view> 143 </view>
packageA/pages/prom_list/prom_list.wxss
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 font-size: 32rpx; 30 font-size: 32rpx;
31 box-sizing: border-box; 31 box-sizing: border-box;
32 border-radius: 20rpx; 32 border-radius: 20rpx;
33 - height: 72%;  
34 } 33 }
35 34
36 .spec-model .pding{padding: 0 30rpx;} 35 .spec-model .pding{padding: 0 30rpx;}
@@ -138,12 +137,10 @@ @@ -138,12 +137,10 @@
138 .spec-cart-btns { 137 .spec-cart-btns {
139 width: 92%; 138 width: 92%;
140 line-height: 70rpx; 139 line-height: 70rpx;
141 - margin: 0rpx auto;  
142 - margin-top: 160rpx; 140 + margin-top: 40rpx;
  141 + margin-bottom: 20rpx;
143 border-radius: 20rpx; 142 border-radius: 20rpx;
144 - position: fixed;  
145 - bottom: 50rpx;  
146 - left: 4%; 143 + margin-left: 4%;
147 } 144 }
148 145
149 .spec-cart-btn { 146 .spec-cart-btn {
@@ -362,4 +359,5 @@ @@ -362,4 +359,5 @@
362 .join-cart>view.no_store { 359 .join-cart>view.no_store {
363 width: 58%; background-color: #adadad; 360 width: 58%; background-color: #adadad;
364 } 361 }
365 -.no_store{color:#d60021; font-size: 26rpx;}  
366 \ No newline at end of file 362 \ No newline at end of file
  363 +.no_store{color:#d60021; font-size: 26rpx;}
  364 +.gray{color: #ccc;}
367 \ No newline at end of file 365 \ No newline at end of file
pages/cart/cart2/cart2.js
@@ -746,7 +746,13 @@ Page({ @@ -746,7 +746,13 @@ Page({
746 distr_t=dis_t; 746 distr_t=dis_t;
747 } 747 }
748 } 748 }
749 - 749 +
  750 + //自选的时候,系统配置了默认的配送方式是物流的时候
  751 + if(distr_t==0 && th.data.json_d.pickupway && th.data.json_d.pickupway==1 ){
  752 + et=0;
  753 + }
  754 +
  755 +
750 var ie = { 756 var ie = {
751 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, 757 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,
752 goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0}; 758 goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0};
pages/user/order_detail/order_detail.wxml
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <view class="leave-word">{{order.user_note!=''?order.user_note:'无'}}</view> 77 <view class="leave-word">{{order.user_note!=''?order.user_note:'无'}}</view>
78 </view> 78 </view>
79 </view> 79 </view>
80 - <view class="price-information information"> 80 + <view class="price-information information" style="margin-bottom: 120rpx;">
81 <view class="title" style="margin-bottom:10rpx" >价格信息</view> 81 <view class="title" style="margin-bottom:10rpx" >价格信息</view>
82 <view class="item pnew" wx:if="{{order.is_zsorder==4}}"> 82 <view class="item pnew" wx:if="{{order.is_zsorder==4}}">
83 <view>商品总价</view> 83 <view>商品总价</view>