Skip to content

J
jz_Travel
Commit 6e98c052 authored by youjie's avatar youjie
Browse files
Options

no message

parent c2bcc7e0
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 43 deletions
pages/AggregateOrders/components/header.vue
View file @ 6e98c052
<template> <template>
<view class="carrHeader" :style="[titleStyle]"> <view class="carrHeader" :style="[titleStyle]">
<view class="carrHeaderBox"> <view class="carrHeaderBox">
<view class="carrHeader-left"> <view class="row" @click="goBack">
<view class="carrHeader-left-icon" @click="goBack"> <view class="carrHeader-left">
<u-icon name="arrow-left" size="38" color="#000"></u-icon> <view class="carrHeader-left-icon">
<u-icon name="arrow-left" size="38" color="#000"></u-icon>
</view>
</view>
<view class="carrHeader-title">
<slot>{{title?title:''}}</slot>
</view> </view>
</view>
<view class="carrHeader-title">
<slot>{{title?title:''}}</slot>
</view> </view>
<view class="carrHeader-right row"> <view class="carrHeader-right row">
<view class="carrHeader-S row items-center justify-center"> <view class="carrHeader-S row items-center justify-center">
......
pages/bus/busDetails.vue
View file @ 6e98c052
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<template v-if="dataList.BuyNotes"> <template v-if="dataList.BuyNotes">
<view class="busTispTitle">购买须知</view> <view class="busTispTitle">购买须知</view>
<view class="busTispInfor"> <view class="busTispInfor">
{{ dataList.BuyNotes }} <rich-text :nodes="dataList.BuyNotes"></rich-text>
</view> </view>
</template> </template>
<view class="busTispTitle"> <view class="busTispTitle">
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<template v-if="dataList.CancelPolicy"> <template v-if="dataList.CancelPolicy">
<view class="busTispTitle">取消政策</view> <view class="busTispTitle">取消政策</view>
<view class="busTispInfor" style="border: 0;"> <view class="busTispInfor" style="border: 0;">
{{ dataList.CancelPolicy }} <rich-text :nodes="dataList.CancelPolicy"></rich-text>
</view> </view>
</template> </template>
......
pages/bus/orderInfor.vue
View file @ 6e98c052
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<view class="ResInforL">取消政策</view> <view class="ResInforL">取消政策</view>
<view class="ResInforR"> <view class="ResInforR">
<text> <text>
{{ dataList.CancelPolicy }} <rich-text :nodes="dataList.CancelPolicy"></rich-text>
</text> </text>
</view> </view>
</view> </view>
......
pages/hotel/components/address/index.vue
View file @ 6e98c052
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
style=" style="
box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06); box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);
margin-top: 40rpx; margin-top: 40rpx;
margin-bottom: 40rpx; margin-bottom: 100rpx;
display: flex; display: flex;
" "
> >
...@@ -170,7 +170,7 @@ export default { ...@@ -170,7 +170,7 @@ export default {
<style scoped> <style scoped>
@import url("@/asset/css/flex.css"); @import url("@/asset/css/flex.css");
.hotelRegionBox{ .hotelRegionBox{
height: 1218rpx; height: 100%;
} }
.hotelRegionL{ .hotelRegionL{
width: 183rpx; width: 183rpx;
......
pages/hotel/components/hotel-good.vue
View file @ 6e98c052
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
.hotel-SubR { .hotel-SubR {
max-width: 102rpx; max-width: 102rpx;
height: 35rpx; height: 39rpx;
margin-right: 10rpx; margin-right: 10rpx;
position: relative; position: relative;
top: 6rpx; top: 6rpx;
......
pages/hotel/components/time/date.vue
View file @ 6e98c052
...@@ -69,15 +69,28 @@ ...@@ -69,15 +69,28 @@
v-model="item.ChildAgeDetails" v-model="item.ChildAgeDetails"
@change="(e)=>{ageChange(e,index)}" @change="(e)=>{ageChange(e,index)}"
style="margin-left: 10rpx;" style="margin-left: 10rpx;"
></u-number-box> --> ></u-number-box>
<template v-if="item.ChildAgeTexts.length>1"> <template v-if="item.ChildAgeTexts.length>1">
<text v-for="(items,indexs) in item.ChildAgeTexts" <text v-for="(items,indexs) in item.ChildAgeTexts"
:key="indexs" @click="eitAge(index,indexs)"> :key="indexs" @click="eitAge(index,indexs)"
:style="{'color':current==indexs?'#B99846':''}">
{{ items }} 岁<template v-if="indexs!=(item.ChildAgeTexts.length-1)">,</template> {{ items }} 岁<template v-if="indexs!=(item.ChildAgeTexts.length-1)">,</template>
</text> </text>
</template> </template> -->
<view class="row" v-for="(items,indexs) in item.ChildAgeTexts" :key="indexs">
<uni-section title="" type="line">
<uni-data-select :ref="`select_${index}`"
:placeholder="`年龄`"
v-model="items.number"
:localdata="TypeList"
:clear="false"
@change="(e)=>{ageChange(e,index,indexs)}"
></uni-data-select>
</uni-section>
<u-icon name="arrow" :size="32" color="#ccc" style="position: relative;top: -9rpx;"></u-icon>
</view>
<uni-section title="" type="line"> <!-- <uni-section title="" type="line">
<uni-data-select :ref="`select_${index}`" <uni-data-select :ref="`select_${index}`"
:placeholder="`年龄${item.numberOfChildren>1?'(选多次)':''}`" :placeholder="`年龄${item.numberOfChildren>1?'(选多次)':''}`"
v-model="item.ChildAgeDetails" v-model="item.ChildAgeDetails"
...@@ -86,7 +99,7 @@ ...@@ -86,7 +99,7 @@
@change="(e)=>{ageChange(e,index)}" @change="(e)=>{ageChange(e,index)}"
></uni-data-select> ></uni-data-select>
</uni-section> </uni-section>
<u-icon name="arrow" :size="32" color="#ccc" style="position: relative;top: -9rpx;"></u-icon> <u-icon name="arrow" :size="32" color="#ccc" style="position: relative;top: -9rpx;"></u-icon>-->
</view> </view>
</view> </view>
</view> </view>
...@@ -186,19 +199,8 @@ export default { ...@@ -186,19 +199,8 @@ export default {
this.current = indexs this.current = indexs
this.$refs[`select_${index}`][0].toggleSelector(); this.$refs[`select_${index}`][0].toggleSelector();
}, },
ageChange(e,index){ ageChange(e,index,indexs){
let list = this.parameters.searchroomGroup[index].ChildAgeTexts this.parameters.searchroomGroup[index].ChildAgeTexts[indexs].number = e
if(this.current>=0){
this.parameters.searchroomGroup[index].ChildAgeTexts[this.current] = e
this.current = -1
}else{
if(list.length==0||list.length<this.parameters.searchroomGroup[index].numberOfChildren){
this.parameters.searchroomGroup[index].ChildAgeTexts.push(e)
}else{
this.parameters.searchroomGroup[index].ChildAgeTexts[list.length-1] = e
}
}
this.parameters.searchroomGroup[index].ChildAgeDetails = e
}, },
etChange(e,index){ etChange(e,index){
this.parameters.searchroomGroup[index].numberOfChildren = e.value; this.parameters.searchroomGroup[index].numberOfChildren = e.value;
...@@ -214,6 +216,13 @@ export default { ...@@ -214,6 +216,13 @@ export default {
this.parameters.searchroomGroup[index].ChildAgeDetails = this.parameters.searchroomGroup[index].ChildAgeTexts[length-1] this.parameters.searchroomGroup[index].ChildAgeDetails = this.parameters.searchroomGroup[index].ChildAgeTexts[length-1]
} }
} }
}else if(e.value>this.parameters.searchroomGroup[index].ChildAgeTexts.length){
let num = e.value-this.parameters.searchroomGroup[index].ChildAgeTexts.length
for(let i=0;i<num;i++){
this.parameters.searchroomGroup[index].ChildAgeTexts.push({
number: 1,
})
}
} }
this.peopleChange() this.peopleChange()
}, },
......
pages/hotel/detail.vue
View file @ 6e98c052
...@@ -432,15 +432,10 @@ ...@@ -432,15 +432,10 @@
if (qitem.RatePlanList && qitem.RatePlanList.length > 0) { if (qitem.RatePlanList && qitem.RatePlanList.length > 0) {
qitem.RatePlanList.forEach(pItem => { qitem.RatePlanList.forEach(pItem => {
if (pItem.PriceList && pItem.PriceList.length > 0) { if (pItem.PriceList && pItem.PriceList.length > 0) {
pItem.PriceList.forEach(mItem => { var tempObj = _this.qBedTypeList.find(mItem => mItem.BedType == _this.qMsg.BedType);
var tempObj = _this.qBedTypeList.find( if (pItem.BedType == tempObj.BedType) {
mItem => mItem.BedType == _this tempRetePlanList.push(pItem)
.qMsg.BedType); }
if (mItem.MealAmount &&
pItem.BedType == tempObj.BedType) {
tempRetePlanList.push(pItem)
}
})
} }
}) })
} }
......
pages/hotel/mapList.vue
View file @ 6e98c052
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
</template> </template>
<script> <script>
const img = '../../static/images/position.png';
import rangeSlider from "./components/range-slider.vue"; import rangeSlider from "./components/range-slider.vue";
import canlendar from "./components/time/index"; import canlendar from "./components/time/index";
import hotelGood from "./components/hotel-good.vue"; import hotelGood from "./components/hotel-good.vue";
...@@ -96,9 +97,9 @@ ...@@ -96,9 +97,9 @@
id: null, id: null,
latitude: 39.909, latitude: 39.909,
longitude: 116.39742, longitude: 116.39742,
iconPath: '', iconPath: img,
title: '', title: '',
alpha: 0, alpha: 1,
width: 20, width: 20,
height: 30, height: 30,
callout:{ callout:{
...@@ -197,9 +198,8 @@ ...@@ -197,9 +198,8 @@
}, },
mounted() { mounted() {
// #ifdef MP-WEIXIN this.getLocation()
this.initMiniProgramMap(); this.initMiniProgramMap();
// #endif
}, },
methods: { methods: {
initMiniProgramMap(){ initMiniProgramMap(){
......
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