From 2506f18a924887a40d0f216f78bd727222991000 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 27 Jul 2020 11:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8fixced?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message-template-list.vue                 | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

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 0d7dad3..67695d5 100644
--- a/src/pages/message-management/message-template/message-template-list.vue
+++ b/src/pages/message-management/message-template/message-template-list.vue
@@ -31,10 +31,13 @@
             <div class="filter_item">
               <span class="filter_title">模板类型：</span>
               <el-select v-model="topFilter.type" placeholder="请选择">
-                <el-option label="服务推送" value="0"> </el-option>
-                <el-option label="平台维护" value="1"> </el-option>
-                <el-option label="版本更新" value="2"> </el-option>
-                <el-option label="自动消息" value="3"> </el-option>
+                <el-option
+                  v-for="item in types"
+                  :label="item.name"
+                  :value="item.value"
+                  :key="item.value"
+                >
+                </el-option>
               </el-select>
             </div>
             <div class="filter_item">
@@ -190,15 +193,19 @@ export default {
   },
   methods: {
     initList(filter) {
+      let fullFilter = {
+        ...filter,
+        ...this.topFilter,
+      };
       let params = {
-        page: filter.page,
-        size: filter.size,
-        keyword: this.topFilter.name,
-        tpl_type: this.topFilter.type,
+        page: fullFilter.page,
+        size: fullFilter.size,
+        keyword: fullFilter.name,
+        tpl_type: fullFilter.type,
         update_time_s:
-          (this.topFilter.update_time && this.topFilter.update_time[0]) || "",
+          (fullFilter.update_time && fullFilter.update_time[0]) || "",
         update_time_e:
-          (this.topFilter.update_time && this.topFilter.update_time[1]) || "",
+          (fullFilter.update_time && fullFilter.update_time[1]) || "",
       };
 
       // console.log(params);
-- 
2.26.0