Skip to content

S
SuperMan
Commit 746b7028 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 645387ac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 483 additions and 475 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 746b7028
...@@ -2168,8 +2168,6 @@ ...@@ -2168,8 +2168,6 @@
Id: this.ID, Id: this.ID,
InvoiceVoucherList: this.InvoiceVoucherList InvoiceVoucherList: this.InvoiceVoucherList
}; };
console.log("this.InvoiceVoucherList",this.InvoiceVoucherList);
this.apipost('Financial_post_UpdateInvoiceVoucher', msg, res => { this.apipost('Financial_post_UpdateInvoiceVoucher', msg, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.$message.success('上传成功'); this.$message.success('上传成功');
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 746b7028
...@@ -2290,7 +2290,6 @@ ...@@ -2290,7 +2290,6 @@
TempId: tempId, TempId: tempId,
TCIDList: (this.orderObj && this.orderObj.TCIDList) ? this.orderObj.TCIDList : [] TCIDList: (this.orderObj && this.orderObj.TCIDList) ? this.orderObj.TCIDList : []
}, res => { }, res => {
console.log("Financial_post_Get",res.data.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
...@@ -2463,8 +2462,6 @@ ...@@ -2463,8 +2462,6 @@
this.saveMsg.push(x); this.saveMsg.push(x);
}) })
} }
console.log("InvoiceVoucherInfo",data.InvoiceVoucherInfo);
if (data.InvoiceVoucherInfo) { if (data.InvoiceVoucherInfo) {
data.InvoiceVoucherInfo.forEach(x => { data.InvoiceVoucherInfo.forEach(x => {
x.Url = x.Content; x.Url = x.Content;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 746b7028
...@@ -1754,7 +1754,6 @@ ...@@ -1754,7 +1754,6 @@
}; };
this.TotalNav.planPriceList.forEach(item => { this.TotalNav.planPriceList.forEach(item => {
if (item.CurrencyId == id) { if (item.CurrencyId == id) {
console.log("ceeeeee",item);
obj.money += item.PlanTotalPrice; obj.money += item.PlanTotalPrice;
obj.CurrencyId = item.CurrencyId; obj.CurrencyId = item.CurrencyId;
} }
......
src/components/Ticketing/PassengerList.vue
View file @ 746b7028
...@@ -547,14 +547,12 @@ ...@@ -547,14 +547,12 @@
}) })
fileName = fileName + TempfileName fileName = fileName + TempfileName
fileName = fileName + this.$route.query.alcode fileName = fileName + this.$route.query.alcode
console.log("QueryMsg",this.QueryMsg);
//厦航的用csv //厦航的用csv
if (this.QueryMsg.TempCode == "MF") { if (this.QueryMsg.TempCode == "MF") {
fileName = fileName + ".csv"; fileName = fileName + ".csv";
} else { } else {
fileName = fileName + ".xls"; fileName = fileName + ".xls";
} }
// fileName = fileName + ".xls";
this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName); this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
......
src/components/activity/CouponDetail.vue
View file @ 746b7028
...@@ -103,7 +103,6 @@ ...@@ -103,7 +103,6 @@
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
console.log("coupon_post_GetCouponAllotPage", res.data);
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData;
......
src/components/activity/CouponList.vue
View file @ 746b7028
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
CouponPlatformEnumList: [], CouponPlatformEnumList: [],
companyList: [], companyList: [],
customerList: [], customerList: [],
checkedCustomerList: [],//选择的人员信息 checkedCustomerList: [], //选择的人员信息
layerDepartMentList: [], layerDepartMentList: [],
departMentList: [], departMentList: [],
PostList: [], PostList: [],
...@@ -808,14 +808,16 @@ ...@@ -808,14 +808,16 @@
//发放优惠券 //发放优惠券
AutoGrantCounItem(item) { AutoGrantCounItem(item) {
this.grantCouponMsg = Object.assign({}, item); this.grantCouponMsg = Object.assign({}, item);
this.customerList=[]; this.customerList = [];
this.checkedCustomerList=[]; this.checkedCustomerList = [];
console.log("grantCouponMsg", this.grantCouponMsg);
}, },
//发放优惠券确认 //发放优惠券确认
AdminGrantCoupon() { AdminGrantCoupon() {
this.apipost("coupon_post_AdminGrantCoupon", {Id:this.grantCouponMsg.id,CustomerList:this.checkedCustomerList}, res => { this.apipost("coupon_post_AdminGrantCoupon", {
Id: this.grantCouponMsg.id,
CustomerList: this.checkedCustomerList
}, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.updateKucundialog = false; this.updateKucundialog = false;
...@@ -853,8 +855,9 @@ AdminGrantCoupon() { ...@@ -853,8 +855,9 @@ AdminGrantCoupon() {
}, },
//删除客户标签 //删除客户标签
deleteTag(item) { deleteTag(item) {
let result = this.customerList.find(temp => temp.customerId ===item.customerId); let result = this.customerList.find(temp => temp.customerId === item.customerId);
if(result){ result.ischecked=false; if (result) {
result.ischecked = false;
} }
let index = this.checkedCustomerList.indexOf(item); let index = this.checkedCustomerList.indexOf(item);
if (index !== -1) { if (index !== -1) {
...@@ -862,9 +865,9 @@ AdminGrantCoupon() { ...@@ -862,9 +865,9 @@ AdminGrantCoupon() {
} }
}, },
getSelect(item) { getSelect(item) {
if(item.ischecked){ if (item.ischecked) {
this.checkedCustomerList.push(item); this.checkedCustomerList.push(item);
}else{ } else {
let index = this.checkedCustomerList.indexOf(item.customerId); let index = this.checkedCustomerList.indexOf(item.customerId);
this.checkedCustomerList.splice(index, 1); this.checkedCustomerList.splice(index, 1);
} }
...@@ -873,10 +876,9 @@ AdminGrantCoupon() { ...@@ -873,10 +876,9 @@ AdminGrantCoupon() {
getCustomerBrandByKeyWord() { getCustomerBrandByKeyWord() {
this.xuanzeCustomerLoading = true; this.xuanzeCustomerLoading = true;
this.customerList = []; this.customerList = [];
console.log("this.grantCouponMsg.customerType",this.grantCouponMsg.customerType); let cmdStr = "app_post_GetCustomerBrandByKeyWord";
let cmdStr="app_post_GetCustomerBrandByKeyWord"; if (this.grantCouponMsg.customerType == 1) {
if(this.grantCouponMsg.customerType==1){ cmdStr = "Sell_Post_GetDirectCustomerListByKey";
cmdStr="Sell_Post_GetDirectCustomerListByKey";
} }
this.apipost( this.apipost(
cmdStr, cmdStr,
...@@ -887,10 +889,10 @@ AdminGrantCoupon() { ...@@ -887,10 +889,10 @@ AdminGrantCoupon() {
var tempData = res.data.data; var tempData = res.data.data;
if (tempData && tempData.length > 0) { if (tempData && tempData.length > 0) {
tempData.forEach(item => { tempData.forEach(item => {
let result = this.checkedCustomerList.find(temp => temp.customerId ===item.customerId); let result = this.checkedCustomerList.find(temp => temp.customerId === item.customerId);
if(result){ item.ischecked=true; if (result) {
} item.ischecked = true;
else{ } else {
item.ischecked = false; item.ischecked = false;
} }
}) })
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 746b7028
...@@ -554,7 +554,6 @@ ...@@ -554,7 +554,6 @@
} else { } else {
title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游'; title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
} }
console.log("title", title);
var fileName = title + ".pdf"; var fileName = title + ".pdf";
that.pdfDownLoad(fileName, msg); that.pdfDownLoad(fileName, msg);
// if (this.orderId && this.orderId > 0) { // if (this.orderId && this.orderId > 0) {
...@@ -569,7 +568,6 @@ ...@@ -569,7 +568,6 @@
// objFileKey += "/" + msg.configId + "_" + msg.tcid; // objFileKey += "/" + msg.configId + "_" + msg.tcid;
// objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf"; // objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
// that.downloadChengDuFileRename(objFileKey, fileName, res => { // that.downloadChengDuFileRename(objFileKey, fileName, res => {
// console.log("ali_doanload", res)
// if (res.resultCode == 0) { // if (res.resultCode == 0) {
// } else { // } else {
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 746b7028
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<!-- --> <!-- -->
<div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading"> <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading">
<iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;" <iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
:style="{'height':myIframeHeigth+'px'}" > :style="{'height':myIframeHeigth+'px'}">
</iframe> </iframe>
<!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0"> <!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
<template v-for="url in FeatureData.TripImageListNew"> <template v-for="url in FeatureData.TripImageListNew">
...@@ -133,15 +133,15 @@ ...@@ -133,15 +133,15 @@
:preview-src-list="FeatureData.TripImageListNew"></el-image> :preview-src-list="FeatureData.TripImageListNew"></el-image>
</template> </template>
</div> --> </div> -->
<div v-show="PostMessageText=='暂无行程数据'" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div> <div v-show="PostMessageText=='暂无行程数据'"
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- ppt 模版新增编辑窗口 --> <!-- ppt 模版新增编辑窗口 -->
<pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" @close="closeIframe()"></pptIframe>
@close="closeIframe()"></pptIframe>
</div> </div>
</template> </template>
<script> <script>
...@@ -282,8 +282,8 @@ ...@@ -282,8 +282,8 @@
CurrentUserInfo: {}, CurrentUserInfo: {},
dialogPptistVisible: false, dialogPptistVisible: false,
userInfo: {}, userInfo: {},
TemplateUrl:'',// 模版 修改url TemplateUrl: '', // 模版 修改url
myIframeUrl:'',//行程特色url myIframeUrl: '', //行程特色url
myIframeHeigth: 0, myIframeHeigth: 0,
isPostMessage: false, isPostMessage: false,
PostMessageText: '', PostMessageText: '',
...@@ -295,37 +295,36 @@ ...@@ -295,37 +295,36 @@
}, },
methods: { methods: {
closeIframe(){ closeIframe() {
this.dialogPptistVisible = false this.dialogPptistVisible = false
}, },
handleMessage(event,targetOrigin) { handleMessage(event, targetOrigin) {
console.log(event.data,'-----------event.data') console.log(event.data, '-----------event.data')
if(event.data&&event.data.data&&!event.data.data) return if (event.data && event.data.data && !event.data.data) return
if(this.isPostMessage) return if (this.isPostMessage) return
if(event.data&&event.data=='行程数据保存成功'){ if (event && event.data && event.data == '行程数据保存成功') {
// this.dialogPptistVisible = false
this.$emit('ConfigInfo') this.$emit('ConfigInfo')
if(document.all.myIframe){ if (document.all.myIframe) {
document.all.myIframe.src = this.myIframeUrl document.all.myIframe.src = this.myIframeUrl
} }
}else if(event.data&&event.data.indexOf('行程特色高')!=-1){ } else if (event && event.data && event.data.indexOf('行程特色高') != -1) {
this.PostMessageText = '' this.PostMessageText = ''
let datas = event.data.split('-') let datas = event.data.split('-')
this.myIframeHeigth = datas[1] this.myIframeHeigth = datas[1]
}else if(event.data&&event.data=='暂无行程数据'){ } else if (event && event.data && event.data == '暂无行程数据') {
this.PostMessageText = event.data this.PostMessageText = event.data
} }
this.isPostMessage = true this.isPostMessage = true
this.iframeLoading = false this.iframeLoading = false
}, },
// 添加编辑模版 // 添加编辑模版
journeyTemplate(type){ journeyTemplate(type) {
this.isPostMessage = false this.isPostMessage = false
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
if(type&&type==1){ if (type && type == 1) {
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1` this.TemplateUrl = `${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1`
}else{ } else {
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0` this.TemplateUrl = `${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0`
} }
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
...@@ -560,9 +559,9 @@ ...@@ -560,9 +559,9 @@
}); });
} }
this.initFileList(); this.initFileList();
if(this.FeatureData.FeatureType==9) { if (this.FeatureData.FeatureType == 9) {
// this.iframeLoading = true // this.iframeLoading = true
if(document.all.myIframe){ if (document.all.myIframe) {
document.all.myIframe.src = this.myIframeUrl document.all.myIframe.src = this.myIframeUrl
this.isPostMessage = false this.isPostMessage = false
} }
...@@ -638,21 +637,22 @@ ...@@ -638,21 +637,22 @@
} }
}, },
mounted() { mounted() {
window.addEventListener('message', this.handleMessage,false); window.addEventListener('message', this.handleMessage, false);
this.userInfo = this.getLocalStorage() this.userInfo = this.getLocalStorage()
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo this.CurrentUserInfo = userInfo
this.MsgBus.$on('FeatureDataFlag', () => { this.MsgBus.$on('FeatureDataFlag', () => {
this.FeatureDataFlag = true this.FeatureDataFlag = true
}); });
let obj = this.TypeArray.find(x=>{ let obj = this.TypeArray.find(x => {
return x.TypeState == this.FeatureData.FeatureType return x.TypeState == this.FeatureData.FeatureType
}) })
if(obj){ if (obj) {
this.clickFeature(obj) this.clickFeature(obj)
} }
this.myIframeUrl = `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108` this.myIframeUrl =
if(document.all.myIframe){ `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108`
if (document.all.myIframe) {
document.all.myIframe.src = this.myIframeUrl document.all.myIframe.src = this.myIframeUrl
this.isPostMessage = false this.isPostMessage = false
} }
...@@ -666,7 +666,7 @@ ...@@ -666,7 +666,7 @@
}, },
deep: true, deep: true,
immediate:true immediate: true
}, },
"FeatureData.fileList": { "FeatureData.fileList": {
handler: function (val, oldval) { handler: function (val, oldval) {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 746b7028
...@@ -72,7 +72,25 @@ ...@@ -72,7 +72,25 @@
data() { data() {
return { return {
canEdit: true, canEdit: true,
pageList: [{ pageList: [],
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
homeBgOz1: "https://imgfile.oytour.com/Static/NewTripFeature/homebgoz.jpg", //欧洲线默认图
homeBgNy: "https://imgfile.oytour.com/Static/NewTripFeature/homebgny.jpg", //南亚线默认图
homeBgGn: "https://imgfile.oytour.com/Static/NewTripFeature/homebggn.jpg", //国内线
homeBghg: "https://imgfile.oytour.com/Static/NewTripFeature/homebghg.jpg", //韩国
homeBg2: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg",
dinner1: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg",
dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
dinner3: "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg",
dinner4: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg",
RenderingOk: false,
DataArray: [], //房、餐、景点数组
};
},
methods: {
getConfigData() {
var configArray = [{
pageTitle: '介绍', pageTitle: '介绍',
pageType: 1, pageType: 1,
pageTemplate: 0, pageTemplate: 0,
...@@ -121,26 +139,12 @@ ...@@ -121,26 +139,12 @@
pageTemplate: 3, pageTemplate: 3,
dataObj: {}, dataObj: {},
}, },
], ]
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg", return configArray;
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
homeBgOz1: "https://imgfile.oytour.com/Static/NewTripFeature/homebgoz.jpg", //欧洲线默认图
homeBgNy: "https://imgfile.oytour.com/Static/NewTripFeature/homebgny.jpg", //南亚线默认图
homeBgGn: "https://imgfile.oytour.com/Static/NewTripFeature/homebggn.jpg", //国内线
homeBghg: "https://imgfile.oytour.com/Static/NewTripFeature/homebghg.jpg", //韩国
homeBg2: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg",
dinner1: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg",
dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
dinner3: "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg",
dinner4: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg",
RenderingOk: false,
DataArray: [], //房、餐、景点数组
};
}, },
methods: {
UploadImg(pageType, index, url) { UploadImg(pageType, index, url) {
if (pageType == 1) { if (pageType == 1) {
this.pageList[index].dataObj.ImgList[0].url = url this.pageList[index].dataObj.ImgList[0].url = url;
} }
}, },
getPageObj() { getPageObj() {
...@@ -195,8 +199,9 @@ ...@@ -195,8 +199,9 @@
//首页2 //首页2
else if (featureDataObj.pageType == 7) { else if (featureDataObj.pageType == 7) {
pageData.pageTitle = "首页2"; pageData.pageTitle = "首页2";
if(pageData.dataObj&&pageData.dataObj.ImgList&&pageData.dataObj.ImgList.length>0) pageData.dataObj.ImgList[0].x = 0 if (pageData.dataObj && pageData.dataObj.ImgList && pageData.dataObj.ImgList.length > 0) pageData.dataObj
this.getHomeData(tripObj, newObj,1); .ImgList[0].x = 0
this.getHomeData(tripObj, newObj, 1);
} }
pageData.dataObj = newObj; pageData.dataObj = newObj;
this.pageList.splice(index, 0, pageData); this.pageList.splice(index, 0, pageData);
...@@ -220,7 +225,6 @@ ...@@ -220,7 +225,6 @@
this.$set(this.pageList, index, downItem); this.$set(this.pageList, index, downItem);
} }
} }
}, },
//删除页面 //删除页面
DeletePages(index) { DeletePages(index) {
...@@ -267,6 +271,7 @@ ...@@ -267,6 +271,7 @@
this.pageList = oldJson; this.pageList = oldJson;
this.RenderingOk = true; this.RenderingOk = true;
} else { } else {
this.pageList=this.getConfigData();
this.pageList.forEach(pItem => { this.pageList.forEach(pItem => {
var newObj = this.getDetailsObj(); var newObj = this.getDetailsObj();
newObj.LineName = this.FeatureData.LineName; newObj.LineName = this.FeatureData.LineName;
...@@ -298,7 +303,7 @@ ...@@ -298,7 +303,7 @@
} }
//首页2 //首页2
else if (pItem.pageType == 7) { else if (pItem.pageType == 7) {
this.getHomeData(tripObj, newObj); this.getHomeData(tripObj, newObj, 1);
} }
pItem.dataObj = newObj; pItem.dataObj = newObj;
}); });
...@@ -306,7 +311,7 @@ ...@@ -306,7 +311,7 @@
} }
}, },
//首页数据渲染 //首页数据渲染
getHomeData(tripObj, newObj,type) { getHomeData(tripObj, newObj, type) {
if (tripObj.cityStr && tripObj.cityStr != '') { if (tripObj.cityStr && tripObj.cityStr != '') {
newObj.MainName = tripObj.cityStr; //地区1 newObj.MainName = tripObj.cityStr; //地区1
} else { } else {
...@@ -343,23 +348,24 @@ ...@@ -343,23 +348,24 @@
newObj.MainDesc = "景点描述"; newObj.MainDesc = "景点描述";
} }
// 新版首页2023/11/20 // 新版首页2023/11/20
if(type){ if (type) {
if(!newObj.SceneDesc){ if (!newObj.SceneDesc) {
newObj.maskPosition = false newObj.maskPosition = false
newObj.Meal = '餐食' newObj.Meal = '餐食'
newObj.MealName = tripObj.dinnerArray.length>0?tripObj.dinnerArray[0].MainName:'餐食名称' newObj.MealName = tripObj.dinnerArray.length > 0 ? tripObj.dinnerArray[0].MainName : '餐食名称'
newObj.MealName2 = tripObj.dinnerArray.length>1?tripObj.dinnerArray[1].MainName:'餐食名称' newObj.MealName2 = tripObj.dinnerArray.length > 1 ? tripObj.dinnerArray[1].MainName : '餐食名称'
newObj.Host = '住宿' newObj.Host = '住宿'
newObj.HostName = tripObj.hotelArray.length>0?tripObj.hotelArray[0].MainName:'酒店名称' newObj.HostName = tripObj.hotelArray.length > 0 ? tripObj.hotelArray[0].MainName : '酒店名称'
newObj.HostName2 = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称' newObj.HostName2 = tripObj.hotelArray.length > 1 ? tripObj.hotelArray[1].MainName : '酒店名称'
newObj.Scene = '风景' newObj.Scene = '风景'
newObj.SceneDesc = tripObj.scenicArray.length>0?tripObj.scenicArray[0].MainName+'：'+tripObj.scenicArray[0].MainDesc:'景点描述信息' newObj.SceneDesc = tripObj.scenicArray.length > 0 ? tripObj.scenicArray[0].MainName + '：' + tripObj
newObj.SceneTitle2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainName:'景点名称' .scenicArray[0].MainDesc : '景点描述信息'
newObj.SceneDesc2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainDesc:'景点描述信息' newObj.SceneTitle2 = tripObj.scenicArray.length > 1 ? tripObj.scenicArray[1].MainName : '景点名称'
newObj.HostTitle = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称' newObj.SceneDesc2 = tripObj.scenicArray.length > 1 ? tripObj.scenicArray[1].MainDesc : '景点描述信息'
newObj.HostDesc = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainDesc:'酒店描述信息' newObj.HostTitle = tripObj.hotelArray.length > 1 ? tripObj.hotelArray[1].MainName : '酒店名称'
newObj.SceneTitle3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainName:'景点名称' newObj.HostDesc = tripObj.hotelArray.length > 1 ? tripObj.hotelArray[1].MainDesc : '酒店描述信息'
newObj.SceneDesc3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainDesc:'景点描述信息' newObj.SceneTitle3 = tripObj.scenicArray.length > 2 ? tripObj.scenicArray[2].MainName : '景点名称'
newObj.SceneDesc3 = tripObj.scenicArray.length > 2 ? tripObj.scenicArray[2].MainDesc : '景点描述信息'
} }
} }
}, },
...@@ -817,8 +823,7 @@ ...@@ -817,8 +823,7 @@
}, },
watch: { watch: {
FeatureData: { FeatureData: {
handler(val, oldVal) { handler(val, oldVal) {},
},
deep: true, deep: true,
immediate: true immediate: true
}, },
......
src/plug/index.js
View file @ 746b7028
...@@ -1162,7 +1162,6 @@ export default { ...@@ -1162,7 +1162,6 @@ export default {
if (xhr.status === 200) { if (xhr.status === 200) {
resolve(xhr.response); resolve(xhr.response);
} else if (xhr.status === 404) { } else if (xhr.status === 404) {
console.log("downloadChengDuFileRename_404", objectKey);
if (callBack) { if (callBack) {
callBack(resultJson) callBack(resultJson)
} }
...@@ -1195,7 +1194,6 @@ export default { ...@@ -1195,7 +1194,6 @@ export default {
}); });
} catch (err) { } catch (err) {
resultJson.resultCode = 0; resultJson.resultCode = 0;
console.log("downloadChengDuFileRename", err);
if (callBack) { if (callBack) {
callBack(resultJson) callBack(resultJson)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment