From 994b700892419e3bf8519bde42bbcc065126d119 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 6 Jul 2022 16:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/MyOrder.vue                  | 2 +-
 manager/src/views/promotions/kanjia/kanjia-activity-goods.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue
index eb0966d0..f7da6acd 100644
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -32,7 +32,7 @@
             </div>
           </div>
           <div>
-            <Button @click="delOrder(order.sn)" class="del-btn mr_10 fontsize_16" style="margin-top:-5px;" type="text" icon="ios-trash-outline" size="small"></Button>
+            <Button v-if="order.orderStatus === 'COMPLETED'" @click="delOrder(order.sn)" class="del-btn mr_10 fontsize_16" style="margin-top:-5px;" type="text" icon="ios-trash-outline" size="small"></Button>
             <span>{{ order.flowPrice | unitPrice("￥") }}</span>
           </div>
         </div>
diff --git a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
index 7d01f0a6..0be9dd6a 100644
--- a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
+++ b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
@@ -112,7 +112,6 @@
             >查看
           </Button>
           <Button
-            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'END'"
             type="error"
             size="small"
             style="margin-right: 10px"