页面修改

src/components/Details.vue

@@ -878,7 +878,6 @@
       },
       getTitleByRouter(name) {
         let obj = {title:""};
-        // console.log("routerConfig.routes[11]",routerConfig.routes[12]);
         if (routerConfig.routes[12] && routerConfig.routes[12].children && routerConfig.routes[12].children.length>0) {
           routerConfig.routes[12].children[0].children.forEach(x => {
             if (x.name == name) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2065,15 +2065,12 @@
         }
       },
       checkDialog(value) {
-        console.log("value",value);
-        console.log("this.$tripUtils.TeamStatesList.salsPlat",this.$tripUtils.TeamStatesList.salsPlat);
         let checkedCount = value.length;
         this.queryCommonData.checkDialogAll =
           checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
       },
       //点击上架
       setUpPlat(item) {
-        console.log("item",item);
         this.queryCommonData.outerVisible = false;
         this.queryCommonData.setPlatDialog = true;
         this.queryCommonData.singleTCID = item.TCID;

src/components/myOrdersAllType/components/OrderListExaminePrice.vue

@@ -777,7 +777,6 @@
           res => {
             if (res.data.resultCode == 1) {
               this.list = res.data.data.pageData;
-              console.log("this.list",this.list);
             } else {
               this.$message.error(res.data.message);
             }

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -39,10 +39,12 @@
           :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
           v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
           @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
+
         <TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
           id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
           :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo">
         </TravelFeature>
+
         <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
           :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
           v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
@@ -164,7 +166,10 @@
           WCountryId: 0, //国家编号
           WLocationId: 0, //位置编号
           WCityId: 0, //城市编号
-          TripColor:"",//行程特色主色
+          TripColor: "", //行程特色主色
+          TripCountryList: [], //行程国家
+          TripCitwlist: [], //行程城市
+          TripMapList: [],
         },
         //行程
         FeatureData: {
@@ -390,7 +395,7 @@
             basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
           }
         }
-        basicData.TripColor=this.PostConfig.TripColor;
+        basicData.TripColor = this.PostConfig.TripColor;
         basicData.SelfpayingList = this.PostConfig.SelfpayingList;
         basicData.ShopList = this.PostConfig.ShopList;
         basicData.DinnerList = this.PostDaysTrip.DinnerList;
@@ -813,12 +818,14 @@
                 }
                 //如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
                 if (tempData.TripColor && tempData.TripColor != '') {
-                  this.PostConfig.TripColor=tempData.TripColor;
+                  this.PostConfig.TripColor = tempData.TripColor;
                   this.FeatureData.TripColor = tempData.TripColor;
                 } else if (tempData.LineTripColor && tempData.LineTripColor != '') {
-                  this.PostConfig.TripColor=tempData.LineTripColor;
+                  this.PostConfig.TripColor = tempData.LineTripColor;
                   this.FeatureData.TripColor = tempData.LineTripColor;
                 }
+                console.log(" this.PostConfig", this.PostConfig)
+                console.log(" this.FeatureData", this.FeatureData)
                 this.FeatureData.LtName = tempData.LtName;
                 this.FeatureData.DayList = tempData.DayList;
 

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -33,7 +33,7 @@
       <div class="TravelLine" v-if="TeamType!=3"></div>
       <div class="TravelNavList" v-if="(TeamType!=3)" :class="{'TravelCked':ckedNav==6}"
         @click.prevent="custormAnchor('thirdMap',6)">
-        地图 {{PostConfig.TeamType}}
+        地图
       </div>
       <div class="TravelLine" v-if="TeamType!=3"></div>
       <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}"

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -2042,7 +2042,6 @@
       priceList: {
         //深度监听，可监听到对象、数组的变化
         handler: function (val, oldVal) {
-          console.log("travel_price2");
           this.returnPriceList = JSON.parse(JSON.stringify(this.priceList));
           //当团期修改
           if (this.modifyTcid > 0) {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -195,9 +195,11 @@
         return detailsObj;
       },
       initFeature(isReload) {
-        this.FeatureData.FeatureHtmlJson.forEach(x=>{
-          x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize?x.dataObj.ShadowFontSize:60
-        })
+        if (this.FeatureData && this.FeatureData.FeatureHtmlJson&&typeof(this.FeatureData.FeatureHtmlJson)==Array) {
+          this.FeatureData.FeatureHtmlJson.forEach(x => {
+            x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize ? x.dataObj.ShadowFontSize : 60
+          })
+        }
         var oldJson = this.FeatureData.FeatureHtmlJson ?
           JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
           "";
@@ -262,7 +264,7 @@
         }
         newObj.ShadowName = "遇见最美好的自己";
         newObj.SubShadowName = "在古老的日本樱花街道";
-        newObj.ShadowFontSize = tripObj.ShadowFontSize?tripObj.ShadowFontSize:60;
+        newObj.ShadowFontSize = tripObj.ShadowFontSize ? tripObj.ShadowFontSize : 60;
         if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
           newObj.DetailsName = tripObj.scenicArray[0].MainName;
           var tempImgUrl = this.homeBg2;

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -36,8 +36,9 @@
           :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
           v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
           @change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect>
-        <TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
-          :TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
+        <TravelFeature :TripColor="PostConfig.TripColor" ref="TravelFeature" id="thirdAnchor"
+          @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
+          @unlockFormCommit="unlockFormCommit"></TravelFeature>
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
           :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
           v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
@@ -48,12 +49,14 @@
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
           </div>
-          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">{{$t('pub.saveBtn')}}</div>
-          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">{{$t('fnc.tijiao')}}</div>
+          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">
+            {{$t('pub.saveBtn')}}</div>
+          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">
+            {{$t('fnc.tijiao')}}</div>
           <div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(3)"
             :title="$t('sm.lcwxmb')">{{$t('pub.saveBtn')}}
           </div>
-<!-- 
+          <!-- 
           <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}</div>
           <div class="DTSaveBtn" v-if="ConfigId>0" @click="getMapList()">{{$t('sm.ditu')}}</div> -->
         </div>
@@ -134,6 +137,7 @@
           OpenTeamDescribe: '', //开团备注
           customId: 0,
           allotId: 0,
+          TripColor: "", //行程特色主色
         },
         //行程
         FeatureData: {
@@ -150,9 +154,12 @@
           Title: '',
           Subtitle: '',
           LineName: '',
+          LineShortName: "",
           DayList: [],
           TemplateId: 1,
-          IsSave: false //是否保存
+          IsSave: false, //是否保存
+          TripColor: "", //行程特色主色
+          LtName: "", //系列名称
         },
         //线路行程
         journeyList: {
@@ -248,7 +255,7 @@
         }
       },
       /*获取组件报价信息*/
