From 4ff8eb6494b2ba4583b0b1695f0c4a3c4aa1dbb1 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 29 Dec 2021 19:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=98=E5=8C=96=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/promotion/pintuan/pintuan-goods.vue    | 10 +++++-----
 seller/src/views/promotion/pintuan/pintuan.vue   | 16 ++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/seller/src/views/promotion/pintuan/pintuan-goods.vue b/seller/src/views/promotion/pintuan/pintuan-goods.vue
index 58ce2fc9..8d53bee3 100644
--- a/seller/src/views/promotion/pintuan/pintuan-goods.vue
+++ b/seller/src/views/promotion/pintuan/pintuan-goods.vue
@@ -47,7 +47,7 @@
       </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page
-          :current="searchForm.pageNumber + 1"
+          :current="searchForm.pageNumber"
           :total="total"
           :page-size="searchForm.pageSize"
           @on-change="changePage"
@@ -91,7 +91,7 @@ export default {
       loading: false, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
       },
 
@@ -219,7 +219,7 @@ export default {
 
     changePage(v) {
       // 分页 改变页数
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
       this.getDataList();
       this.clearSelectAll();
     },
@@ -232,14 +232,14 @@ export default {
 
     handleSearch() {
       // 搜索
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
 
     handleReset() {
       // 重置
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.promotionName = "";
       this.selectDate = null;
       this.getDataList();
diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue
index 5306a138..0073fb51 100644
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@@ -62,31 +62,31 @@
               v-if="row.promotionStatus == 'NEW'"
               @click="edit(row)"
               >编辑</Button
-            >&nbsp;
+            >
             <Button
               type="info"
               v-if="row.promotionStatus == 'NEW'"
               size="small"
               @click="manage(row, 'manager')"
               >管理</Button
-            >&nbsp;
+            >
             <Button
               type="info"
-              v-if="row.promotionStatus !== 'NEW'"
+              v-if="row.promotionStatus !== 'NEW' && row.promotionStatus !== 'CLOSE'"
               size="small"
               @click="manage(row, 'view')"
               >查看</Button
-            >&nbsp;
+            >
             <Button
               type="error"
               size="small"
               v-if="row.promotionStatus != 'START'"
               @click="remove(row)"
               >删除</Button
-            >&nbsp;
+            >
             <Button
               type="success"
-              v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'"
+              v-if="row.promotionStatus == 'CLOSE'"
               size="small"
               @click="open(row)"
               >开启</Button
@@ -345,4 +345,8 @@ export default {
 </script>
 <style lang="scss">
 @import "@/styles/table-common.scss";
+.row Button {
+  margin-right: 4px;
+
+}
 </style>