From a1dc87ff1914b41f777719be998f253ebb107433 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 12 Sep 2019 09:40:24 +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

---
 .../modules/news/banner-add-or-update.vue     | 19 ++++++++-
 src/views/modules/user/user.vue               | 40 +++++++++----------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index f82ce8f7..4af79ce1 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -63,6 +63,16 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="banner位置">
+        <el-select v-model="dataForm.position"
+                   placeholder="请选择">
+          <el-option v-for="item in positionList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="banner图片"
                     prop="imgUrl">
         <el-upload class="avatar-uploader"
@@ -104,13 +114,18 @@ export default {
         communityId: '',
         community: '',
         gridId: '',
-        grid: ''
+        grid: '',
+        position: '0'
       },
       bannerOptions: [],
       streetList: [],
       communityList: [],
       gridList: [],
-      uploadUrl: ''
+      uploadUrl: '',
+      positionList: [
+        { 'id': '0', 'name': '上面' },
+        { 'id': '1', 'name': '中间' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 75baf8b7..7ec567de 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -11,8 +11,8 @@
         <el-form-item label="街道">
           <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
             <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
+              v-for="(item,index) in streetOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -21,8 +21,8 @@
         <el-form-item label="社区">
           <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
             <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
+              v-for="(item,index) in communityOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -31,8 +31,8 @@
         <el-form-item label="网格">
           <el-select v-model="dataForm.gridId" placeholder="请选择">
             <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
+              v-for="(item,index) in gridOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -127,8 +127,8 @@
         <el-form-item label="街道">
           <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
             <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
+              v-for="(item, index) in streetOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -137,8 +137,8 @@
         <el-form-item label="社区">
           <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
             <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
+              v-for="(item,index) in communityOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -147,8 +147,8 @@
         <el-form-item label="网格">
           <el-select v-model="dataForm.gridId" placeholder="请选择">
             <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
+              v-for="(item,index) in gridOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -173,8 +173,8 @@
           <el-form-item label="是否是党员">
           <el-select v-model="dataForm.isParty" placeholder="请选择" >
             <el-option
-              v-for="item in partyFlagOptions"
-              :key="item.id"
+              v-for="(item,index) in partyFlagOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -253,8 +253,8 @@
         <el-form-item label="街道">
           <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
             <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
+              v-for="(item, index) in streetOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -263,8 +263,8 @@
         <el-form-item label="社区">
           <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
             <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
+              v-for="(item,index) in communityOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -273,8 +273,8 @@
         <el-form-item label="网格">
           <el-select v-model="dataForm.gridId" placeholder="请选择">
             <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
+              v-for="(item,index) in gridOptions"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>