From 26bfc4f0cc605a6c0d0511f3b041e3843b04d23b Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Tue, 2 Jun 2020 13:50:36 +0800
Subject: [PATCH] 1

---
 src/pages/activity/ActivityManager.vue | 45 +++++++++++++++-----------
 src/pages/shop/IncreaseWelcomeList.vue |  8 ++++-
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
index 42359ba..6404df5 100644
--- a/src/pages/activity/ActivityManager.vue
+++ b/src/pages/activity/ActivityManager.vue
@@ -1,12 +1,19 @@
 <template>
   <div class="activityManager">
-    <Spin v-show="loading" fix>加载中...</Spin>
+    <Spin v-show="loading"
+          fix>加载中...</Spin>
     <Row>
-      <i-col class="activityListClass" v-for="(item, index) in activityList" :key="index" span="7" offset="1">
+      <i-col class="activityListClass"
+             v-for="(item, index) in activityList"
+             :key="index"
+             span="7"
+             offset="1">
         <Card>
           <div class="operateAndThemeItem">
             <div class="ThemeItem">
-              <div class="schedule-image"><img class="img" :src="'/kiisoo-ic' + item.logo" alt /></div>
+              <div class="schedule-image"><img class="img"
+                     :src="'/kiisoo-ic' + item.logo"
+                     alt /></div>
               <div class="tipItem">
                 <span>{{ item.name }}</span>
                 <span>{{ item.description }}</span>
@@ -94,7 +101,7 @@ export default {
     },
     getActivityTable () {
       let that = this;
-      ActivityManager.getActivityList({}, function (data) {
+      ActivityManager.getActivityList({ categoryCode: "promotion" }, function (data) {
         that.activityList = data.data.results;
       });
     },
@@ -132,9 +139,9 @@ export default {
 </script>
 
 <style scoped>
-  .activityManager {
-    min-height: 600px;
-  }
+.activityManager {
+  min-height: 600px;
+}
 .operateAndThemeItem {
   display: flex;
   justify-content: space-between;
@@ -174,16 +181,16 @@ export default {
   line-height: 100px;
   cursor: pointer;
 }
-  .schedule-image {
-    width: 50px;
-    height: 50px;
-    display: flex;
-    align-items: center;
-    border-radius: 5px;
-    background-color: #eee;
-  }
-  .schedule-image img {
-    width: 100%;
-    height: auto;
-  }
+.schedule-image {
+  width: 50px;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  border-radius: 5px;
+  background-color: #eee;
+}
+.schedule-image img {
+  width: 100%;
+  height: auto;
+}
 </style>
diff --git a/src/pages/shop/IncreaseWelcomeList.vue b/src/pages/shop/IncreaseWelcomeList.vue
index ce1a635..7141655 100644
--- a/src/pages/shop/IncreaseWelcomeList.vue
+++ b/src/pages/shop/IncreaseWelcomeList.vue
@@ -170,7 +170,13 @@ export default {
         content: "您确定要删除该欢迎语?",
         onOk: () => {
           http.deleteWelcome({ id: row.scheduleId }).then(res => {
-            _this.pageNum = 1;
+            if (_this.data.length <= 1) {
+              if (_this.pageNum > 1) {
+                _this.pageNum = _this.pageNum - 1;
+              } else {
+                _this.pageNum = 1;
+              }
+            }
             _this.handlePaginate()
           });
         },