Skip to content

A
Athena
Commit 03f5ecc7 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 1f339517 a9856589
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 45 deletions
src/components/FreeTravel/FreeDetail.vue
View file @ 03f5ecc7
<template> <template>
<div v-loading="detailLoading" class="commonF FreeDetail" v-if="!noData"> <div v-loading="detailLoading" class="commonF FreeDetail" v-if="!noData">
<div class="w1200"> <div class="w1200">
<div @click.stop.prevent="BigImgShow(1)" class="bannerImg" :style="{background:'url(' + ActiveSrc + ') no-repeat center left/100% auto'}"> <div @click.stop.prevent="BigImgShow(LiactiveIndex)" class="bannerImg" :style="{background:'url(' + ActiveSrc + ') no-repeat center left/100% auto'}">
<!-- <img style="width:100%;" :src="ActiveSrc" :onerror="defaultImg" alt=""> --> <!-- <img style="width:100%;" :src="ActiveSrc" :onerror="defaultImg" alt=""> -->
<ul v-if="dataDetail.img_list" class="banImgList basefix"> <ul v-if="dataDetail.img_list" class="banImgList basefix">
<li @click.stop.prevent="BigImgShow(2)" @mouseover="LiHover(item,index)" :class="LiactiveIndex==index?'Liactive':''" v-if="index<9" v-for="(item,index) in dataDetail.img_list" :key="index"> <li @click.stop.prevent="BigImgShow(index)" @mouseover="LiHover(item,index)" :class="LiactiveIndex==index?'Liactive':''" v-if="index<9" v-for="(item,index) in dataDetail.img_list" :key="index">
<img :src="item.img_url" alt=""> <img :src="item.img_url" alt="">
</li> </li>
</ul> </ul>
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
</div> --> </div> -->
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="(item,index) in images" :src="item.img_url" :key="index+5000"> <img v-for="(item,index) in images" :src="item.img_url" :key="index+5000">
</viewer> </viewer>
</div> </div>
<div class="empty-data" v-else > <div class="empty-data" v-else >
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
...@@ -323,11 +323,11 @@ export default { ...@@ -323,11 +323,11 @@ export default {
inited (viewer){ inited (viewer){
this.$viewer = viewer this.$viewer = viewer
}, },
BigImgShow(num){ BigImgShow(index){
if(num==1){ // if(num==1){
this.$viewer.view(index)
this.$viewer.show() this.$viewer.show()
// }
}
}, },
handleScroll(){ handleScroll(){
// console.log("this.scrollobj",this.scrollobj.scrollTop) // console.log("this.scrollobj",this.scrollobj.scrollTop)
...@@ -359,6 +359,7 @@ export default { ...@@ -359,6 +359,7 @@ export default {
that.msgObj.price3_b2c=that.mealTypeItem.price3_b2c; that.msgObj.price3_b2c=that.mealTypeItem.price3_b2c;
that.msgObj.price4_b2c=that.mealTypeItem.price4_b2c; that.msgObj.price4_b2c=that.mealTypeItem.price4_b2c;
that.msgObj.MySelfTotalPrice=that.msgObj.price1_qty*that.mealTypeItem.price1_b2c+that.msgObj.price2_qty*that.mealTypeItem.price2_b2c+that.msgObj.price3_qty*that.mealTypeItem.price3_b2c+that.msgObj.price4_qty*that.mealTypeItem.price4_b2c; that.msgObj.MySelfTotalPrice=that.msgObj.price1_qty*that.mealTypeItem.price1_b2c+that.msgObj.price2_qty*that.mealTypeItem.price2_b2c+that.msgObj.price3_qty*that.mealTypeItem.price3_b2c+that.msgObj.price4_qty*that.mealTypeItem.price4_b2c;
that.msgObj.total_price=that.msgObj.MySelfTotalPrice;
}, },
YdBtn(){ YdBtn(){
......
src/components/mall/OneDayDetailTwo.vue
View file @ 03f5ecc7
...@@ -137,18 +137,18 @@ ...@@ -137,18 +137,18 @@
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last"> <div class="last">
<img v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)"> <div class="tip" @click="BigImgShow(4)">
查看全部图片 查看全部图片
</div> </div>
</div> </div>
...@@ -157,23 +157,23 @@ ...@@ -157,23 +157,23 @@
</template> </template>
<template v-else> <template v-else>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 0" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" /> <img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" />
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last"> <div class="last">
<img v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(4)" v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)"> <div class="tip" @click="BigImgShow(4)">
查看全部图片 查看全部图片
</div> </div>
</div> </div>
...@@ -539,6 +539,11 @@ ...@@ -539,6 +539,11 @@
</table> </table>
</div> </div>
</el-dialog> </el-dialog>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="(item,index) in images" :src="item.Url" :key="index+5000">
</viewer>
</div> </div>
</template> </template>
...@@ -645,6 +650,11 @@ export default { ...@@ -645,6 +650,11 @@ export default {
city: -1, city: -1,
routed:"b2b_get_GetB2BTravelInfoV1", routed:"b2b_get_GetB2BTravelInfoV1",
local:0, local:0,
images:[],
imageOptions:{
navbar:false,
title:false
}
} }
},watch: { // 监听参数变化 },watch: { // 监听参数变化
changeCity: { changeCity: {
...@@ -676,6 +686,16 @@ export default { ...@@ -676,6 +686,16 @@ export default {
// this.initMap(); // this.initMap();
}, },
methods: { methods: {
inited (viewer){
this.$viewer = viewer
},
BigImgShow(index){
// if(num==1){
this.$viewer.view(index)
this.$viewer.show()
// }
},
orderChosen: function (date) { orderChosen: function (date) {
let day = date.split('-')[0] + '-' + date.split('-')[1]; let day = date.split('-')[0] + '-' + date.split('-')[1];
console.log("this.calendarTit",this.calendarTit) console.log("this.calendarTit",this.calendarTit)
...@@ -846,6 +866,7 @@ export default { ...@@ -846,6 +866,7 @@ export default {
this.dataList = data; this.dataList = data;
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null; this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null;
this.imgCover = JSON.parse(this.dataList.imgCover); this.imgCover = JSON.parse(this.dataList.imgCover);
this.images = this.imgCover;
this.showType = this.feature.featureType; this.showType = this.feature.featureType;
this.dayTrip = this.dataList.dayNum; this.dayTrip = this.dataList.dayNum;
if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){ if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){
......
src/components/mall/detailTwo.vue
View file @ 03f5ecc7
...@@ -136,18 +136,18 @@ ...@@ -136,18 +136,18 @@
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last"> <div class="last">
<img v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)"> <div class="tip" @click="BigImgShow(4)">
查看全部图片 查看全部图片
</div> </div>
</div> </div>
...@@ -156,23 +156,23 @@ ...@@ -156,23 +156,23 @@
</template> </template>
<template v-else> <template v-else>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 0" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" /> <img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" />
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last"> <div class="last">
<img v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" /> <img @click="BigImgShow(4)" v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" /> <img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)"> <div class="tip" @click="BigImgShow(4)">
查看全部图片 查看全部图片
</div> </div>
</div> </div>
...@@ -639,6 +639,11 @@ ...@@ -639,6 +639,11 @@
</table> </table>
</div> </div>
</el-dialog> </el-dialog>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="(item,index) in images" :src="item.Url" :key="index+5000">
</viewer>
</div> </div>
</template> </template>
...@@ -746,6 +751,12 @@ export default { ...@@ -746,6 +751,12 @@ export default {
city: -1, city: -1,
teamType:0, teamType:0,
free:0, free:0,
images:[],
imageOptions:{
navbar:false,
title:false
},
} }
},watch: { // 监听参数变化 },watch: { // 监听参数变化
changeCity: { changeCity: {
...@@ -780,6 +791,16 @@ export default { ...@@ -780,6 +791,16 @@ export default {
// this.initMap(); // this.initMap();
}, },
methods: { methods: {
inited (viewer){
this.$viewer = viewer
},
BigImgShow(index){
// if(num==1){
this.$viewer.view(index)
this.$viewer.show()
// }
},
orderChosen: function (date) { orderChosen: function (date) {
let day = date.split('-')[0] + '-' + date.split('-')[1] let day = date.split('-')[0] + '-' + date.split('-')[1]
this.calendarTit.forEach((x, index)=>{ this.calendarTit.forEach((x, index)=>{
...@@ -949,9 +970,9 @@ export default { ...@@ -949,9 +970,9 @@ export default {
this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : ''; this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : ''; this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
this.dataList = data; this.dataList = data;
console.log("this.dataList ",this.dataList )
this.toDayObj = data.currentPriceInfo; this.toDayObj = data.currentPriceInfo;
this.imgCover = JSON.parse(this.dataList.imgCover); this.imgCover = JSON.parse(this.dataList.imgCover);
this.images = this.imgCover;
this.showType = this.feature.featureType; this.showType = this.feature.featureType;
this.dayTrip = this.dataList.dayNum; this.dayTrip = this.dataList.dayNum;
if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){ if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){
......
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