Skip to content

J
jz_Travel
Commit 721dd8cd authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 8878119e
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 55 deletions
pages/jiuzhai/jz_Line.vue
View file @ 721dd8cd
...@@ -263,7 +263,6 @@ ...@@ -263,7 +263,6 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.page_count = res.data.pageCount; this.page_count = res.data.pageCount;
console.log(this.dataList, 'dataList');
} else { } else {
} }
......
pages/jiuzhai/jz_LineDetail.vue
View file @ 721dd8cd
...@@ -79,10 +79,15 @@ ...@@ -79,10 +79,15 @@
} }
.jz_StartList { .jz_StartList {
width: 22%;
height: 150rpx; height: 150rpx;
border-radius: 20rpx; border-radius: 20rpx;
border: 1px solid #E2E2E2; border: 1px solid #E2E2E2;
text-align: center;
display: block;
width: 70px;
margin-right: 14px;
flex-shrink: 0;
white-space: nowrap;
} }
.jz_renmin { .jz_renmin {
...@@ -119,6 +124,7 @@ ...@@ -119,6 +124,7 @@
color: #999999; color: #999999;
text-align: center; text-align: center;
line-height: 40rpx; line-height: 40rpx;
font-size: 22rpx;
} }
.jz_Dian { .jz_Dian {
...@@ -159,6 +165,7 @@ ...@@ -159,6 +165,7 @@
.jz_TripMain { .jz_TripMain {
position: relative; position: relative;
overflow: hidden;
} }
.jz_TripTitle { .jz_TripTitle {
...@@ -201,6 +208,7 @@ ...@@ -201,6 +208,7 @@
font-size: 24rpx; font-size: 24rpx;
margin: 30rpx 0; margin: 30rpx 0;
font-weight: bold; font-weight: bold;
display: flex;
} }
.jz_ComDian { .jz_ComDian {
...@@ -235,6 +243,7 @@ ...@@ -235,6 +243,7 @@
color: #999999; color: #999999;
font-size: 23rpx; font-size: 23rpx;
margin-right: 44rpx; margin-right: 44rpx;
flex-shrink: 0;
} }
.jz_CanInner { .jz_CanInner {
...@@ -253,15 +262,25 @@ ...@@ -253,15 +262,25 @@
.jz_Fenzhong { .jz_Fenzhong {
color: #999999; color: #999999;
font-size: 22rpx; font-size: 22rpx;
margin-left: 10rpx; margin-left: 20rpx;
} }
.jz_Jinddian { .jz_Jinddian {
margin-top: 23rpx; margin: 23rpx 0 31rpx 0;
color: #999999; color: #999999;
font-size: 23rpx; font-size: 23rpx;
line-height: 20px; line-height: 20px;
} }
.jz_StartHoubu {
color: #E73828;
font-size: 20rpx;
margin: 10px 0;
}
.jz_OrderDiv{
position: fixed;
}
</style> </style>
<template> <template>
<div class="jz_LineDetail"> <div class="jz_LineDetail">
...@@ -316,18 +335,13 @@ ...@@ -316,18 +335,13 @@
<span style="width:40px;background-color: #DFBE6E;height: 6px;bottom: 2px;left: 0;right: 0;position: absolute;z-index: 1;"></span> <span style="width:40px;background-color: #DFBE6E;height: 6px;bottom: 2px;left: 0;right: 0;position: absolute;z-index: 1;"></span>
</span> </span>
</view> </view>
<view style="display:flex;justify-content: space-between;"> <view style="display:flex;overflow-x: auto;">
<view class="jz_StartList"> <view class="jz_StartList" v-for="item in dataList.priceList">
<view class="jz_StartTop"></view> <view class="jz_StartTop">{{getMonth(item.startDate)}} 余{{item.remainNum}}</view>
</view> <view class="jz_StartHoubu">
<view class="jz_StartList"> {{item.isSubstitution==1?'可候补':'不可候补'}}
</view>
<view class="jz_StartList">
</view> </view>
<view class="jz_StartList"> <view style="color:#FF3166;font-size:26rpx;">￥{{item.b2BPrice}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -340,7 +354,7 @@ ...@@ -340,7 +354,7 @@
<text class="jz_Dian"></text>住宿 <text class="jz_Dian"></text>住宿
</view> </view>
<view class="jz_ZhaiInner"> <view class="jz_ZhaiInner">
2晚4钻酒店 {{dataList.nightNum}}晚酒店
</view> </view>
<view class="jz_ZhaiTitle"> <view class="jz_ZhaiTitle">
<text class="jz_Dian"></text>购物 <text class="jz_Dian"></text>购物
...@@ -352,15 +366,15 @@ ...@@ -352,15 +366,15 @@
<text class="jz_Dian"></text>景点 <text class="jz_Dian"></text>景点
</view> </view>
<view class="jz_ZhaiInner"> <view class="jz_ZhaiInner">
51个景点，含23个人气景点 {{scenicNum}}个人气景点
</view> </view>
<view class="jz_ZhaiTitle"> <view class="jz_ZhaiTitle">
<text class="jz_Dian"></text>餐食 <text class="jz_Dian"></text>餐食
</view> </view>
<view class="jz_ZhaiInner"> <view class="jz_ZhaiInner">
成人含2早餐2午餐2晚餐 儿童含2早餐2午餐2晚餐 含{{breakfastNum}}早餐 <text style="margin:0 20px;">{{lunchNum}}午餐</text> {{dinnerNum}}晚餐
</view> </view>
<view class="jz_Zhankai">展开全部</view> <view class="jz_Zhankai" style="display:none;">展开全部</view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays">
<span style="display: inline-block;position: relative;margin-bottom:40rpx;"> <span style="display: inline-block;position: relative;margin-bottom:40rpx;">
...@@ -372,35 +386,38 @@ ...@@ -372,35 +386,38 @@
<view v-for="(item,index) in dataList.dayList"> <view v-for="(item,index) in dataList.dayList">
<view class="jz_TripTitle"> <view class="jz_TripTitle">
<view class="jz_TripLeft">第{{getDays(index+1)}}天</view> <view class="jz_TripLeft">第{{getDays(index+1)}}天</view>
<view class="jz_TripRight">2020-03-11</view> <view class="jz_TripRight"></view>
</view> </view>
<view class="jz_RightInner"> <view class="jz_RightInner">
<view v-for="subItem in item.dayArray"> <view v-for="subItem in item.dayArray" v-if="subItem.type==7">
<view class="jz_Place" v-if="subItem.type==7"> <view class="jz_Place">
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text>{{subItem.childItem.title}}</text> <text>{{subItem.childItem.title}}</text>
</view> </view>
</view>
<template v-for="subItem in item.dayArray" v-if="subItem.type==2">
<view class="jz_ImgDiv"> <view class="jz_ImgDiv">
<template v-if="subItem.type==2"> <img mode="aspectFill" :src="subItem.childItem.imaArray[0].url" alt="">
<img :src="subItem.childItem.imaArray[0].url" alt="">
</template>
</view> </view>
<view class="jz_Place"> <view class="jz_Place" style="align-items: center;">
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text class="jz_Canyin">景点</text> <text class="jz_Canyin">景点</text>
<text class="jz_CanInner"> <text class="jz_CanInner">
<template v-if="subItem.type==2"> {{subItem.childItem.couponsName}}
{{subItem.couponsName}}
<text class="jz_Fenzhong"> <text class="jz_Fenzhong">
约<template v-if="subItem.playTimeHour">{{subItem.playTimeHour}}小时</template> <template v-if="subItem.childItem.playTimeHour||subItem.childItem.playTimeMinutes">约</template>
<template v-if="subItem.playTimeHour">{{subItem.playTimeMinutes}}分钟</template> <template v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template>
<template v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</text> </text>
</template>
</text> </text>
</view> </view>
<view class="jz_Jinddian">
{{subItem.childItem.descriptionText}}
</view>
</template>
<view class="jz_Place">温馨提示</view> <view class="jz_Place">温馨提示</view>
<view class="jz_Rermark"> <view class="jz_Rermark">
<template v-if="subItem.type==6"> <template v-for="subItem in item.dayArray" v-if="subItem.type==6">
{{subItem.childItem.descriptionText}} {{subItem.childItem.descriptionText}}
</template> </template>
</view> </view>
...@@ -408,22 +425,29 @@ ...@@ -408,22 +425,29 @@
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text class="jz_Canyin">餐饮</text> <text class="jz_Canyin">餐饮</text>
<text class="jz_CanInner"> <text class="jz_CanInner">
<template v-if="subItem.type==4&&subItem.useDinnerType==1">{{subItem.dinnerName}}</template> <template v-for="subItem in item.dayArray" v-if="subItem.type==4">
<template v-if="subItem.type==4&&subItem.useDinnerType==2">{{subItem.dinnerName}}</template> <text style="margin-right:20px;" v-if="subItem.childItem.useDinnerType=='1'">{{subItem.childItem.dinnerName}}</text>
<template v-if="subItem.type==4&&subItem.useDinnerType==3">{{subItem.dinnerName}}</template> <text style="margin-right:20px;" v-if="subItem.childItem.useDinnerType=='2'">{{subItem.childItem.dinnerName}}</text>
<text v-if="subItem.childItem.useDinnerType=='3'">{{subItem.childItem.dinnerName}}</text>
</template>
</text> </text>
</view> </view>
<view class="jz_Place"> <view class="jz_Place">
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text class="jz_Canyin">酒店</text> <text class="jz_Canyin">酒店</text>
<text class="jz_CanInner"> <text class="jz_CanInner">
<template v-if="subItem.type==3">{{subItem.hotelName}}</template> <template v-for="subItem in item.dayArray" v-if="subItem.type==3">
<text>{{subItem.childItem.hotelName}}<text v-if="index!=dataList.dayList.length-1" style="margin:0 5px;">/</text></text>
</template>
<text v-if="index!=dataList.dayList.length-1">或同级</text>
</text> </text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="jz_OrderDiv">
</view> </view>
</div> </div>
</template> </template>
...@@ -444,6 +468,10 @@ ...@@ -444,6 +468,10 @@
tcid: 0, tcid: 0,
configId: 0 configId: 0
}, },
scenicNum: 0, // 景点数量
breakfastNum: 0, //早餐数
lunchNum: 0, //午餐数
dinnerNum: 0 //晚餐数
}; };
}, },
created() { created() {
...@@ -467,6 +495,23 @@ ...@@ -467,6 +495,23 @@
console.log(res, '详情'); console.log(res, '详情');
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.dataList = res.data; this.dataList = res.data;
this.scenicNum = 0;
this.dataList.dayList.forEach(x => {
x.dayArray.forEach(y => {
if (y.type == 2) {
this.scenicNum++;
}
if (y.type == 4 && y.childItem.useDinnerType == 1) {
this.breakfastNum++;
}
if (y.type == 4 && y.childItem.useDinnerType == 2) {
this.lunchNum++;
}
if (y.type == 4 && y.childItem.useDinnerType == 3) {
this.dinnerNum++;
}
})
})
} else { } else {
} }
...@@ -487,6 +532,13 @@ ...@@ -487,6 +532,13 @@
} else { } else {
return day return day
} }
},
//返回月 日
getMonth(day) {
if (day) {
let Myday = day.split('-');
return Myday[1] + '-' + Myday[2]
}
} }
}, },
}; };
......
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