wxd / MShopWeApp

Commit 84ae444e4f38ad49e8a462c5095a3df9b4a83a62

Authored by 后端研发-苏明海
2 parents 05be2e3b c86288d7

Merge branch 'test' into 'qa' 

Test

See merge request !65
Inline Side-by-side
Showing 4 changed files with 14 additions and 7 deletions
pages/user/order_detail/order_detail.js
  View file @84ae444
... ... @@ -128,10 +128,11 @@ Page({
128 128 ttd.data.data.pageData.forEach(function (eea, ii) {
129 129 var st = eea.status;
130 130 if (eea.goods_id == eeb.goods_id){
131   - r['has_rt'] = 1; //有部分退
  131 +
132 132 switch (eea.status){
133 133 case 0:
134 134 case 1://退款处理中
  135 + r['has_rt'] = 1; //有部分退
135 136 goodslist[iii]['return_btn'] = 2; break;
136 137 case 2://退款完成
137 138 goodslist[iii]['return_btn'] = 4;rt_ok_num++; break;
... ...
pages/user/order_detail/order_detail.wxml
  View file @84ae444
... ... @@ -131,7 +131,11 @@
131 131  
132 132 <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
133 133 <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
134   - <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
  134 +
  135 + <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4)}}">
  136 + <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
  137 + </block>
  138 +
135 139 <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
136 140  
137 141 <!---has_rt部分退---->
... ...
pages/user/order_list/order_list.js
  View file @84ae444
... ... @@ -143,10 +143,10 @@ Page({
143 143 ttd.data.data.pageData.forEach(function (eea, ii) {
144 144 var st = eea.status;
145 145 if (eea.goods_id == eeb.goods_id){
146   - data[ind]['has_rt'] = 1; //有部分退
147 146 switch (eea.status){
148 147 case 0:
149 148 case 1://退款处理中
  149 + data[ind]['has_rt'] = 1; //有部分退
150 150 goodslist[iii]['return_btn'] = 2; break;
151 151 case 2://退款完成
152 152 goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
... ...
pages/user/order_list/order_list.wxml
  View file @84ae444
... ... @@ -88,11 +88,13 @@
88 88 <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}"
89 89 url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
90 90 </block>
91   -
92 91  
93   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
94   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
95   - <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
  92 + <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
  93 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
  94 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
  95 + </block>
  96 +
  97 + <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
96 98 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
97 99 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
98 100 <navigator class="order-btn" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
... ...