Commit 0ba290c3a9689a93fea90a928748cddad8f39e11
1 parent
c601aa5c
订单列表中组团中的bug优化
Showing
2 changed files
with
4 additions
and
1 deletions
pages/user/order_detail/order_detail.js
| @@ -95,6 +95,9 @@ Page({ | @@ -95,6 +95,9 @@ Page({ | ||
| 95 | r.order_status_detail = "已作废"; | 95 | r.order_status_detail = "已作废"; |
| 96 | if (r.order_status == 6) | 96 | if (r.order_status == 6) |
| 97 | r.order_status_detail = "退款完成"; | 97 | r.order_status_detail = "退款完成"; |
| 98 | + if (r.pt_status == 1 && r.pt_prom_id>0) | ||
| 99 | + r.order_status_detail = "组团中"; | ||
| 100 | + | ||
| 98 | 101 | ||
| 99 | r['is_all_return'] = 0; | 102 | r['is_all_return'] = 0; |
| 100 | 103 |
pages/user/order_list/order_list.wxml
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | <!-- 商品评价状态 --> | 41 | <!-- 商品评价状态 --> |
| 42 | <view class="flex-center c-r"> | 42 | <view class="flex-center c-r"> |
| 43 | <!-- 订单状态 --> | 43 | <!-- 订单状态 --> |
| 44 | - <view wx:if="{{item.pt_status==1}}">组团中</view> | 44 | + <view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view> |
| 45 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> | 45 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> |
| 46 | <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}"> | 46 | <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}"> |
| 47 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view> | 47 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view> |