Commit ac630930 authored by 华国豪's avatar 华国豪 🙄

1

parent 3e071169
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
}); });
this.FeatureData.FeatureHtmlJson = null this.FeatureData.FeatureHtmlJson = null
this.FeatureData.FeatureHtmlJsonDelete = null this.FeatureData.FeatureHtmlJsonDelete = null
this.FeatureData.lastFeatureType = this.FeatureData.FeatureType this.FeatureData.lastFeatureType = this.FeatureData.FeatureType < 4 ? true : false
this.FeatureData.switch4or5 = true this.FeatureData.switch4or5 = true
this.$forceUpdate() this.$forceUpdate()
}).catch(() => { }).catch(() => {
...@@ -601,7 +601,6 @@ ...@@ -601,7 +601,6 @@
}, },
initFeature() { initFeature() {
this.TypeArray.forEach(x => { this.TypeArray.forEach(x => {
console.log("this.FeatureData.FeatureType",this.FeatureData.FeatureType)
if (x.TypeState == this.FeatureData.FeatureType) { if (x.TypeState == this.FeatureData.FeatureType) {
x.isShow = true; x.isShow = true;
this.ckTitle = x.ckTitle; this.ckTitle = x.ckTitle;
......
...@@ -1355,10 +1355,10 @@ ...@@ -1355,10 +1355,10 @@
let dataList = JSON.parse(JSON.stringify(this.FeatureData)); let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)); let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = !deleteDataList ? [] : deleteDataList; this.deleteArray = !deleteDataList ? [] : deleteDataList;
console.log("this.deleteArray", this.deleteArray) // console.log("this.deleteArray", this.deleteArray)
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5) // console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4) // console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType<4)){ if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据 for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮 let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店 let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店
...@@ -1647,24 +1647,30 @@ ...@@ -1647,24 +1647,30 @@
imgList = this.hotelObj.list[index1].images; imgList = this.hotelObj.list[index1].images;
for (let i = 0; i < imgList.length; i ++) { for (let i = 0; i < imgList.length; i ++) {
imgList[i].y = 0; imgList[i].y = 0;
imgList[i].x = 0;
if (this.$refs["hotelVds_"+index1+"_"+i]) { if (this.$refs["hotelVds_"+index1+"_"+i]) {
this.$refs["hotelVds_"+index1+"_"+i][0]._data.top=0 this.$refs["hotelVds_"+index1+"_"+i][0]._data.top=0
this.$refs["hotelVds_"+index1+"_"+i][0]._data.left=0
} }
} }
} else if (name === 'viewSpot') { } else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images; imgList = this.viewSpotObj.list[index1].images;
for (let i = 0; i < imgList.length; i ++) { for (let i = 0; i < imgList.length; i ++) {
imgList[i].y = 0; imgList[i].y = 0;
imgList[i].x = 0;
if (this.$refs["viewSpotVds_"+index1+"_"+i]) { if (this.$refs["viewSpotVds_"+index1+"_"+i]) {
this.$refs["viewSpotVds_"+index1+"_"+i][0]._data.top=0 this.$refs["viewSpotVds_"+index1+"_"+i][0]._data.top=0
this.$refs["viewSpotVds_"+index1+"_"+i][0]._data.left = 0
} }
} }
} else if (name === 'restaurant') { } else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images; imgList = this.restaurantObj.list[index1].images;
for (let i = 0; i < imgList.length; i ++) { for (let i = 0; i < imgList.length; i ++) {
imgList[i].y = 0; imgList[i].y = 0;
imgList[i].x = 0;
if (this.$refs["restaurantVds_"+index1+"_"+i]) { if (this.$refs["restaurantVds_"+index1+"_"+i]) {
this.$refs["restaurantVds_"+index1+"_"+i][0]._data.top=0 this.$refs["restaurantVds_"+index1+"_"+i][0]._data.top=0
this.$refs["restaurantVds_"+index1+"_"+i][0]._data.left = 0
} }
} }
} }
......
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