Commit 1e2dc16a995dcd1a221192d47d53c1b00b02ae1e
1 parent
6b5bed4d
119893开发
Showing
4 changed files
with
51 additions
and
9 deletions
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
| @@ -82,7 +82,17 @@ Page({ | @@ -82,7 +82,17 @@ Page({ | ||
| 82 | r.order_status_detail="待支付"; r.pay_btn=1; | 82 | r.order_status_detail="待支付"; r.pay_btn=1; |
| 83 | } | 83 | } |
| 84 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0) | 84 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0) |
| 85 | - r.order_status_detail = "待发货"; | 85 | + { |
| 86 | + //自提的话 | ||
| 87 | + if (r.exp_type==1) | ||
| 88 | + { | ||
| 89 | + r.order_status_detail = "待自提"; | ||
| 90 | + } | ||
| 91 | + else | ||
| 92 | + { | ||
| 93 | + r.order_status_detail = "待发货"; | ||
| 94 | + } | ||
| 95 | + } | ||
| 86 | 96 | ||
| 87 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ | 97 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ |
| 88 | r.order_status_detail = "待收货";r.receive_btn=1; | 98 | r.order_status_detail = "待收货";r.receive_btn=1; |
packageD/pages/shop/order_detail/order_detail.js
| @@ -46,8 +46,17 @@ Page({ | @@ -46,8 +46,17 @@ Page({ | ||
| 46 | if (r.order_status == 0 && r.pay_status==0 ){ | 46 | if (r.order_status == 0 && r.pay_status==0 ){ |
| 47 | r.order_status_detail="待支付"; r.pay_btn=1; | 47 | r.order_status_detail="待支付"; r.pay_btn=1; |
| 48 | } | 48 | } |
| 49 | - if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0) | ||
| 50 | - r.order_status_detail = "待发货"; | 49 | + if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0){ |
| 50 | + //自提的话 | ||
| 51 | + if (r.exp_type==1) | ||
| 52 | + { | ||
| 53 | + r.order_status_detail = "待自提"; | ||
| 54 | + } | ||
| 55 | + else | ||
| 56 | + { | ||
| 57 | + r.order_status_detail = "待发货"; | ||
| 58 | + } | ||
| 59 | + } | ||
| 51 | 60 | ||
| 52 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ | 61 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ |
| 53 | r.order_status_detail = "待收货";r.receive_btn=1; | 62 | r.order_status_detail = "待收货";r.receive_btn=1; |
pages/user/order_detail/order_detail.js
| @@ -80,7 +80,15 @@ Page({ | @@ -80,7 +80,15 @@ Page({ | ||
| 80 | r.order_status_detail="待支付"; r.pay_btn=1; | 80 | r.order_status_detail="待支付"; r.pay_btn=1; |
| 81 | } | 81 | } |
| 82 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0) | 82 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0) |
| 83 | - r.order_status_detail = "待发货"; | 83 | + //自提的话 |
| 84 | + if (r.exp_type==1) | ||
| 85 | + { | ||
| 86 | + r.order_status_detail = "待自提"; | ||
| 87 | + } | ||
| 88 | + else | ||
| 89 | + { | ||
| 90 | + r.order_status_detail = "待发货"; | ||
| 91 | + } | ||
| 84 | 92 | ||
| 85 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ | 93 | if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ |
| 86 | r.order_status_detail = "待收货";r.receive_btn=1; | 94 | r.order_status_detail = "待收货";r.receive_btn=1; |
pages/user/order_list/order_list.wxml
| @@ -71,8 +71,14 @@ | @@ -71,8 +71,14 @@ | ||
| 71 | </block> | 71 | </block> |
| 72 | 72 | ||
| 73 | <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}"> | 73 | <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}"> |
| 74 | - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view> | ||
| 75 | - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> | 74 | + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}"> |
| 75 | + <block wx:if="{{item.exp_type==1}}">待自提</block> | ||
| 76 | + <block wx:else>待发货</block> | ||
| 77 | + </view> | ||
| 78 | + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}"> | ||
| 79 | + <block wx:if="{{item.exp_type==1}}">待自提</block> | ||
| 80 | + <block wx:else>待发货</block> | ||
| 81 | + </view> | ||
| 76 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> | 82 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> |
| 77 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | 83 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> |
| 78 | </view> | 84 | </view> |
| @@ -92,8 +98,14 @@ | @@ -92,8 +98,14 @@ | ||
| 92 | <view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view> | 98 | <view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view> |
| 93 | <view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view> | 99 | <view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view> |
| 94 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> | 100 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> |
| 95 | - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view> | ||
| 96 | - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view> | 101 | + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}"> |
| 102 | + <block wx:if="{{item.exp_type==1}}">待自提</block> | ||
| 103 | + <block wx:else>待发货</block> | ||
| 104 | + </view> | ||
| 105 | + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}"> | ||
| 106 | + <block wx:if="{{item.exp_type==1}}">待自提</block> | ||
| 107 | + <block wx:else>待发货</block> | ||
| 108 | + </view> | ||
| 97 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> | 109 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> |
| 98 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | 110 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> |
| 99 | </view> | 111 | </view> |
| @@ -109,7 +121,10 @@ | @@ -109,7 +121,10 @@ | ||
| 109 | <view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view> | 121 | <view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view> |
| 110 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> | 122 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> |
| 111 | <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}"> | 123 | <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}"> |
| 112 | - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view> | 124 | + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}"> |
| 125 | + <block wx:if="{{item.exp_type==1}}">待自提</block> | ||
| 126 | + <block wx:else>待发货</block> | ||
| 127 | + </view> | ||
| 113 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> | 128 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> |
| 114 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> | 129 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> |
| 115 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | 130 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> |