3.0 加密优化，和拆单优化

yvan.ni
1 parent 619d60a4
Showing 3 changed files with 8 additions and 2 deletions
packageG/pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.wxml
utils/request.js
@@ -137,7 +137,7 @@ Page({
                     r.order_status_detail = "待收货";r.receive_btn=1;
                     if (r.exp_type == 0) r.shipping_btn=1;
                 }
-                if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 2){
+                if (r.order_status == 1 && r.pay_status == 1 && (r.shipping_status == 2 || r.shipping_status == 3)){
                   r.order_status_detail = "待收货"; r.receive_btn = 1;
                   if (r.exp_type == 0) r.shipping_btn = 1;
                 }
@@ -267,6 +267,8 @@
 					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>
 	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
 					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>
+            <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
+					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>
  
 				<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>	 
 			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
@@ -690,7 +690,11 @@ module.exports = {
       for(var i in data){
         var item=data[i];
         if (typeof item === 'string') {
-          data[i]=decodeURIComponent(item); //urldecode
+          try {
+            data[i]=decodeURIComponent(item); //urldecode
+          }catch (err) {
+
+          }
         }
       }