Commit e74efecb authored by youjie's avatar youjie

no message

parent bb24ea01
......@@ -496,32 +496,50 @@
</div>
<div class="q-pb-xl">
<smaple
v-if="dataList"
:trip="dataList"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.desktop,
}"
></smaple>
<template
v-if="
(dataList.priceList.length > 0 &&
dataList.priceList &&
dataList.priceList[0].teamType == 2) ||
(dataList.currentPrice && dataList.currentPrice.teamType == 2)
"
>
v-if="dataList"
:trip="dataList"
class="q-pb-xl"
:class="{'q-px-md':$q.platform.is.mobile}"
></smaple>
<div v-if="detailsImageList&&detailsImageList.length>0"
v-for="(x,i) in detailsImageList"
:id="`days_${i}`">
<div class="tripImages-footer" v-if="!dataList.tripColor" style="padding: 20px 0;">
</div>
<img v-if="dataList.tripColor" class="block" :src="x.header" width="100%">
<img class="block" :src="x.page" style="width: 100%">
<div class="tripImages-footer">
<img v-if="dataList.tripColor" class="block" :src="x.footer" style="width: 100%">
</div>
</div>
<template v-if="dataList.dayList.length<=3&&!detailsImageList">
<trip :trip="dataList" @change="changeTripShowHandler"></trip>
</template>
<template v-else>
<block
:currentHeightDay="currentHeight"
:days="days"
:tripList="dayList"
:isDirect="isDirect"
:clickDate="clickDate"
></block>
<template v-if="dataList.dayList.length>3&&!detailsImageList">
<block :currentHeightDay="currentHeight" :days="days" :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block>
</template>
<!--
<template
v-if="
(dataList.priceList.length > 0 &&
dataList.priceList &&
dataList.priceList[0].teamType == 2) ||
(dataList.currentPrice && dataList.currentPrice.teamType == 2)
"
>
<trip :trip="dataList" @change="changeTripShowHandler"></trip>
</template>
<template v-else>
<block
:currentHeightDay="currentHeight"
:days="days"
:tripList="dayList"
:isDirect="isDirect"
:clickDate="clickDate"
></block>
</template> -->
</div>
<div
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="price"
......@@ -815,7 +833,22 @@ export default {
watch: {
days: {
handler: function (val, oldval) {
this.days = val;
this.days = val;
let that = this
this.$nextTick(()=>{
try{
this.days.forEach((x,i)=>{
var object=document.getElementById(`days_${i}`);
x.top = object.getBoundingClientRect().top+60
})
} catch (error) {
console.log('----异常')
}
setTimeout(()=>{
this.getTopNum(JSON.stringify(this.days))
},1000)
})
this.$forceUpdate()
},
immediate: true,
deep: true,
......@@ -1057,10 +1090,11 @@ export default {
try {
if (r.data.resultCode == 1 && r.data.data.id>0) {
this.tripImages = []
this.detailsImageList = []
let header = r.data.data.feature.headerImage
let footer = r.data.data.feature.footerImage
if(r.data.data.feature.tripImageList.length>0){
let OtherFile = r.data.data.feature.tripImageList
let header = r.data.data.feature.headerImage
let footer = r.data.data.feature.footerImage
OtherFile.forEach((x,i)=>{
let obj = {
header: header,
......@@ -1070,7 +1104,18 @@ export default {
this.tripImages.push(obj)
})
}
console.log(this.tripImages,'=---')
if(r.data.data.feature.detailsImageList.length>0){
let OtherFile = r.data.data.feature.detailsImageList
OtherFile.forEach((x,i)=>{
let obj = {
header: header,
page: x,
footer: footer,
}
this.detailsImageList.push(obj)
})
}
console.log(r.data.data.feature.detailsImageList,'=---')
// tripImageList detailsImageList headerImage footerImage
// this.getTripFeatureImageHandler(r.data.data.id)
this.dataList = r.data.data;
......
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