From 150845c3b57a4e322f6082033d8bfc71902c9942 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 6 Aug 2020 15:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AD=9B=E9=80=89fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/apass-list.vue                        |  4 ++++
 src/components/message-steps/select-template.vue     |  1 +
 src/pages/message-management/banner/banner-list.vue  |  7 +++++--
 .../directed-push/directed-push-list.vue             |  7 +++++--
 .../message-alert/message-alert-list.vue             | 12 ++++++++----
 .../message-template/message-template-list.vue       |  7 +++++--
 .../recommended/recommended-list.vue                 |  7 +++++--
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue
index 2a7fb30..b82439c 100644
--- a/src/components/apass-list.vue
+++ b/src/components/apass-list.vue
@@ -197,6 +197,10 @@ export default {
       this.currentPage = value;
       this.listAction();
     },
+    resetCurrentPage(value = 1) {
+      this.currentPage = value;
+      this.listAction();
+    },
     listAction() {
       if (this.timer) {
         clearTimeout(this.timer);
diff --git a/src/components/message-steps/select-template.vue b/src/components/message-steps/select-template.vue
index e92d751..15d5536 100644
--- a/src/components/message-steps/select-template.vue
+++ b/src/components/message-steps/select-template.vue
@@ -329,6 +329,7 @@ export default {
       this.getTemplateList();
     },
     topFilterAction() {
+      this.currentPage = 1;
       this.getTemplateList();
     },
     topFilterClear() {
diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue
index 333ea16..09a61cb 100644
--- a/src/pages/message-management/banner/banner-list.vue
+++ b/src/pages/message-management/banner/banner-list.vue
@@ -268,8 +268,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -279,7 +282,7 @@ export default {
         down_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     showDialog() {
       this.$refs.dialog.show();
diff --git a/src/pages/message-management/directed-push/directed-push-list.vue b/src/pages/message-management/directed-push/directed-push-list.vue
index 6dac901..e85f6d9 100644
--- a/src/pages/message-management/directed-push/directed-push-list.vue
+++ b/src/pages/message-management/directed-push/directed-push-list.vue
@@ -260,8 +260,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -270,7 +273,7 @@ export default {
         push_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     addNew() {
       this.$router.push("/message/directed_push/add");
diff --git a/src/pages/message-management/message-alert/message-alert-list.vue b/src/pages/message-management/message-alert/message-alert-list.vue
index 93c80b3..b16d972 100644
--- a/src/pages/message-management/message-alert/message-alert-list.vue
+++ b/src/pages/message-management/message-alert/message-alert-list.vue
@@ -33,8 +33,9 @@
               <span class="filter_title">状态：</span>
               <el-select v-model="topFilter.state" placeholder="请选择">
                 <el-option label="全部" value=""> </el-option>
-                <el-option label="推送成功" value="1"> </el-option>
-                <el-option label="推送失败" value="0"> </el-option>
+                <el-option label="推送成功" value="success"> </el-option>
+                <el-option label="推送失败" value="fail"> </el-option>
+                <el-option label="推送中" value="pushing"> </el-option>
               </el-select>
             </div>
             <div class="filter_item">
@@ -259,8 +260,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -269,7 +273,7 @@ export default {
         push_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     addNew() {
       this.$router.push("/message/message_alert/add");
diff --git a/src/pages/message-management/message-template/message-template-list.vue b/src/pages/message-management/message-template/message-template-list.vue
index e3bcea1..0f42c0e 100644
--- a/src/pages/message-management/message-template/message-template-list.vue
+++ b/src/pages/message-management/message-template/message-template-list.vue
@@ -235,8 +235,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -245,7 +248,7 @@ export default {
         update_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     showDialog() {
       this.$refs.dialog.show();
diff --git a/src/pages/message-management/recommended/recommended-list.vue b/src/pages/message-management/recommended/recommended-list.vue
index 2c494c5..ace80d3 100644
--- a/src/pages/message-management/recommended/recommended-list.vue
+++ b/src/pages/message-management/recommended/recommended-list.vue
@@ -196,8 +196,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -206,7 +209,7 @@ export default {
         time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     detailAction(item) {
       this.$router.push(
-- 
2.26.0