no message

src/components/FreeTravel/FreeHome.vue

@@ -1097,7 +1097,7 @@ export default {
             // M07 私人導遊
             // M08 點對點接送
             data.map((x, index)=>{
-              if (x.countries[0].name.indexOf('台灣') !== -1 || x.countries[0].name.indexOf('香港') !== -1 || x.countries[0].name.indexOf('澳門') !== -1 || x.countries[0].name.indexOf('澳门') !== -1){
+              if (x.countries[0].name.indexOf('台湾') !== -1 ||x.countries[0].name.indexOf('台灣') !== -1 || x.countries[0].name.indexOf('香港') !== -1 || x.countries[0].name.indexOf('澳門') !== -1 || x.countries[0].name.indexOf('澳门') !== -1){
                 x.countries[0].name = `中国-${x.countries[0].name}`
               }
               if (x.prod_type == 'M05') { // M05 票券

src/components/FreeTravel/FreeList.vue

@@ -1020,9 +1020,9 @@ export default {
     handleCurrentChange(val) {
       let start = this.msg.start
       if (val == 1) {
-        start = start == 0 ? 0 : start - 15
+        start = start == 0 ? 0 : start - 16
       } else {
-        start = start + 15
+        start = start + 16
       }
       // 翻页
       this.msg.start = start;

src/components/FreeTravel/FreeList2.vue

@@ -467,6 +467,10 @@
   align-items: center;
   margin-bottom: 10px;
 }
+.page-con{
+  margin-top: 25px;
+  text-align: center;
+}
 </style>
 <template>
   <div class="freeList2 commonF">
@@ -1104,9 +1108,9 @@ export default {
     handleCurrentChange(val) {
       let start = this.msg.start
       if (val == 1) {
-        start = start == 0 ? 0 : start - 15
+        start = start == 0 ? 0 : start - 16
       } else {
-        start = start + 15
+        start = start + 16
       }
       // 翻页
       this.msg.start = start;

src/components/global/newHead.vue

@@ -295,7 +295,7 @@
             </div>
           </li>-->
           <!-- 活动中心 -->
-          <li :class="{_active: navActive === 9}" style="width: auto;">
+          <!-- <li :class="{_active: navActive === 9}" style="width: auto;">
             <div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
               <img
                 style="z-index: -1;position: absolute;top: -27px;"
@@ -304,7 +304,7 @@
               />
               <img src="../../assets/img/task/nav_text.png" alt />
             </div>
-          </li>
+          </li> -->
           <li :class="{_active: navActive === 9}" class="juanmei">
             <div @click="handleSelect('JuanSaid', ), navActive = 9">
               <img src="../../assets/img/task/juanmei.png" alt />

src/plugins/index.js

@@ -13,10 +13,10 @@ export default {
             Vue.prototype.domainManager = function () {
                 // var domainUrl = "http://test_reborn.oytour.com";//主域名
                 //var domainUrl = "http://reborn.oytour.com"; //主域名
-                 var domainUrl = "http://192.168.2.65:8025"//主域名
+                //  var domainUrl = "http://192.168.2.65:8025"//主域名
                 //  let domainUrl = "https://reborn.oytour.com";
                 // domainUrl = "http://test.viitto.com"
-                // let domainUrl = "http://192.168.2.214:8082" 
+                let domainUrl = "http://192.168.2.214:8082" 
                 // var domainUrl = "http://reborn.oytour.com";
                 let locationName = window.location.hostname;
                 if (this.isOnline()) {
@@ -30,7 +30,8 @@ export default {
                     DomainUrl: domainUrl,
                     //常用提交数据URL 
                     PostUrl: domainUrl + "/api/common/post",
-                    javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
+                    // javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
+                    javaUrl: "http://efficient.oytour.com",
                     ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
                     UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
                     LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",