From 7ca842f519777b994b032524eb4e694a1eee9d0b Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 27 Jul 2020 18:43:40 +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=A8fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message-management/banner/banner-list.vue | 48 +++++++++----------
 .../directed-push/directed-push-list.vue      | 15 ++++--
 .../message-alert/message-alert-list.vue      | 19 +++++---
 .../message-template-list.vue                 |  1 +
 .../recommended/recommended-list.vue          | 35 ++++++++++----
 5 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue
index 6e94a7d..333ea16 100644
--- a/src/pages/message-management/banner/banner-list.vue
+++ b/src/pages/message-management/banner/banner-list.vue
@@ -26,6 +26,7 @@
               <el-input
                 v-model="topFilter.name"
                 placeholder="请输入banner关键词"
+                @keyup.enter.native="topFilterAction"
               ></el-input>
             </div>
             <div class="filter_item">
@@ -106,7 +107,7 @@ export default {
       msg: "",
       submit: null,
     },
-    useItem:'',
+    useItem: "",
     topFilter: {
       name: "",
       state: "",
@@ -143,7 +144,7 @@ export default {
       {
         label: "banner编码",
         prop: "serial_num",
-        width: 180,
+        width: 200,
       },
       {
         label: "banner名称",
@@ -230,24 +231,23 @@ export default {
         ...filter,
         ...this.topFilter,
       };
+      let params = {
+        page: fullFilter.page,
+        size: fullFilter.size,
+        state: fullFilter.state,
+        name: fullFilter.name,
+        up_time_s: fullFilter.up_time ? fullFilter.up_time[0] : "",
+        up_time_e: fullFilter.up_time ? fullFilter.up_time[1] : "",
+        down_time_s: fullFilter.down_time ? fullFilter.down_time[0] : "",
+        down_time_e: fullFilter.down_time ? fullFilter.down_time[1] : "",
+      };
 
       this.tempFilter = filter; // filter存档，用于页面刷新
 
-      console.log(fullFilter);
+      // console.log(params);
 
       this.$http
-        .get("/apaas/service/v3/recommend/manage/banners/list", {
-          params: {
-            page: fullFilter.page,
-            size: fullFilter.size,
-            state: fullFilter.state,
-            name: fullFilter.name,
-            up_time_s: fullFilter.up_time ? fullFilter.up_time[0] : "",
-            up_time_e: fullFilter.up_time ? fullFilter.up_time[1] : "",
-            down_time_s: fullFilter.down_time ? fullFilter.down_time[0] : "",
-            down_time_e: fullFilter.down_time ? fullFilter.down_time[1] : "",
-          },
-        })
+        .get("/apaas/service/v3/recommend/manage/banners/list", { params })
         .then(({ data }) => {
           if (data.success == 1) {
             this.listTotal = data.data.total;
@@ -293,28 +293,28 @@ export default {
     editAction(item) {
       this.$router.push("/message/banner_edit?id=" + item.serial_num);
     },
-    upActionBtn(item){
+    upActionBtn(item) {
       this.useItem = item;
-      this.dialogInfo={
+      this.dialogInfo = {
         msg: "是否上架到首页banner区域",
         submit: this.upAction,
-      }
+      };
       this.$refs.dialog.show();
     },
-    deleteActionBtn(item){
+    deleteActionBtn(item) {
       this.useItem = item;
-      this.dialogInfo={
+      this.dialogInfo = {
         msg: "删除后无法撤销，您确定删除吗",
         submit: this.deleteAction,
-      }
+      };
       this.$refs.dialog.show();
     },
-    downActionBtn(item){
+    downActionBtn(item) {
       this.useItem = item;
-      this.dialogInfo={
+      this.dialogInfo = {
         msg: "下架后首页banner区域将不再显示",
         submit: this.downAction,
-      }
+      };
       this.$refs.dialog.show();
     },
     upAction() {
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 b1c1651..dcea47d 100644
--- a/src/pages/message-management/directed-push/directed-push-list.vue
+++ b/src/pages/message-management/directed-push/directed-push-list.vue
@@ -26,6 +26,7 @@
               <el-input
                 v-model="topFilter.name"
                 placeholder="请输入消息模板名称"
+                @keyup.enter.native="topFilterAction"
               ></el-input>
             </div>
             <div class="filter_item">
@@ -222,13 +223,17 @@ export default {
   },
   methods: {
     initList(filter) {
+      let fullFilter = {
+        ...filter,
+        ...this.topFilter,
+      };
       let params = {
-        page: filter.page,
-        size: filter.size,
+        page: fullFilter.page,
+        size: fullFilter.size,
         tplname: this.topFilter.name,
-        state: this.topFilter.state,
-        time_s: (this.topFilter.push_time && this.topFilter.push_time[0]) || "",
-        time_e: (this.topFilter.push_time && this.topFilter.push_time[1]) || "",
+        state: fullFilter.state,
+        time_s: (fullFilter.push_time && fullFilter.push_time[0]) || "",
+        time_e: (fullFilter.push_time && fullFilter.push_time[1]) || "",
       };
 
       // console.log(params);
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 7521e37..50f2942 100644
--- a/src/pages/message-management/message-alert/message-alert-list.vue
+++ b/src/pages/message-management/message-alert/message-alert-list.vue
@@ -26,6 +26,7 @@
               <el-input
                 v-model="topFilter.name"
                 placeholder="请输入消息模板名称"
+                @keyup.enter.native="topFilterAction"
               ></el-input>
             </div>
             <div class="filter_item">
@@ -221,13 +222,17 @@ export default {
   },
   methods: {
     initList(filter) {
+      let fullFilter = {
+        ...filter,
+        ...this.topFilter,
+      };
       let params = {
-        page: filter.page,
-        size: filter.size,
-        tplname: this.topFilter.name,
-        state: this.topFilter.state,
-        time_s: (this.topFilter.push_time && this.topFilter.push_time[0]) || "",
-        time_e: (this.topFilter.push_time && this.topFilter.push_time[1]) || "",
+        page: fullFilter.page,
+        size: fullFilter.size,
+        tplname: fullFilter.name,
+        state: fullFilter.state,
+        time_s: (fullFilter.push_time && fullFilter.push_time[0]) || "",
+        time_e: (fullFilter.push_time && fullFilter.push_time[1]) || "",
       };
 
       // console.log(params);
@@ -269,7 +274,7 @@ export default {
       this.initList(this.tempFilter);
     },
     addNew() {
-      this.$router.push("/message/message_alert/add")
+      this.$router.push("/message/message_alert/add");
     },
     detailAction(item) {
       this.$http
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 67695d5..e3bcea1 100644
--- a/src/pages/message-management/message-template/message-template-list.vue
+++ b/src/pages/message-management/message-template/message-template-list.vue
@@ -26,6 +26,7 @@
               <el-input
                 v-model="topFilter.name"
                 placeholder="请输入消息模板名称/id"
+                @keyup.enter.native="topFilterAction"
               ></el-input>
             </div>
             <div class="filter_item">
diff --git a/src/pages/message-management/recommended/recommended-list.vue b/src/pages/message-management/recommended/recommended-list.vue
index df9a23f..2c494c5 100644
--- a/src/pages/message-management/recommended/recommended-list.vue
+++ b/src/pages/message-management/recommended/recommended-list.vue
@@ -26,6 +26,7 @@
               <el-input
                 v-model="topFilter.name"
                 placeholder="请输入推荐位名称"
+                @keyup.enter.native="topFilterAction"
               ></el-input>
             </div>
             <div class="filter_item">
@@ -156,15 +157,17 @@ export default {
   },
   methods: {
     initList(filter) {
+      let fullFilter = {
+        ...filter,
+        ...this.topFilter,
+      };
       let params = {
-        page: filter.page,
-        size: filter.size,
-        name: this.topFilter.name,
-        state: this.topFilter.state,
-        uptime_s:
-          (this.topFilter.update_time && this.topFilter.update_time[0]) || "",
-        uptime_e:
-          (this.topFilter.update_time && this.topFilter.update_time[1]) || "",
+        page: fullFilter.page,
+        size: fullFilter.size,
+        name: fullFilter.name,
+        state: fullFilter.state,
+        uptime_s: (fullFilter.time && fullFilter.time[0]) || "",
+        uptime_e: (fullFilter.time && fullFilter.time[1]) || "",
       };
 
       // console.log(params);
@@ -206,10 +209,22 @@ export default {
       this.initList(this.tempFilter);
     },
     detailAction(item) {
-      this.$router.push('/message/recommended/edit?ad_type='+item.ad_type+'&id='+item.id+'&look=1')
+      this.$router.push(
+        "/message/recommended/edit?ad_type=" +
+          item.ad_type +
+          "&id=" +
+          item.id +
+          "&look=1"
+      );
     },
     editAction(item) {
-      this.$router.push('/message/recommended/edit?ad_type='+item.ad_type+'&id='+item.id+'&look=2')
+      this.$router.push(
+        "/message/recommended/edit?ad_type=" +
+          item.ad_type +
+          "&id=" +
+          item.id +
+          "&look=2"
+      );
     },
   },
 };
-- 
2.26.0