From ee0b59fae6404e4f66d9eac22f1d79806465358c Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Wed, 18 Sep 2019 14:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/banner.vue | 19 ++++++++++++++-----
 src/views/modules/user/user.vue   |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/news/banner.vue b/src/views/modules/news/banner.vue
index 2e8a73ff..508f1d13 100644
--- a/src/views/modules/news/banner.vue
+++ b/src/views/modules/news/banner.vue
@@ -51,17 +51,18 @@
                          label="上下架时间"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="createdBy"
+        <!-- <el-table-column prop="createdBy"
                          label="创建人"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"></el-table-column> -->
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="updatedBy"
-                         label="更新人"
+        <el-table-column prop="position"
+                         label="位置"
                          header-align="center"
+                         :formatter="setPosition"
                          align="center"></el-table-column>
         <el-table-column prop="updatedTime"
                          label="更新时间"
@@ -132,7 +133,7 @@ export default {
   },
   created () {
     this.getListFromDict('bannerType')
-    // this.getListFromDict('bannerPosition')
+    this.getListFromDict('bannerPosition')
   },
   methods: {
     bannerState: function (row, column) {
@@ -176,6 +177,14 @@ export default {
         return row.bannerType
       }
     },
+    setPosition: function (row) {
+      let positionItem = this.positionList.filter(item => item.dictValue === row.position)[0]
+      if (positionItem) {
+        return positionItem.dictName
+      } else {
+        return row.position
+      }
+    },
     getListFromDict (dictType) {
       this.$http.get(`/sys/dict/listSimple/` + dictType).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 7ec567de..39d98ba5 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -408,7 +408,7 @@ export default {
         id: '1',
         name: '是'
       }, {
-        id: '1',
+        id: '',
         name: '全部'
       }]
     }