Skip to content

J
jz_Travel
Commit 06cb0f62 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents c01d8b9a 8c2968a2
Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 62 deletions
pages.json
View file @ 06cb0f62
...@@ -593,6 +593,8 @@ ...@@ -593,6 +593,8 @@
"path":"jz_Line" //九寨-线路 "path":"jz_Line" //九寨-线路
},{ },{
"path":"jz_LineDetail" //九寨-线路详情 "path":"jz_LineDetail" //九寨-线路详情
},{
"path":"jz_Reserve" //线路-预定
}] }]
}, },
//相亲分包 //相亲分包
......
pages/jiuzhai/jz_Line.vue
View file @ 06cb0f62
...@@ -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 @ 06cb0f62
<style> <style>
.jz_LineDetail { .jz_LineDetail {
background-color: #ECF1F4; background-color: #ECF1F4;
margin-bottom:70px;
} }
.jz_TopImg { .jz_TopImg {
...@@ -79,10 +80,15 @@ ...@@ -79,10 +80,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 +125,7 @@ ...@@ -119,6 +125,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 +166,7 @@ ...@@ -159,6 +166,7 @@
.jz_TripMain { .jz_TripMain {
position: relative; position: relative;
overflow: hidden;
} }
.jz_TripTitle { .jz_TripTitle {
...@@ -201,6 +209,7 @@ ...@@ -201,6 +209,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 +244,7 @@ ...@@ -235,6 +244,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 +263,57 @@ ...@@ -253,15 +263,57 @@
.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;
width:90%;
height:100rpx;
background-color: #fff;
margin:auto;
bottom:20px;
padding:20rpx;
left:40rpx;
display: flex;
justify-content: space-between;
align-items: center;
box-shadow: 0px 10px 30px 0px rgba(36, 36, 36, 0.2);
border-radius: 16px;
z-index:999;
}
.jz_OrderNow{
width:190rpx;
height:80rpx;
background-color: #111111;
text-align: center;
line-height: 80rpx;
color:#fff;
font-weight: bold;
font-size:28rpx;
border-radius: 16rpx;
}
.jz_ConButton{
background-color: #fff;
height:45px;
line-height: 20px;
}
.jz_ConButton::after{
border: none!important;
height:auto!important;
}
</style> </style>
<template> <template>
<div class="jz_LineDetail"> <div class="jz_LineDetail">
...@@ -279,7 +331,7 @@ ...@@ -279,7 +331,7 @@
</view> </view>
<view class="jz_TopPrice"> <view class="jz_TopPrice">
<view class="jz_LineTitle"> <view class="jz_LineTitle">
<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{dataList.priceList[0].b2BPrice}}</text> <text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{dataList.currentPriceInfo.b2BPrice}}</text>
<text style="color:#999999;font-size:14px;">/人起</text> <text style="color:#999999;font-size:14px;">/人起</text>
</view> </view>
<view class="jz_MainTitle"> <view class="jz_MainTitle">
...@@ -316,18 +368,13 @@ ...@@ -316,18 +368,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" @click="getDayInfo(item)">
<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> <view style="color:#FF3166;font-size:26rpx;">￥{{item.b2BPrice}}</view>
<view class="jz_StartList">
</view>
<view class="jz_StartList">
</view> </view>
</view> </view>
</view> </view>
...@@ -340,27 +387,29 @@ ...@@ -340,27 +387,29 @@
<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 class="jz_ZhaiTitle">
<text class="jz_Dian"></text>购物
</view>
<view class="jz_ZhaiInner">
无购物
</view> </view>
<template v-if="dataList.feature&&dataList.feature.shopRemarkText!=null&&dataList.feature.shopRemarkText!=''">
<view class="jz_ZhaiTitle">
<text class="jz_Dian"></text>购物
</view>
<view class="jz_ZhaiInner">
{{dataList.feature.shopRemarkText}}
</view>
</template>
<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">
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,59 +421,80 @@ ...@@ -372,59 +421,80 @@
<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.childItem.playTimeHour||subItem.childItem.playTimeMinutes">约</template>
约<template v-if="subItem.playTimeHour">{{subItem.playTimeHour}}小时</template> <template v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template>
<template v-if="subItem.playTimeHour">{{subItem.playTimeMinutes}}分钟</template> <template v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</text> </text>
</template>
</text> </text>
</view> </view>
<view class="jz_Place">温馨提示</view> <view class="jz_Jinddian">
<view class="jz_Rermark"> {{subItem.childItem.descriptionText}}
<template v-if="subItem.type==6">
{{subItem.childItem.descriptionText}}
</template>
</view>
<view class="jz_Place">
<view class="jz_ComDian"></view>
<text class="jz_Canyin">餐饮</text>
<text class="jz_CanInner">
<template v-if="subItem.type==4&&subItem.useDinnerType==1">{{subItem.dinnerName}}</template>
<template v-if="subItem.type==4&&subItem.useDinnerType==2">{{subItem.dinnerName}}</template>
<template v-if="subItem.type==4&&subItem.useDinnerType==3">{{subItem.dinnerName}}</template>
</text>
</view>
<view class="jz_Place">
<view class="jz_ComDian"></view>
<text class="jz_Canyin">酒店</text>
<text class="jz_CanInner">
<template v-if="subItem.type==3">{{subItem.hotelName}}</template>
</text>
</view> </view>
</template>
<view class="jz_Place">温馨提示</view>
<view class="jz_Rermark">
<template v-for="subItem in item.dayArray" v-if="subItem.type==6">
{{subItem.childItem.descriptionText}}
</template>
</view>
<view class="jz_Place">
<view class="jz_ComDian"></view>
<text class="jz_Canyin">餐饮</text>
<text class="jz_CanInner">
<template v-for="subItem in item.dayArray" v-if="subItem.type==4">
<text style="margin-right:20px;" v-if="subItem.childItem.useDinnerType=='1'">{{subItem.childItem.dinnerName}}</text>
<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>
</view>
<view class="jz_Place">
<view class="jz_ComDian"></view>
<text class="jz_Canyin">酒店</text>
<text class="jz_CanInner">
<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>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="jz_OrderDiv">
<view style="color:#FF3166;font-weight:bold;">
<text style="font-size:22rpx;">¥</text>
<text style="font-size:40rpx;">{{dataList.currentPriceInfo.b2BPrice}}</text>
<text style="font-size:22rpx;">/起</text>
</view>
<view style="display:flex;">
<button open-type="contact" class="jz_ConButton">
<img style="width:36rpx;height:38rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png" alt="" />
<view style="color:#111111;font-size: 22rpx;">客服</view>
</button>
<view class="jz_OrderNow" @click="goReserce()">立即预定</view>
</view>
</view>
</div> </div>
</template> </template>
<script> <script>
...@@ -444,6 +514,10 @@ ...@@ -444,6 +514,10 @@
tcid: 0, tcid: 0,
configId: 0 configId: 0
}, },
scenicNum: 0, // 景点数量
breakfastNum: 0, //早餐数
lunchNum: 0, //午餐数
dinnerNum: 0 //晚餐数
}; };
}, },
created() { created() {
...@@ -467,6 +541,23 @@ ...@@ -467,6 +541,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 +578,25 @@ ...@@ -487,6 +578,25 @@
} else { } else {
return day return day
} }
},
//返回月 日
getMonth(day) {
if (day) {
let Myday = day.split('-');
return Myday[1] + '-' + Myday[2]
}
},
//点击切换
getDayInfo(item){
this.delMsg.tcid = item.tcid;
this.delMsg.configId = item.configID;
this.getDetails();
},
//立即预定
goReserce(){
uni.navigateTo({
url: "/pages/jiuzhai/jz_Reserve"
});
} }
}, },
}; };
......
pages/jiuzhai/jz_Reserve.vue 0 → 100644
View file @ 06cb0f62
<style>
</style>
<template>
<view class="jz_Reserve">
</view>
</template>
<script>
</script>
<style>
</style>
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