合并master

2025-12-17 08:25:52 +08:00 · 2022-07-06 17:33:08 +08:00
parent a785718715 d4eb17e573
commit 86fa39d7af
5 changed files with 137 additions and 2 deletions
--- 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"