feat()：区域列表

src/views/banner/components/ArticleDetail.vue

@@ -36,7 +36,8 @@
                 <el-radio-group v-model="postForm.position">
                   <el-radio :label="1">首页</el-radio>
                   <el-radio :label="2">活动页</el-radio>
-                  <el-radio :label="3">备选项</el-radio>
+                  <el-radio :label="3">短视频页</el-radio>
+                  <el-radio :label="4">开业指导页</el-radio>
                 </el-radio-group>
               </template>
             </el-form-item>
@@ -211,6 +212,10 @@ export default {
           return 'HOME'
         case 2:
           return 'ACTIVITY'
+        case 3:
+          return 'VIDEO'
+        case 4:
+          return 'GUIDE'
       }
     },
     editPosition(position) {
@@ -219,6 +224,10 @@ export default {
           return 1
         case 'ACTIVITY':
           return 2
+        case 'VIDEO':
+          return 3
+        case 'GUIDE':
+          return 4
       }
     }
   }

src/views/banner/list.vue

@@ -34,7 +34,7 @@
         <template slot-scope="{row}">
           <router-link :to="'/banner/edit/'+row.id" class="link-type">
             <el-tag :type="row.posiiton | positionFilter">
-              {{ row.position === 'HOME' ? '首页' : '活动页' }}
+              {{ row.position | positionFilterTxt }}
             </el-tag>
           </router-link>
         </template>
@@ -94,6 +94,15 @@ export default {
         2: 'danger'
       }
       return statusMap[status]
+    },
+    positionFilterTxt(status) {
+      const statusMap = {
+        HOME: '首页',
+        ACTIVITY: '活动页',
+        VIDEO: '短视频页',
+        GUIDE: '开店指导'
+      }
+      return statusMap[status]
     }
   },
   data() {

src/views/city/list.vue

@@ -5,9 +5,9 @@
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
         搜索
       </el-button>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">
+      <!--<el-button v-waves class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">
         新建
-      </el-button>
+      </el-button>-->
     </div>
     <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
       <el-table-column align="center" label="ID" width="80">
@@ -16,9 +16,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="180px" align="center" label="日期">
+      <el-table-column align="center" label="城市">
         <template slot-scope="scope">
-          <span>{{ scope.row.create_time }}</span>
+          <span>{{ scope.row.name }}</span>
         </template>
       </el-table-column>
       <el-table-column class-name="status-col" label="状态" width="80ß">
@@ -28,11 +28,6 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column min-width="300px" label="城市">
-        <template slot-scope="{row}">
-          <span>{{ row.city_name }}</span>
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="Actions" width="190" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleUpdate(scope)">
@@ -47,8 +42,8 @@
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="城市" prop="city_name">
-          <el-input v-model="temp.city_name" />
+        <el-form-item label="城市" prop="name">
+          <el-input v-model="temp.name" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -93,7 +88,7 @@ export default {
       },
       temp: {
         id: undefined,
-        city_name: ''
+        name: ''
       },
       dialogFormVisible: false,
       dialogStatus: '',
@@ -172,7 +167,7 @@ export default {
     },
     updateData() {
       const tempData = Object.assign({}, this.temp)
-      if (!tempData.city_name) {
+      if (!tempData.name) {
         this.$notify({
           title: '警告',
           message: '城市名不能为空',