待发货商品也增加取消订单

packageUser/pages/user/order/order.wxml

@@ -145,7 +145,7 @@
       <view class="orderDetail-btn__red"  wx:if="{{order.status === 'unpay'}}">支付</view>
     </navigator>
     <view class="orderDetail-btn__red" bindtap="confirmPopup" wx:if="{{order.status === 'dispatch'}}">确认收货</view>
-    <view class="orderDetail-btn__black" bindtap="CancelPopup" wx:if="{{order.status === 'unpay'}}">取消订单</view>
+    <view class="orderDetail-btn__black" bindtap="CancelPopup" wx:if="{{order.status === 'unpay' || order.status === 'processing'}}">取消订单</view>
 	
 	<button class="orderDetail-btn__wxkf" open-type="contact"
 	bindtap ='copy' data-copy='{{order.order_id}}'

packageUser/pages/user/orders/orders.wxml

@@ -76,7 +76,7 @@
           <view class="order-btn__red" wx:if="{{item.status === 'unpay'}}">支付</view>
         </navigator>
         <view class="order-btn__red" bindtap="confirmPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'dispatch'}}">确认收货</view>
-        <view class="order-btn__black_wl" bindtap="CancelPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'unpay'}}">取消订单</view>
+        <view class="order-btn__black_wl" bindtap="CancelPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'unpay' || item.status === 'processing'}}">取消订单</view>
         
 <!--         <view class="order-btn__black" wx:if="{{item.status === 'dispatch' && item.status === 'dispatch'}}">查看物流</view> -->
         <!-- <view class="order-btn__black">删除订单</view> -->

pages/projects/project-detail/project-detail.js

@@ -241,9 +241,11 @@ Page({
 	var error = function(err){
 		console.log('project item error',err);
 		if(err.data.err_code == "productOffSale"){
-			wx.switchTab({
-				url:'../../home/home'
-			})
+			setTimeout(function(){
+				wx.switchTab({
+					url:'../../home/home'
+				})
+			},1500);
 		}
 	}
     _request.$get(url, params, success,error)