From 2136ff415fd947d25c66ed74fb98331c48a353c6 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 23 Jul 2021 16:10:03 +0800
Subject: [PATCH] no message

---
 components/add-tips/index.js          | 2 +-
 pages/process/order-list/index.wxml   | 2 +-
 pages/process/outside-list/index.wxml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/add-tips/index.js b/components/add-tips/index.js
index 7412238..f6c4f23 100644
--- a/components/add-tips/index.js
+++ b/components/add-tips/index.js
@@ -50,7 +50,7 @@ Component({
   },
   methods: {
     hidden: function() {
-      // wx.setStorageSync(STORAGE_KEY, true)
+      wx.setStorageSync(STORAGE_KEY, true)
       this.setData({ SHOW_TOP: false })
       // this.shrink()
     },
diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index d4da470..1f515e2 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-list/index.wxml
@@ -65,7 +65,7 @@
         </view>
         <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
-            bind:click="cancelOrder" wx:if="{{item.status != 6}}">取消订单</van-button>
+            bind:click="cancelOrder" wx:if="{{item.status != 6 && item.status != 41 && item.status != 42}}">取消订单</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-id="{{item.id}}"
             bind:click="priceOrder" wx:if="{{item.status == 1}}">定价</van-button>
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index 16d9bf3..5819275 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -61,7 +61,7 @@
         </view>
         <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
-            bind:click="cancelOrder" wx:if="{{item.orderStatus != 6}}">取消订单</van-button>
+            bind:click="cancelOrder" wx:if="{{item.orderStatus != 6 && item.status != 41 && item.status != 42}}">取消订单</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"
             bind:click="editItem" wx:if="{{item.orderStatus == 0}}">修改订单</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"