修改部分功能

src/components/WebSet/WebSiteEdit.vue

@@ -216,12 +216,17 @@
         </div>
       </div>
       <div class="WebSite_Left">
+        <el-select v-model="countryId" @change="changeCountry" style="margin-bottom:12px;">
+          <el-option v-for="x in tempCountry" :label="x.name" :value="x.val" :key="x.val">
+          </el-option>
+        </el-select>
         <el-select v-model="templateId" @change="getTemplateDetails()">
           <el-option label="请选择" :value="0" :key="0">
           </el-option>
           <el-option v-for="item in templateList" :label="item.TemplateName" :value="item.Id" :key="item.Id">
           </el-option>
         </el-select>
+        
         <div class="temp-list-wrap">
           <div v-for="(subItem,subIndex) in detailsList" class="temp-list-item" :key="subIndex" draggable="true"
             @dragstart="dragLeftStart($event,subItem)" @dragend="dragendLeft($event,subItem)">
@@ -318,8 +323,47 @@
         dragging: null,
         commonTitle: '',
         dragObj: {},
-
+        tempCountry:[
+          {
+            name:'日本',
+            val:1
+          },
+          {
+            name:'韓國',
+            val:2
+          },
+          {
+            name:'澳洲',
+            val:3
+          },
+          {
+            name:'東南亞',
+            val:4
+          },
+          {
+            name:'歐洲',
+            val:5
+          },
+          {
+            name:'中國大陸',
+            val:6
+          },
+          {
+            name:'台灣',
+            val:7
+          },
+          {
+            name:'北美',
+            val:8
+          },
+          {
+            name:'中東亞非',
+            val:9
+          }
+        ],
+        countryId:1,
         isDraggable: true,
+        realTemplateList:[]
       };
     },
     created() {},
@@ -343,6 +387,16 @@
       otherdialog
     },
     methods: {
+      changeCountry(){
+        if(this.countryId=="1"){
+          this.templateList=this.realTemplateList
+        }else{
+          this.templateList=[]
+          this.Error("該模板正在維護，敬請期待")
+        }
+        this.templateId=0
+        this.detailsList=[]
+      },
       dragendLeft(e, item) {
         var obj = {
           Id: item.TemplateKey,
@@ -432,7 +486,8 @@
           "ws_get_GetTemplateList", {},
           res => {
             if (res.data.resultCode == 1) {
-              this.templateList = res.data.data;
+              this.realTemplateList = res.data.data;
+              this.templateList=this.realTemplateList
             } else {
               this.Error(res.data.message);
             }

src/components/commonPage/fiveday.vue

@@ -142,8 +142,10 @@
       dayNum: {},
     showTime: {},
   },
-  data: {
-    isshowtime: true,
+  data() {
+    return {
+      isshowtime: true,
+    }
   },
   watch: {
     showTime: {

src/components/commonPage/fourday.vue

@@ -10,7 +10,7 @@
                     <span v-if="dayNum<10">0</span>
                     {{dayNum}}天
                   </h3>
-                  <p v-if="isshowtime" v-if="isshowtime" style="margin: 0;">{{day.dateTime}}</p>
+                  <p v-if="isshowtime" style="margin: 0;">{{day.dateTime}}</p>
                 </td>
                 <td class="desc" v-html="title"></td>
               </tr>
@@ -141,8 +141,10 @@ export default {
       dayNum:{},
     showTime: {},
   },
-  data: {
-    isshowtime: true,
+  data() {
+    return {
+      isshowtime: true,
+    }
   },
   watch: {
     showTime: {

src/components/commonPage/oneday.vue

@@ -108,13 +108,16 @@
       dayNum: {},
     showTime: {},
   },
-  data: {
-    isshowtime: true,
+  data() {
+    return {
+      isshowtime: true,
+    }
   },
   watch: {
     showTime: {
       handler: function (v, ov) {
         this.isshowtime = v;
+        console.log(v)
       },
       deep: true,
     },

src/components/commonPage/threeday.vue

@@ -187,8 +187,10 @@ export default {
       dayNum:{},
     showTime: {},
   },
-  data: {
-    isshowtime: true,
+  data() {
+    return {
+      isshowtime: true,
+    }
   },
   watch: {
     showTime: {

src/components/commonPage/twoday.vue

@@ -102,8 +102,10 @@ export default {
       dayNum:{},
     showTime: {},
   },
-  data: {
-    isshowtime: true,
+  data() {
+    return {
+      isshowtime: true,
+    }
   },
   watch: {
     showTime: {

src/components/confirmationOrderDownLoad.vue

@@ -31,7 +31,7 @@
   <div class="travelControlTrip detail-box">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <el-row style="margin-bottom:20px;">
-      <el-col :span="10">
+      <el-col :span="14">
         <el-dropdown trigger="click">
             <span class="el-dropdown-link">行程下载
               <i class="el-icon-arrow-down el-icon--right"></i>
@@ -47,8 +47,6 @@
                 下载电脑版WORD
               </el-dropdown-item>
             </el-dropdown-menu>
-            <span style="display:inline-block;margin-left:20px">显示行程日期：</span>
-            <el-checkbox v-model="isShowTime">备选项</el-checkbox>
         </el-dropdown>
         <!-- <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
           @click="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
@@ -57,6 +55,7 @@
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
           @click="gernalFeature(1)" /> -->
         <input type="button" value="新版行程" class="travelControlTripBtn" @click="goUrlView()"/>
+        <el-checkbox v-model="isShowTime">显示行程日期</el-checkbox>
         <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
           width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
           :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>