Merge branch 'feature/v1/zmj' into 'new/java/master'

去除城市字段

See merge request !2

src/views/operation/article/index.vue

@@ -106,12 +106,12 @@
         </template>
       </el-table-column>
 
-      <el-table-column
+      <!-- <el-table-column
         label="城市"
         align="center"
         prop="cityName"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="内容"
         align="center"
@@ -179,7 +179,7 @@
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="城市" prop="cityId">
+        <!-- <el-form-item label="城市" prop="cityId">
           <el-select
             filterable
             clearable
@@ -194,7 +194,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="封面图" prop="cover">
           <imageUpload v-model="form.cover"></imageUpload>
         </el-form-item>
@@ -260,7 +260,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
+        // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
       },
       cityVoList: [],
     };

src/views/operation/banner/index.vue

@@ -100,12 +100,12 @@
         :formatter="getSiteName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="城市"
         align="center"
         prop="cityName"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column label="图片" align="center" prop="imgUrl" width="180">
         <template slot-scope="{ row }">
           <!-- <el-image
@@ -202,7 +202,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="城市" prop="cityId">
+        <!-- <el-form-item label="城市" prop="cityId">
           <el-select
             filterable
             clearable
@@ -217,7 +217,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="描述" prop="descr">
           <el-input
@@ -314,7 +314,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
+        // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
       },
       isUseList: [
         {

src/views/operation/news/index.vue

@@ -88,12 +88,12 @@
         prop="title"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="城市"
         align="center"
         prop="cityName"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column label="封面" align="center" prop="cover" width="170">
         <template slot-scope="{ row }">
           <!-- <el-image
@@ -168,7 +168,7 @@
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="城市" prop="cityId">
+        <!-- <el-form-item label="城市" prop="cityId">
           <el-select
             filterable
             clearable
@@ -183,7 +183,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="封面" prop="cover">
           <imageUpload v-model="form.cover"></imageUpload>
         </el-form-item>
@@ -262,7 +262,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
+        // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
       },
       openArticle: false,
       rowArticle: undefined,

src/views/operation/notice/index.vue

@@ -101,12 +101,12 @@
         prop="id"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="城市"
         align="center"
         prop="cityName"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="内容"
         align="center"
@@ -163,7 +163,7 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <el-form-item label="城市" prop="cityId">
+        <!-- <el-form-item label="城市" prop="cityId">
           <el-select
             filterable
             clearable
@@ -178,7 +178,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="位置" prop="site">
           <el-select clearable v-model="form.site" placeholder="请输入位置">
             <el-option
@@ -247,7 +247,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
+        // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
       },
       placeOptions: [
         {