Commit e74efecb authored by youjie's avatar youjie

no message

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