Commit 63771624 authored by youjie's avatar youjie

修复

parent 63d3eb09
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<view class="busTispBox" style="margin-top: 20rpx;"> <view class="busTispBox" style="margin-top: 20rpx;">
<template v-if="(dataList.PriceIncludeList&&dataList.PriceIncludeList.length>0)|| <template v-if="(dataList.PriceIncludeList&&dataList.PriceIncludeList.length>0)||
(dataList.PriceNotIncludeList&&dataList.PriceNotIncludeList.length>0)"> (dataList.PriceNotIncludeList&&dataList.PriceNotIncludeList.length>0)">
<view class="bugetWeek(date) {sTispTitle">费用说明</view> <view class="busTispTitle">费用说明</view>
<view class="busTispInfor"> <view class="busTispInfor">
<view class="busTispFY" v-if="dataList.PriceIncludeList&&dataList.PriceIncludeList.length>0"> <view class="busTispFY" v-if="dataList.PriceIncludeList&&dataList.PriceIncludeList.length>0">
费用包含: 费用包含:
......
...@@ -92,9 +92,7 @@ ...@@ -92,9 +92,7 @@
<view class="ResInforText row" v-if="dataList.CancelPolicy"> <view class="ResInforText row" v-if="dataList.CancelPolicy">
<view class="ResInforL">取消政策</view> <view class="ResInforL">取消政策</view>
<view class="ResInforR"> <view class="ResInforR">
<text>
<rich-text :nodes="dataList.CancelPolicy"></rich-text> <rich-text :nodes="dataList.CancelPolicy"></rich-text>
</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -600,7 +598,7 @@ ...@@ -600,7 +598,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
height: 34rpx; height: 34rpx;
line-height: 26rpx; line-height: 26rpx;
padding: 0 12rpx; padding: 2rpx 12rpx 0 12rpx;
display: inline-block; display: inline-block;
} }
.hotel-detail .hotel-content .hotel-base .head .op-box image { .hotel-detail .hotel-content .hotel-base .head .op-box image {
......
...@@ -1013,7 +1013,7 @@ ...@@ -1013,7 +1013,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
height: 34rpx; height: 34rpx;
line-height: 26rpx; line-height: 26rpx;
padding: 0 12rpx; padding: 2rpx 12rpx 0 12rpx;
display: inline-block; display: inline-block;
} }
......
...@@ -747,7 +747,7 @@ ...@@ -747,7 +747,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
height: 34rpx; height: 34rpx;
line-height: 26rpx; line-height: 26rpx;
padding: 0 12rpx; padding: 2rpx 12rpx 0 12rpx;
display: inline-block; display: inline-block;
} }
......
...@@ -229,8 +229,8 @@ ...@@ -229,8 +229,8 @@
roomNum: 1, roomNum: 1,
numberOfAdults: 2, numberOfAdults: 2,
numberOfChildren: 0, numberOfChildren: 0,
ChildAgeDetails: null, ChildAgeDetails: [],
ChildAgeTexts: [], ChildAgeTexts: [],//儿童年龄
}], }],
}, },
day: 0, day: 0,
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
></u-number-box> ></u-number-box>
</view> </view>
<view class="row"> <view class="row">
<view class="row" v-for="(items,indexs) in item.ChildAgeTexts" :key="indexs"> <view class="row" v-for="(items,indexs) in item.ChildAgeDetails" :key="indexs">
<uni-section title="" type="line"> <uni-section title="" type="line">
<uni-data-select :ref="`select_${index}`" <uni-data-select :ref="`select_${index}`"
:placeholder="`年龄`" :placeholder="`年龄`"
...@@ -160,8 +160,8 @@ export default { ...@@ -160,8 +160,8 @@ export default {
roomNum: e.value, roomNum: e.value,
numberOfAdults: 2, numberOfAdults: 2,
numberOfChildren: 0, numberOfChildren: 0,
ChildAgeDetails: null,
ChildAgeTexts: [], ChildAgeTexts: [],
ChildAgeDetails: [],
}) })
} }
if(e.value<this.parameters.rooms){ if(e.value<this.parameters.rooms){
...@@ -176,30 +176,36 @@ export default { ...@@ -176,30 +176,36 @@ export default {
this.$refs[`select_${index}`][0].toggleSelector(); this.$refs[`select_${index}`][0].toggleSelector();
}, },
ageChange(e,index,indexs){ ageChange(e,index,indexs){
this.parameters.searchroomGroup[index].ChildAgeTexts[indexs].number = e this.parameters.searchroomGroup[index].ChildAgeDetails[indexs].number = e
this.parameters.searchroomGroup[index].ChildAgeDetails = this.parameters.searchroomGroup[index].ChildAgeTexts[indexs].number this.parameters.searchroomGroup[index].ChildAgeTexts = []
this.parameters.searchroomGroup[index].ChildAgeDetails.forEach((item,indexs)=>{
this.parameters.searchroomGroup[index].ChildAgeTexts.push(item.number)
})
}, },
etChange(e,index){ etChange(e,index){
this.parameters.searchroomGroup[index].numberOfChildren = e.value; this.parameters.searchroomGroup[index].numberOfChildren = e.value;
if(e.value<this.parameters.searchroomGroup[index].ChildAgeTexts.length){ if(e.value<this.parameters.searchroomGroup[index].ChildAgeDetails.length){
let num = this.parameters.searchroomGroup[index].ChildAgeTexts.length-e.value let num = this.parameters.searchroomGroup[index].ChildAgeDetails.length-e.value
for(let i=0;i<num;i++){ for(let i=0;i<num;i++){
let indexs = this.parameters.searchroomGroup[index].ChildAgeTexts.length-1 let indexs = this.parameters.searchroomGroup[index].ChildAgeDetails.length-1
this.parameters.searchroomGroup[index].ChildAgeTexts.splice(indexs,1) this.parameters.searchroomGroup[index].ChildAgeDetails.splice(indexs,1)
let length = this.parameters.searchroomGroup[index].ChildAgeTexts.length let length = this.parameters.searchroomGroup[index].ChildAgeDetails.length
if(length==0){ if(length==0){
this.parameters.searchroomGroup[index].ChildAgeDetails = null this.parameters.searchroomGroup[index].ChildAgeTexts = []
}else{ }else{
this.parameters.searchroomGroup[index].ChildAgeDetails = this.parameters.searchroomGroup[index].ChildAgeTexts[length-1].number this.parameters.searchroomGroup[index].ChildAgeTexts = []
this.parameters.searchroomGroup[index].ChildAgeDetails.forEach((item,indexs)=>{
this.parameters.searchroomGroup[index].ChildAgeTexts.push(item.number)
})
} }
} }
}else if(e.value>this.parameters.searchroomGroup[index].ChildAgeTexts.length){ }else if(e.value>this.parameters.searchroomGroup[index].ChildAgeDetails.length){
let num = e.value-this.parameters.searchroomGroup[index].ChildAgeTexts.length let num = e.value-this.parameters.searchroomGroup[index].ChildAgeDetails.length
for(let i=0;i<num;i++){ for(let i=0;i<num;i++){
this.parameters.searchroomGroup[index].ChildAgeTexts.push({ this.parameters.searchroomGroup[index].ChildAgeDetails.push({
number: 1, number: 1,
}) })
this.parameters.searchroomGroup[index].ChildAgeDetails = 1 this.parameters.searchroomGroup[index].ChildAgeTexts.push(1)
} }
} }
this.peopleChange() this.peopleChange()
...@@ -221,7 +227,7 @@ export default { ...@@ -221,7 +227,7 @@ export default {
chosenDateResult(obj) { chosenDateResult(obj) {
for(let i=0;i<this.parameters.searchroomGroup.length;i++){ for(let i=0;i<this.parameters.searchroomGroup.length;i++){
let list = this.parameters.searchroomGroup[i] let list = this.parameters.searchroomGroup[i]
if(list.numberOfChildren>list.ChildAgeTexts.length){ if(list.numberOfChildren>list.ChildAgeDetails.length){
return uni.showToast({ return uni.showToast({
title: `请选择房间${i+1} 儿童年龄`, title: `请选择房间${i+1} 儿童年龄`,
icon: 'none', icon: 'none',
......
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="submit"> <view class="submit" @click="submit">
<button class="sub-btn" :disabled="!isSub" @click="submit"> <button class="sub-btn" :disabled="!isSub">
<text v-if="isSub">确定</text> <text v-if="isSub">确定</text>
<text v-if="!isSub">请选择入住日期</text> <text v-if="!isSub">请选择入住日期</text>
</button> </button>
......
...@@ -1325,7 +1325,7 @@ ...@@ -1325,7 +1325,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
height: 34rpx; height: 34rpx;
line-height: 26rpx; line-height: 26rpx;
padding: 0 12rpx; padding: 2rpx 12rpx 0 12rpx;
display: inline-block; display: inline-block;
} }
......
...@@ -755,7 +755,7 @@ ...@@ -755,7 +755,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
height: 34rpx; height: 34rpx;
line-height: 26rpx; line-height: 26rpx;
padding: 0 12rpx; padding: 2rpx 12rpx 0 12rpx;
display: inline-block; display: inline-block;
} }
......
...@@ -1021,7 +1021,7 @@ ...@@ -1021,7 +1021,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
height: 34rpx; height: 34rpx;
line-height: 26rpx; line-height: 26rpx;
padding: 0 12rpx; padding: 2rpx 12rpx 0 12rpx;
display: inline-block; display: inline-block;
} }
......
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