Commit 09525173 authored by zhengke's avatar zhengke

修改

parent e5dc601a
...@@ -5,24 +5,24 @@ ...@@ -5,24 +5,24 @@
<view class="left"> <view class="left">
<template v-if="isLine==0"> <template v-if="isLine==0">
<view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Path)"> <view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Path)">
<image :src="x.Path" mode="widthFix"></image> <image :src="x.Path" mode="aspectFill"></image>
</view> </view>
</template> </template>
<template v-else> <template v-else>
<view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Url)"> <view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Url)">
<image :src="x.Url" mode="widthFix"></image> <image :src="x.Url" mode="aspectFill"></image>
</view> </view>
</template> </template>
</view> </view>
<view class="right"> <view class="right">
<template v-if="isLine==0"> <template v-if="isLine==0">
<view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Path)"> <view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Path)">
<image :src="x.Path" mode="widthFix"></image> <image :src="x.Path" mode="aspectFill"></image>
</view> </view>
</template> </template>
<template v-else> <template v-else>
<view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Url)"> <view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Url)">
<image :src="x.Url" mode="widthFix"></image> <image :src="x.Url" mode="aspectFill"></image>
</view> </view>
</template> </template>
</view> </view>
...@@ -123,5 +123,6 @@ ...@@ -123,5 +123,6 @@
.hotel-pic .content .image-box image{ .hotel-pic .content .image-box image{
width: 100%; width: 100%;
border-radius: 20rpx; border-radius: 20rpx;
height:200rpx;
} }
</style> </style>
...@@ -559,6 +559,20 @@ ...@@ -559,6 +559,20 @@
this.msg.companyId = this.branchList[0].BId; this.msg.companyId = this.branchList[0].BId;
this.currentBrachName = this.branchList[0].BName; this.currentBrachName = this.branchList[0].BName;
this.CityId = this.branchList[0].CityId; this.CityId = this.branchList[0].CityId;
let temp = ''
if(this.msg.team.length>0){
if(this.lineList.length>0){
this.lineList.forEach(x => {
x.Teams.forEach(y => {
if (this.msg.team.indexOf(y.TeamId) != -1) {
temp += y.TeamName + ","
}
})
})
this.optionsTitle[1] = temp==''?'线路玩法':temp;
}
}
} }
}, },
null null
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
:height="535" :height="535"
:interval="5000" :interval="5000"
:border-radius="0" :border-radius="0"
@click="openPicture"
name="Url" name="Url"
></u-swiper> ></u-swiper>
<view class="media-info"> <view class="media-info">
...@@ -81,13 +82,13 @@ ...@@ -81,13 +82,13 @@
<view class="jz_LineTitle"> <view class="jz_LineTitle">
<text class="jz_renmin">¥</text <text class="jz_renmin">¥</text
><text class="jz_B2bPrice">{{ currentPrice.b2CPrice }}</text> ><text class="jz_B2bPrice">{{ currentPrice.b2CPrice }}</text>
<text style="color: #999999; font-size: 24rpx; font-weight: 400"> <text style="color: #999999; font-size: 28rpx; font-weight: 400">
/人起</text /人起</text
> >
<text <text
style=" style="
color: #999999; color: #999999;
font-size: 24rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
margin-left: 30rpx; margin-left: 30rpx;
" "
...@@ -278,7 +279,7 @@ ...@@ -278,7 +279,7 @@
</view> </view>
<view class="jz_Zhankai" style="display: none">展开全部</view> <view class="jz_Zhankai" style="display: none">展开全部</view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight.length>0">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -364,7 +365,7 @@ ...@@ -364,7 +365,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.feature&&dataList.feature.tripImageList&&dataList.feature.tripImageList.length>0">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -404,7 +405,7 @@ ...@@ -404,7 +405,7 @@
></image> ></image>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.dayList&&dataList.dayList.length>0">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -556,7 +557,7 @@ ...@@ -556,7 +557,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.feature&&dataList.feature.feeInclude!=''">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -591,7 +592,7 @@ ...@@ -591,7 +592,7 @@
<rich-text :nodes="dataList.feature.feeInclude"></rich-text> <rich-text :nodes="dataList.feature.feeInclude"></rich-text>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.feature&&dataList.feature.feeNonIncludeText!=''">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -626,7 +627,7 @@ ...@@ -626,7 +627,7 @@
<rich-text :nodes="dataList.feature.feeNonInclude"></rich-text> <rich-text :nodes="dataList.feature.feeNonInclude"></rich-text>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.feature&&dataList.feature.importantTip!=''">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -661,7 +662,7 @@ ...@@ -661,7 +662,7 @@
<rich-text :nodes="dataList.feature.importantTip"></rich-text> <rich-text :nodes="dataList.feature.importantTip"></rich-text>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.feature&&dataList.feature.warmTip!=''">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -696,7 +697,7 @@ ...@@ -696,7 +697,7 @@
<rich-text :nodes="dataList.feature.warmTip"></rich-text> <rich-text :nodes="dataList.feature.warmTip"></rich-text>
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays" v-if="dataList.feature&&dataList.feature.visaRemark!=''">
<span <span
style=" style="
display: inline-block; display: inline-block;
...@@ -1102,7 +1103,7 @@ export default { ...@@ -1102,7 +1103,7 @@ export default {
this.yeCount = e.value; this.yeCount = e.value;
}, },
openPicture() { openPicture() {
let imgObj = this.dataList.imgCover; let imgObj = this.dataList.imgCover;
uni.navigateTo({ uni.navigateTo({
url: url:
"/pages/hotel/picture?imgObj=" + "/pages/hotel/picture?imgObj=" +
...@@ -1596,7 +1597,7 @@ export default { ...@@ -1596,7 +1597,7 @@ export default {
.jz_Maidian { .jz_Maidian {
color: #999999; color: #999999;
font-size: 24rpx; font-size: 28rpx;
margin-top: 22rpx; margin-top: 22rpx;
} }
...@@ -1669,7 +1670,7 @@ export default { ...@@ -1669,7 +1670,7 @@ export default {
} }
.jz_B2bPrice { .jz_B2bPrice {
font-size: 40rpx; font-size: 45rpx;
font-weight: 800; font-weight: 800;
} }
...@@ -1677,7 +1678,7 @@ export default { ...@@ -1677,7 +1678,7 @@ export default {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
padding: 30px; padding: 30px;
font-size: 24rpx; font-size: 28rpx;
margin-top: -5px; margin-top: -5px;
} }
...@@ -1778,7 +1779,7 @@ export default { ...@@ -1778,7 +1779,7 @@ export default {
.jz_Place { .jz_Place {
position: relative; position: relative;
color: #111111; color: #111111;
font-size: 24rpx; font-size: 28rpx;
margin: 30rpx 0; margin: 30rpx 0;
font-weight: bold; font-weight: bold;
display: flex; display: flex;
...@@ -1808,13 +1809,13 @@ export default { ...@@ -1808,13 +1809,13 @@ export default {
.jz_Rermark { .jz_Rermark {
color: #999999; color: #999999;
font-size: 23rpx; font-size: 28rpx;
line-height: 20px; line-height: 20px;
} }
.jz_Canyin { .jz_Canyin {
color: #999999; color: #999999;
font-size: 23rpx; font-size: 28rpx;
margin-right: 44rpx; margin-right: 44rpx;
flex-shrink: 0; flex-shrink: 0;
} }
...@@ -1841,7 +1842,7 @@ export default { ...@@ -1841,7 +1842,7 @@ export default {
.jz_Jinddian { .jz_Jinddian {
margin: 23rpx 0 31rpx 0; margin: 23rpx 0 31rpx 0;
color: #999999; color: #999999;
font-size: 23rpx; font-size: 28rpx;
line-height: 20px; line-height: 20px;
} }
......
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