1 participants
-
Status changed to merged
-
mentioned in commit c86288d735f6612549e7c7d68e34cd97cf786a29
Showing
4 changed files
pages/user/order_detail/order_detail.js
| @@ -128,10 +128,11 @@ Page({ | @@ -128,10 +128,11 @@ Page({ | ||
| 128 | ttd.data.data.pageData.forEach(function (eea, ii) { | 128 | ttd.data.data.pageData.forEach(function (eea, ii) { |
| 129 | var st = eea.status; | 129 | var st = eea.status; |
| 130 | if (eea.goods_id == eeb.goods_id){ | 130 | if (eea.goods_id == eeb.goods_id){ |
| 131 | - r['has_rt'] = 1; //有部分退 | 131 | + |
| 132 | switch (eea.status){ | 132 | switch (eea.status){ |
| 133 | case 0: | 133 | case 0: |
| 134 | case 1://退款处理中 | 134 | case 1://退款处理中 |
| 135 | + r['has_rt'] = 1; //有部分退 | ||
| 135 | goodslist[iii]['return_btn'] = 2; break; | 136 | goodslist[iii]['return_btn'] = 2; break; |
| 136 | case 2://退款完成 | 137 | case 2://退款完成 |
| 137 | goodslist[iii]['return_btn'] = 4;rt_ok_num++; break; | 138 | goodslist[iii]['return_btn'] = 4;rt_ok_num++; break; |
pages/user/order_detail/order_detail.wxml
| @@ -131,7 +131,11 @@ | @@ -131,7 +131,11 @@ | ||
| 131 | 131 | ||
| 132 | <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view> | 132 | <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view> |
| 133 | <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view> | 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 | <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> | 139 | <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> |
| 136 | 140 | ||
| 137 | <!---has_rt部分退----> | 141 | <!---has_rt部分退----> |
pages/user/order_list/order_list.js
| @@ -143,10 +143,10 @@ Page({ | @@ -143,10 +143,10 @@ Page({ | ||
| 143 | ttd.data.data.pageData.forEach(function (eea, ii) { | 143 | ttd.data.data.pageData.forEach(function (eea, ii) { |
| 144 | var st = eea.status; | 144 | var st = eea.status; |
| 145 | if (eea.goods_id == eeb.goods_id){ | 145 | if (eea.goods_id == eeb.goods_id){ |
| 146 | - data[ind]['has_rt'] = 1; //有部分退 | ||
| 147 | switch (eea.status){ | 146 | switch (eea.status){ |
| 148 | case 0: | 147 | case 0: |
| 149 | case 1://退款处理中 | 148 | case 1://退款处理中 |
| 149 | + data[ind]['has_rt'] = 1; //有部分退 | ||
| 150 | goodslist[iii]['return_btn'] = 2; break; | 150 | goodslist[iii]['return_btn'] = 2; break; |
| 151 | case 2://退款完成 | 151 | case 2://退款完成 |
| 152 | goodslist[iii]['return_btn'] = 4; rt_ok_num++; break; | 152 | goodslist[iii]['return_btn'] = 4; rt_ok_num++; break; |
pages/user/order_list/order_list.wxml
| @@ -88,11 +88,13 @@ | @@ -88,11 +88,13 @@ | ||
| 88 | <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" | 88 | <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" |
| 89 | url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator> | 89 | url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator> |
| 90 | </block> | 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 | <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> | 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 | <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> | 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 | <navigator class="order-btn" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator> | 100 | <navigator class="order-btn" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator> |