Skip to content

P
peizhen-vue
Commit ba70395c by 张梦杰
Options

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

去除城市字段

See merge request !2
parents 87bf3c94 d95e48ca
Showing with 20 additions and 20 deletions
src/views/operation/article/index.vue
...@@ -106,12 +106,12 @@ ...@@ -106,12 +106,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="内容" label="内容"
align="center" align="center"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="封面图" prop="cover"> <el-form-item label="封面图" prop="cover">
<imageUpload v-model="form.cover"></imageUpload> <imageUpload v-model="form.cover"></imageUpload>
</el-form-item> </el-form-item>
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
cityVoList: [], cityVoList: [],
}; };
......
src/views/operation/banner/index.vue
...@@ -100,12 +100,12 @@ ...@@ -100,12 +100,12 @@
:formatter="getSiteName" :formatter="getSiteName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column label="图片" align="center" prop="imgUrl" width="180"> <el-table-column label="图片" align="center" prop="imgUrl" width="180">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <el-image <!-- <el-image
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="描述" prop="descr"> <el-form-item label="描述" prop="descr">
<el-input <el-input
...@@ -314,7 +314,7 @@ export default { ...@@ -314,7 +314,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
isUseList: [ isUseList: [
{ {
......
src/views/operation/news/index.vue
...@@ -88,12 +88,12 @@ ...@@ -88,12 +88,12 @@
prop="title" prop="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column label="封面" align="center" prop="cover" width="170"> <el-table-column label="封面" align="center" prop="cover" width="170">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <el-image <!-- <el-image
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" /> <el-input v-model="form.title" placeholder="请输入标题" />
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="封面" prop="cover"> <el-form-item label="封面" prop="cover">
<imageUpload v-model="form.cover"></imageUpload> <imageUpload v-model="form.cover"></imageUpload>
</el-form-item> </el-form-item>
...@@ -262,7 +262,7 @@ export default { ...@@ -262,7 +262,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
openArticle: false, openArticle: false,
rowArticle: undefined, rowArticle: undefined,
......
src/views/operation/notice/index.vue
...@@ -101,12 +101,12 @@ ...@@ -101,12 +101,12 @@
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="内容" label="内容"
align="center" align="center"
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
placeholder="请输入内容" placeholder="请输入内容"
/> />
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="位置" prop="site"> <el-form-item label="位置" prop="site">
<el-select clearable v-model="form.site" placeholder="请输入位置"> <el-select clearable v-model="form.site" placeholder="请输入位置">
<el-option <el-option
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
placeOptions: [ placeOptions: [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment