From 0a5563e5e22ac130916d97935a67b0fbf3a0ca76 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 22 Jun 2022 10:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E4=BF=83=E9=94=80=E7=9B=B8=E5=85=B3=E6=96=87=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/promotions/coupon/coupon.vue |  4 ++--
 .../promotions/full-discount/full-discount.vue |  4 ++--
 .../kanjia/kanjia-activity-goods.vue           | 18 +++++++++---------
 .../src/views/promotions/pintuan/pintuan.vue   |  4 ++--
 .../promotions/points-goods/points-goods.vue   |  5 +++--
 .../src/views/promotions/seckill/seckill.vue   |  8 ++++----
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/manager/src/views/promotions/coupon/coupon.vue b/manager/src/views/promotions/coupon/coupon.vue
index bb281854..5970caa8 100644
--- a/manager/src/views/promotions/coupon/coupon.vue
+++ b/manager/src/views/promotions/coupon/coupon.vue
@@ -59,7 +59,7 @@
       >
         <template slot-scope="{ row }" slot="action">
           <Button
-            v-if="row.promotionStatus !== 'START'"
+            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
             type="info"
             size="small"
             @click="see(row)"
@@ -78,7 +78,7 @@
           </Button>
           <Button
             class="ml_5"
-            v-if="row.promotionStatus === 'CLOSE'"
+            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'"
             type="error"
             size="small"
             @click="remove(row)"
diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue
index 2384c213..3a03819d 100644
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -73,7 +73,7 @@
             <Button type="info" size="small" @click="view(row)">查看</Button>
             <Button
               type="error"
-              v-if="row.promotionStatus === 'START'"
+              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'START'"
               style="margin-left: 5px"
               size="small"
               @click="openOrClose(row)"
@@ -113,7 +113,7 @@ export default {
         // 请求参数
         pageNumber: 1,
         pageSize: 10,
-        sort: "startTime",
+        sort: "createTime",
         order: "desc",
       },
       columns: [
diff --git a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
index ae096271..7d01f0a6 100644
--- a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
+++ b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
@@ -97,20 +97,20 @@
         </template>
         <template slot-scope="{ row }" slot="action">
           <Button
-            v-if="row.promotionStatus != 'NEW'"
-            size="small"
-            style="margin-right: 10px"
-            @click="edit(row, 'onlyView')"
-            >查看
-          </Button>
-          <Button
-            v-if="row.promotionStatus === 'NEW'"
+            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
             type="info"
             size="small"
             style="margin-right: 10px"
             @click="edit(row)"
             >编辑
           </Button>
+          <Button
+            v-else
+            size="small"
+            style="margin-right: 10px"
+            @click="edit(row, 'onlyView')"
+            >查看
+          </Button>
           <Button
             v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'END'"
             type="error"
@@ -161,7 +161,7 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
-        sort: "startTime", // 默认排序字段
+        sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         goodsName: "",
       },
diff --git a/manager/src/views/promotions/pintuan/pintuan.vue b/manager/src/views/promotions/pintuan/pintuan.vue
index 056210c8..bd49c845 100644
--- a/manager/src/views/promotions/pintuan/pintuan.vue
+++ b/manager/src/views/promotions/pintuan/pintuan.vue
@@ -56,7 +56,7 @@
           <Button
             type="error"
             size="small"
-            :disabled="row.promotionStatus == 'END' || row.promotionStatus == 'CLOSE'"
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
             @click="close(row)"
             >关闭
           </Button>
@@ -94,7 +94,7 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
-        sort: "startTime",
+        sort: "createTime",
         order: "desc", // 默认排序方式
       },
       columns: [
diff --git a/manager/src/views/promotions/points-goods/points-goods.vue b/manager/src/views/promotions/points-goods/points-goods.vue
index 2eaa27f0..0478d2cd 100644
--- a/manager/src/views/promotions/points-goods/points-goods.vue
+++ b/manager/src/views/promotions/points-goods/points-goods.vue
@@ -105,7 +105,7 @@
         </template>
         <template slot-scope="{ row }" slot="action">
           <Button
-            v-if="row.promotionStatus !== 'START'"
+            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
             type="info"
             size="small"
             @click="edit(row.id)"
@@ -125,6 +125,7 @@
             type="error"
             size="small"
             @click="close(row.id)"
+            style="margin-right: 5px"
             >删除</Button
           >
         </template>
@@ -168,7 +169,7 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
-        sort: "create_time",
+        sort: "createTime",
         order: "desc", // 默认排序方式
       },
       statusList: [
diff --git a/manager/src/views/promotions/seckill/seckill.vue b/manager/src/views/promotions/seckill/seckill.vue
index 5af20d0f..a2114109 100644
--- a/manager/src/views/promotions/seckill/seckill.vue
+++ b/manager/src/views/promotions/seckill/seckill.vue
@@ -66,7 +66,7 @@
                 type="info"
                 size="small"
                 class="mr_5"
-                v-if="row.promotionStatus == 'NEW'"
+                v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
                 @click="edit(row)"
                 >编辑</Button
               >
@@ -90,13 +90,13 @@
                 v-if="row.promotionStatus == 'START' || row.promotionStatus == 'NEW'"
                 class="mr_5"
                 @click="off(row)"
-                >下架</Button
+                >关闭</Button
               >
               &nbsp;
               <Button
                 type="error"
                 size="small"
-                v-if="row.promotionStatus == 'CLOSE'"
+                v-if="row.promotionStatus == 'CLOSE' || row.promotionStatus == 'END'"
                 ghost
                 @click="expire(row)"
                 >删除</Button
@@ -146,7 +146,7 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
-        sort: "startTime",
+        sort: "createTime",
         order: "desc", // 默认排序方式
       },
       setupFlag: false, //默认不请求设置