Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/scenicSpot/scenicRecommentList.vue

@@ -339,10 +339,30 @@
       </table>
     </div>
 
-    <el-dialog custom-class="w800" title="新增" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
+    <el-dialog custom-class="w800" :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="80px">
         <el-form-item label="攻略名称" prop="Name">
-          <el-input v-model="addMsg.Name" class="w217" />
+          <el-input v-model="addMsg.Name" class="w595" />
+        </el-form-item>
+        <el-form-item label="国家">
+          <el-select v-model="addMsg.CountryId" clearable class="w300" filterable
+            @change="getProvinceListTwo(addMsg.CountryId,1)" :placeholder="$t('hotel.hotel_country')">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="省">
+          <el-select v-model="addMsg.ProviceId" class="w300" filterable @change="getProvinceListTwo(addMsg.ProviceId,2)"
+            :placeholder="$t('hotel.hotel_province')">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in provinceList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="市">
+          <el-select v-model="addMsg.CityId" class="w300" filterable :placeholder="$t('hotel.hotel_city')">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in cityList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="封面图">
           <div class="_addUpload_box">
@@ -363,26 +383,6 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label="国家">
-          <el-select v-model="addMsg.CountryId" clearable class="w217" filterable
-            @change="getProvinceListTwo(addMsg.CountryId,1)" :placeholder="$t('hotel.hotel_country')">
-            <el-option label="不限" :value="0"></el-option>
-            <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="省">
-          <el-select v-model="addMsg.ProviceId" class="w217" filterable @change="getProvinceListTwo(addMsg.ProviceId,2)"
-            :placeholder="$t('hotel.hotel_province')">
-            <el-option label="不限" :value="0"></el-option>
-            <el-option v-for="item in provinceList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="市">
-          <el-select v-model="addMsg.CityId" class="w217" filterable :placeholder="$t('hotel.hotel_city')">
-            <el-option label="不限" :value="0"></el-option>
-            <el-option v-for="item in cityList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="攻略内容" prop="lotteryRules">
           <my-edit class="w595" style="margin-top:-30px;" v-bind:editValue="addMsg.Content" v-on:edit-value="addMsg.Content = arguments[0]" v-bind:toolbarShow="toolbar"
             v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
@@ -414,6 +414,7 @@
         provinceList: [],
         cityList: [],
         placeholder: "请输入",
+        dialogTitle:'新增景点信息',
         DefaultList: [],
         toolbar: {
           clean: true,
@@ -550,6 +551,7 @@
       },
       //初始化
       initMsg() {
+        this.dialogTitle='新增景点信息';
         this.addMsg.Id = 0;
         this.addMsg.Name = "";
         this.addMsg.ImgCover = "";
@@ -588,6 +590,7 @@
       },
       //修改
       GetScenic(id) {
+        this.dialogTitle='修改景点信息';
         this.apipost(
           "ScenicRecomment_Get_GetScenicRecommentService", {
             Id: id