Commit 4d0dd2fb authored by 黄奎's avatar 黄奎

页面修改

parent 711aef54
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
WCountryId: 0, //国家编号 WCountryId: 0, //国家编号
WLocationId: 0, //位置编号 WLocationId: 0, //位置编号
WCityId: 0, //城市编号 WCityId: 0, //城市编号
TripColor:"",//行程特色主色
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -372,7 +373,6 @@ ...@@ -372,7 +373,6 @@
basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe; basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe;
basicData.RemoveChild = this.PostConfig.RemoveChild; basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.OfferId = this.PostConfig.OfferId; basicData.OfferId = this.PostConfig.OfferId;
basicData.TeamType = this.PostConfig.TeamType; basicData.TeamType = this.PostConfig.TeamType;
basicData.StartCityId = 0; basicData.StartCityId = 0;
basicData.ReturnArriveCityId = 0; basicData.ReturnArriveCityId = 0;
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId; basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
} }
} }
basicData.TripColor=this.PostConfig.TripColor;
basicData.SelfpayingList = this.PostConfig.SelfpayingList; basicData.SelfpayingList = this.PostConfig.SelfpayingList;
basicData.ShopList = this.PostConfig.ShopList; basicData.ShopList = this.PostConfig.ShopList;
basicData.DinnerList = this.PostDaysTrip.DinnerList; basicData.DinnerList = this.PostDaysTrip.DinnerList;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<span class="absolute">{{'0'+(i+1)}}</span> <span class="absolute">{{'0'+(i+1)}}</span>
</div> </div>
<div class="UpgradedVersionDetails-T absolute"> <div class="UpgradedVersionDetails-T absolute">
<vEditDiv :canEdit='canEdit1' v-model="item.MainDesc"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
</div> </div>
</div> </div>
<div class="UpgradedVersionDetails-Img-two relative"> <div class="UpgradedVersionDetails-Img-two relative">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</template> </template>
</div> </div>
<div class="UpgradedVersionDetails-T-two"> <div class="UpgradedVersionDetails-T-two">
<vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="item.MainDesc"></vEditDiv>
</div> </div>
</div> </div>
</div> </div>
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
data() { data() {
return { return {
canEdit: true, canEdit: true,
canEdit1: true,
backgroundColor: null, backgroundColor: null,
subscriptText: [{ subscriptText: [{
Name: 'FOODING', Name: 'FOODING',
...@@ -104,7 +103,7 @@ ...@@ -104,7 +103,7 @@
queryId: 0, queryId: 0,
}, },
isShowScenicImg: false, isShowScenicImg: false,
MasterMapIndex: null,//主图下标 MasterMapIndex: null, //主图下标
}; };
}, },
methods: { methods: {
...@@ -133,11 +132,11 @@ ...@@ -133,11 +132,11 @@
} }
}, },
SelectImg(index) { SelectImg(index) {
this.MasterMapIndex = index?index:0 this.MasterMapIndex = index ? index : 0
if(this.FeatureData.pageType==3) this.choseType = 2 if (this.FeatureData.pageType == 3) this.choseType = 2
else if(this.FeatureData.pageType==4) this.choseType = 1 else if (this.FeatureData.pageType == 4) this.choseType = 1
else if(this.FeatureData.pageType==5) this.choseType = 2 else if (this.FeatureData.pageType == 5) this.choseType = 2
else if(this.FeatureData.pageType==6) this.choseType = 3 else if (this.FeatureData.pageType == 6) this.choseType = 3
else this.choseType = 0 else this.choseType = 0
this.isShowScenicImg = true this.isShowScenicImg = true
}, },
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
}, },
toAddPages() { toAddPages() {
this.$emit('toAddPages', this.index, this.FeatureData) this.$emit('toAddPages', this.index, this.FeatureItem)
}, },
toDeletePages() { toDeletePages() {
this.$emit('toDeletePages', this.index) this.$emit('toDeletePages', this.index)
......
...@@ -121,11 +121,12 @@ ...@@ -121,11 +121,12 @@
return pageObj; return pageObj;
}, },
//添加页面 //添加页面
AddPages(index, FeatureData) { AddPages(index, featureDataObj) {
console.log("featureDataObj",featureDataObj);
var pageData = this.getPageObj(); var pageData = this.getPageObj();
pageData.isDeletePage = true pageData.isDeletePage = true
pageData.pageType = FeatureData.pageType pageData.pageType = featureDataObj.pageType
if (FeatureData.pageType > 3) { if (featureDataObj.pageType > 3) {
pageData.pageTemplate = 1 pageData.pageTemplate = 1
} }
this.pageList.splice(index, 0, pageData); this.pageList.splice(index, 0, pageData);
...@@ -209,12 +210,10 @@ ...@@ -209,12 +210,10 @@
}], }],
MainDesc: "特色餐描述" MainDesc: "特色餐描述"
}; };
if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) { if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
if (tripObj.dinnerArray.length == 1) { if (tripObj.dinnerArray.length > 2) {
tripObj.dinnerArray.forEach(dItem => { tripObj.dinnerArray.forEach((dItem, dIndex) => {
var tempImaList=dItem.ImgList; if (dIndex <= 2) {
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
...@@ -222,10 +221,9 @@ ...@@ -222,10 +221,9 @@
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
}
}) })
newObj.SubList.push(dinnerObj); } else if (tripObj.dinnerArray.length > 1) {
newObj.SubList.push(dinnerObj);
} else if (tripObj.dinnerArray.length == 2) {
tripObj.dinnerArray.forEach(dItem => { tripObj.dinnerArray.forEach(dItem => {
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
...@@ -237,9 +235,9 @@ ...@@ -237,9 +235,9 @@
}) })
newObj.SubList.push(dinnerObj); newObj.SubList.push(dinnerObj);
} else if (tripObj.dinnerArray.length >= 3) { } else if (tripObj.dinnerArray.length > 0) {
tripObj.dinnerArray.forEach((dItem, dIndex) => { tripObj.dinnerArray.forEach(dItem => {
if (dIndex <= 2) { var tempImaList = dItem.ImgList;
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
...@@ -247,8 +245,9 @@ ...@@ -247,8 +245,9 @@
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
}
}) })
newObj.SubList.push(dinnerObj);
newObj.SubList.push(dinnerObj);
} }
} }
} }
......
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