-      getPrice(priceObj,OutGroupType) {
+      getPrice(priceObj, OutGroupType) {
         priceObj.forEach(objItem => {
           var SaleBranchId = ''
           if (objItem.SaleBranchIdArray.length > 0) {
@@ -641,8 +648,20 @@
                   this.PriceList = tempData.PriceList
                 }
 
-                this.FeatureData.Subtitle = tempData.LtName
-                this.FeatureData.LineName = tempData.LineName
+                if (tempData.LineShortName && tempData.LineShortName != '') {
+                  this.FeatureData.LineShortName = tempData.LineShortName;
+                } else {
+                  this.FeatureData.LineShortName = tempData.LineName;
+                }
+                //如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
+                if (tempData.TripColor && tempData.TripColor != '') {
+                  this.PostConfig.TripColor = tempData.TripColor;
+                  this.FeatureData.TripColor = tempData.TripColor;
+                } else if (tempData.LineTripColor && tempData.LineTripColor != '') {
+                  this.PostConfig.TripColor = tempData.LineTripColor;
+                  this.FeatureData.TripColor = tempData.LineTripColor;
+                }
+                this.FeatureData.LtName = tempData.LtName;
                 this.FeatureData.DayList = tempData.DayList2
 
                 this.ConfigId = tempData.ID
@@ -695,7 +714,7 @@
                 this.journeyList.DayList = tempData.DayList;
 
                 this.PostDaysTrip.TrafficList = [];
-                if (tempData.DayList&& tempData.DayList.length>0) {
+                if (tempData.DayList && tempData.DayList.length > 0) {
                   tempData.DayList.forEach(item => {
                     this.PostDaysTrip.TrafficList.push(item.TrafficObj);
                   })

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -416,7 +416,6 @@
               this.QScenicList = res.data.data;
             }
           },
-          err => {}
         );
       },
       getItemLabel(item) {
@@ -592,6 +591,7 @@
       //选中的景点
       'ChooseScenicArray': {
         handler: function (val, oldVal) {
+          console.log("this.ChooseScenicArray",this.ChooseScenicArray)
           //新增
           this.ChooseScenicArray.forEach(x => {
             let isExist = false;
@@ -604,6 +604,7 @@
               let scenic = this.$tripUtils.scenicObj();
               this.QScenicList.forEach(s => {
                 if (s.ID === x) {
+                  console.log("scenic22",s);
                   scenic.Description = s.Feature;
                   scenic.CouponsId = x;
                   scenic.CouponsName = s.Name;
@@ -620,7 +621,11 @@
                   };
                   if (s.PicPath != "") {
                     let picPath = s.PicPath.split(",")[0];
-                    scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
+                    if (picPath.indexOf('http://') != -1 || picPath.indexOf('https://') != -1) {
+                      scenicImg.Url = picPath;
+                    } else {
+                      scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
+                    }
                     scenicImg.fileName = picPath;
                   }
                   scenic.NewImaArray.push(scenicImg);
@@ -668,7 +673,6 @@
           });
           this.WarmTripDescribe.ScenicDescribeArr = scenicDescribeArr;
           this.dayObj.ChooseScenicArray = JSON.parse(JSON.stringify(this.ChooseScenicArray));
-
         }
       },
       WarmTripDescribe: {

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -247,8 +247,7 @@
         <div class="TC-warmTips TC-Comtitlediv TC-warmText" v-if="dayObj.isRead" :class="{'showOther':TeamType==3}">
           <div class="TC-SpecialInstruction clearfix column" style="margin: 0;">
             <div class="TC-leftTitle">温馨提示</div>
-            <div class="TC-rightContent" style="width: 99%;"
-             v-html="dayObj.WarmTipObj.Description"></div>
+            <div class="TC-rightContent" style="width: 99%;" v-html="dayObj.WarmTipObj.Description"></div>
           </div>
         </div>
         <hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe"
@@ -650,7 +649,11 @@
                   };
                   if (s.PicPath != "") {
                     let picPath = s.PicPath.split(",")[0];
-                    scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
+                    if (picPath.indexOf('http://') != -1 || picPath.indexOf('https://') != -1) {
+                      scenicImg.Url = picPath;
+                    } else {
+                      scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
+                    }
                     scenicImg.fileName = picPath;
                   }
                   scenic.NewImaArray.push(scenicImg);

src/components/orderCommon/order-form2.vue

@@ -2312,8 +2312,6 @@
       productObj: {
         handler(oldValue, newVal) {
           this.clearMsg();
-          //this.getTravelPirceInfo();
-          console.log(oldValue,'----------')
           this.addMsg.DepartureCityId = oldValue.StartCityID;
           this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId;
           this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;

src/components/scenicSpot/scenicSpotList.vue

@@ -270,7 +270,6 @@
           <span>
             <em>{{$t('ground.menpiaozhongl')}}</em>
             <el-select v-model="msg.IsFree" class='multiple_input w210' :placeholder="$t('pub.pleaseSel')">
-              <!-- <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option> -->
               <el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -298,7 +297,7 @@
       <div class="resourceList" v-for="item in tableData" :key="item.subCode">
         <div class="reTopInfo" :class="{'comCursorUrl':item.Url}" @click="OpenNewUrl(item.Url)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
-          <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
+          <img v-else :src='item.PicPath' :onerror="defaultImg">
           <div class="resTypeList">
             <span v-for="(items,index) in item.OpenPlatformList"
               :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"