Commit 4948a7ee96cc7fd96a16c30460b42d697661ed5c
1 parent
619d60a4
3.0 加密优化，和拆单优化
Showing
3 changed files
with
8 additions
and
2 deletions
packageG/pages/user/order_detail/order_detail.js
| @@ -137,7 +137,7 @@ Page({ | @@ -137,7 +137,7 @@ Page({ | ||
| 137 | r.order_status_detail = "待收货";r.receive_btn=1; | 137 | r.order_status_detail = "待收货";r.receive_btn=1; |
| 138 | if (r.exp_type == 0) r.shipping_btn=1; | 138 | if (r.exp_type == 0) r.shipping_btn=1; |
| 139 | } | 139 | } |
| 140 | - if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 2){ | 140 | + if (r.order_status == 1 && r.pay_status == 1 && (r.shipping_status == 2 || r.shipping_status == 3)){ |
| 141 | r.order_status_detail = "待收货"; r.receive_btn = 1; | 141 | r.order_status_detail = "待收货"; r.receive_btn = 1; |
| 142 | if (r.exp_type == 0) r.shipping_btn = 1; | 142 | if (r.exp_type == 0) r.shipping_btn = 1; |
| 143 | } | 143 | } |
pages/user/order_list/order_list.wxml
| @@ -267,6 +267,8 @@ | @@ -267,6 +267,8 @@ | ||
| 267 | hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view> | 267 | hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view> |
| 268 | <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}" | 268 | <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}" |
| 269 | hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view> | 269 | hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view> |
| 270 | + <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}" | ||
| 271 | + hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==3)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view> | ||
| 270 | 272 | ||
| 271 | <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator> | 273 | <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator> |
| 272 | <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator> | 274 | <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator> |
utils/request.js
| @@ -690,7 +690,11 @@ module.exports = { | @@ -690,7 +690,11 @@ module.exports = { | ||
| 690 | for(var i in data){ | 690 | for(var i in data){ |
| 691 | var item=data[i]; | 691 | var item=data[i]; |
| 692 | if (typeof item === 'string') { | 692 | if (typeof item === 'string') { |
| 693 | - data[i]=decodeURIComponent(item); //urldecode | 693 | + try { |
| 694 | + data[i]=decodeURIComponent(item); //urldecode | ||
| 695 | + }catch (err) { | ||
| 696 | + | ||
| 697 | + } | ||
| 694 | } | 698 | } |
| 695 | } | 699 | } |
| 696 | 700 |