页面修改

src/boot/utils.js

@@ -6,12 +6,12 @@ import md5 from 'js-md5'
 Vue.prototype.domainManager = function () {
   let domainUrl = '';
   domainUrl = "http://192.168.2.214:8082";
-  domainUrl = "http://192.168.0.110";
+  domainUrl = "http://127.0.0.1";
   let locationName = location.hostname;
   if (locationName.indexOf('testerp.oytour') !== -1) {
-      domainUrl = "http://testapi.oytour.com";
+    domainUrl = "http://testapi.oytour.com";
   } else if (locationName.indexOf('oytour') !== -1) {
-      domainUrl = "http://reborn.oytour.com";
+    domainUrl = "http://reborn.oytour.com";
   }
   var obj = {
     //主地址
@@ -247,3 +247,7 @@ Vue.prototype.AddMonth = function (dateStr, month) {
 Vue.prototype.getUrlKey = function (name, url) {
   return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ""])[1].replace(/\+/g, '%20')) || null
 }
+Vue.prototype.GetHtml = function (str) {
+  return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>')
+    .replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&apos;/g, "'");
+}

src/components/trip/style3.vue

@@ -2882,17 +2882,18 @@
               useDinnerTypeBy = y.childItem.useDinnerType
             }
           })
-          if (can.breakfirst == '敬请自理' && useDinnerTypeBy.indexOf('1') != -1) {
+          console.log("useDinnerTypeBy",useDinnerTypeBy);
+          if (can.breakfirst == '敬请自理' && (useDinnerTypeBy && useDinnerTypeBy.indexOf('1') != -1)) {
             can.breakfirst = '酒店内享用早餐'
           } else if (can.breakfirst == '') {
             can.breakfirst = '方便游玩敬请自理'
           }
-          if (can.lanuch == '敬请自理' && useDinnerTypeBy.indexOf('2') != -1) {
+          if (can.lanuch == '敬请自理' &&   (useDinnerTypeBy && useDinnerTypeBy.indexOf('2') != -1)) {
             can.lanuch = '酒店自助'
           } else if (can.lanuch == '') {
             can.lanuch = '方便游玩敬请自理'
           }
-          if (can.dinner == '敬请自理' && useDinnerTypeBy.indexOf('3') != -1) {
+          if (can.dinner == '敬请自理' &&  (useDinnerTypeBy && useDinnerTypeBy.indexOf('3') != -1)) {
             can.dinner = '酒店自助'
           } else if (can.dinner == '') {
             can.dinner = '方便游玩敬请自理'

src/components/trip/style4.vue

@@ -38,10 +38,10 @@
       <div class="todayTitle">行程特色</div>
       <div class="featureBox">
         <template v-if="showType==3">
-          <div class="feature-inner" v-html="dataList.feature.featureContent" :class="{'isHiden4':isShow}"></div>
+          <div class="feature-inner" v-html="GetHtml(dataList.feature.featureContent)" :class="{'isHiden4':isShow}"></div>
         </template>
         <template v-if="showType>=4">
-          <div class="feature-inner" v-html="dataList.feature.featureHtml" :class="{'isHiden4':isShow}"></div>
+          <div class="feature-inner" v-html="GetHtml(dataList.feature.featureHtml)" :class="{'isHiden4':isShow}"></div>
         </template>
         <div class="collapse_toggle" v-if="!isShow">
           <i class="iconfont iconarrow-top" @click="isShow=true"></i>

src/components/trip/style5.vue

@@ -95,13 +95,13 @@
           <div class="expense">
             <div class="left">费用包含</div>
             <div class="right">
-              <div v-html="dataList.feature.feeInclude"></div>
+              <div v-html="GetHtml(dataList.feature.feeInclude)"></div>
             </div>
           </div>
           <div class="expense">
             <div class="left">自理费用</div>
             <div class="right">
-              <div v-html="dataList.feature.feeNonInclude"></div>
+              <div v-html="GetHtml(dataList.feature.feeNonInclude)"></div>
             </div>
           </div>
           <div class="fee_title">购物说明</div>
@@ -112,7 +112,7 @@
           <div class="expense">
             <div class="left"></div>
             <div class="right">
-              <div v-html="dataList.feature.shopRemark"></div>
+              <div v-html="GetHtml(dataList.feature.shopRemark)"></div>
             </div>
           </div>
           <div class="fee_title">预订须知</div>
@@ -123,13 +123,13 @@
           <div class="expense">
             <div class="left">重要提示</div>
             <div class="right">
-              <div v-html="dataList.feature.importantTip"></div>
+              <div v-html="GetHtml(dataList.feature.importantTip)"></div>
             </div>
           </div>
           <div class="expense">
             <div class="left">温馨提示</div>
             <div class="right">
-              <div v-html="dataList.feature.warmTip"></div>
+              <div v-html="GetHtml(dataList.feature.warmTip)"></div>
             </div>
           </div>
           <div class="fee_title">签证</div>

src/components/trip/style6.vue

@@ -404,17 +404,17 @@
               useDinnerTypeBy = y.childItem.useDinnerType
             }
           })
-          if (can.breakfirst == '敬请自理' && useDinnerTypeBy.indexOf('1') != -1) {
+          if (can.breakfirst == '敬请自理' &&  useDinnerTypeBy && useDinnerTypeBy.indexOf('1') != -1) {
             can.breakfirst = '酒店内享用早餐'
           } else if (can.breakfirst == '') {
             can.breakfirst = '方便游玩敬请自理'
           }
-          if (can.lanuch == '敬请自理' && useDinnerTypeBy.indexOf('2') != -1) {
+          if (can.lanuch == '敬请自理' &&  useDinnerTypeBy  && useDinnerTypeBy.indexOf('2') != -1) {
             can.lanuch = '酒店自助'
           } else if (can.lanuch == '') {
             can.lanuch = '方便游玩敬请自理'
           }
-          if (can.dinner == '敬请自理' && useDinnerTypeBy.indexOf('3') != -1) {
+          if (can.dinner == '敬请自理' &&  useDinnerTypeBy  && useDinnerTypeBy.indexOf('3') != -1) {
             can.dinner = '酒店自助'
           } else if (can.dinner == '') {
             can.dinner = '方便游玩敬请自理'