Skip to content

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

修复bug

parent 37b33e72
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 37 deletions
node_modules/uview-ui/components/u-search/u-search.vue
View file @ e6ceedb3
...@@ -204,6 +204,7 @@ export default { ...@@ -204,6 +204,7 @@ export default {
// 也可以作为用户通过this.$refs形式调用清空输入框内容 // 也可以作为用户通过this.$refs形式调用清空输入框内容
clear() { clear() {
this.keyword = ''; this.keyword = '';
this.$emit('clear');
}, },
// 确定搜索 // 确定搜索
search() { search() {
......
pages/hotel/components/address/searchCity.vue
View file @ e6ceedb3
...@@ -3,9 +3,14 @@ ...@@ -3,9 +3,14 @@
<view class="searchCityKey column" :style="[titleStyle]"> <view class="searchCityKey column" :style="[titleStyle]">
<view class="row items-center" :style="{'padding-right':paddingRight}"> <view class="row items-center" :style="{'padding-right':paddingRight}">
<view class="internationalSearch"> <view class="internationalSearch">
<u-search :placeholder="type?'搜索城市/国家中文或拼音':'搜索酒店中文或拼音'" v-model="parameters.KeyWords" <u-search :placeholder="type?'搜索城市/国家中文或拼音':'搜索酒店中文或拼音'"
input-align="left" :value="parameters.KeyWords" text-color="#111" bg-color="rgba(0,0,0,0)" v-model="parameters.KeyWords"
@change="getKeyWords" @confirm="searchKey" :show-action="false" input-align="left"
:value="parameters.KeyWords"
text-color="#111" bg-color="rgba(0,0,0,0)"
@change="getKeyWords"
@confirm="searchKey"
:show-action="false"
style="font-size: 22rpx;"></u-search> style="font-size: 22rpx;"></u-search>
</view> </view>
<text @click="searchClose">取消</text> <text @click="searchClose">取消</text>
...@@ -60,13 +65,13 @@ ...@@ -60,13 +65,13 @@
</view> </view>
<view class="searchCityTextR"> <view class="searchCityTextR">
<!-- {{ item.unitprice }} --> <!-- {{ item.unitprice }} -->
<text>起</text> <!-- <text>起</text> -->
</view> </view>
</view> </view>
</view> </view>
</template> </template>
</template> </template>
<u-empty v-else text="请输入关键字" mode="data" padding-top="50" color="#000"></u-empty> <u-empty v-show="(HotelList.length==0&&KeyCityList.length==0)&&!showLoading" text="请输入关键字" mode="data" padding-top="50" color="#000"></u-empty>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -107,6 +112,7 @@ ...@@ -107,6 +112,7 @@
if (val.CityCode) { if (val.CityCode) {
this.parameters.CityCode = val.CityCode; this.parameters.CityCode = val.CityCode;
} }
this.parameters.KeyWords = val.KeyWords2
}, },
deep: true, deep: true,
}, },
...@@ -129,6 +135,7 @@ ...@@ -129,6 +135,7 @@
this.KeyCityList = [] this.KeyCityList = []
return return
} }
this.showLoading = false
if (this.type) { if (this.type) {
this.searchCity() this.searchCity()
} else { } else {
...@@ -190,11 +197,11 @@ ...@@ -190,11 +197,11 @@
if (type) { if (type) {
this.$emit('searchKey', 3, item.CityCode, item.NameCN.split(' ')[0]) this.$emit('searchKey', 3, item.CityCode, item.NameCN.split(' ')[0])
} else { } else {
this.$emit('searchKey', 2, item.hotelid) this.$emit('searchKey', 2, item.hotelid,this.parameters.KeyWords)
} }
this.HotelList = [] // this.HotelList = []
this.KeyCityList = [] // this.KeyCityList = []
this.parameters.KeyWords = '' // this.parameters.KeyWords = ''
}, },
searchKey() { searchKey() {
if (this.parameters.KeyWords == '' || !this.parameters.KeyWords) return if (this.parameters.KeyWords == '' || !this.parameters.KeyWords) return
......
pages/hotel/components/hotelRoom.vue
View file @ e6ceedb3
...@@ -297,10 +297,14 @@ ...@@ -297,10 +297,14 @@
name: this.HotelInfo.name, name: this.HotelInfo.name,
address: "", address: "",
images: [], images: [],
destination: this.HotelInfo.location&&this.HotelInfo.location.destination&&this.HotelInfo.location.destination.name,
country: this.HotelInfo.location&&this.HotelInfo.location.country&&this.HotelInfo.location.country.name,
} }
if (this.HotelInfo) { if (this.HotelInfo) {
if (this.HotelInfo.images && this.HotelInfo.images.length > 0) { if (this.HotelInfo.images && this.HotelInfo.images.length > 0) {
pHotel.images.push(this.HotelInfo.images[0].url); pHotel.images.push({
Path: this.HotelInfo.images[0].url
});
} }
if (this.HotelInfo.location&&this.HotelInfo.location.address) { if (this.HotelInfo.location&&this.HotelInfo.location.address) {
pHotel.address = this.HotelInfo.location.address; pHotel.address = this.HotelInfo.location.address;
...@@ -956,15 +960,16 @@ ...@@ -956,15 +960,16 @@
position: absolute; position: absolute;
left: -4px; left: -4px;
top: 0px; top: 0px;
width: 172rpx; min-width: 172rpx;
height: 42rpx; height: 42rpx;
background: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hoteldetailtag.png) no-repeat; background: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hoteldetailtag.png) no-repeat;
background-size: 174rpx 42rpx; background-size: 100% 42rpx;
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #82610F; color: #82610F;
text-align: center; text-align: center;
line-height: 42rpx; line-height: 42rpx;
padding: 0 28rpx 0 20rpx;
} }
.hotelDetail { .hotelDetail {
......
pages/hotel/components/search.vue
View file @ e6ceedb3
...@@ -17,10 +17,16 @@ ...@@ -17,10 +17,16 @@
<view class="days column justify-center"> <view class="days column justify-center">
</view> </view>
<view style="width: 1px; flex: 1;position: relative;"> <view style="width: 1px; flex: 1;position: relative;">
<u-search placeholder="酒店" v-model="parameters.KeyWords" input-align="left" <u-search placeholder="酒店" v-model="parameters.KeyWords2"
:value="parameters.KeyWords" text-color="#111" bg-color="rgba(0,0,0,0)" :show-action="false" input-align="left"
disabled style="font-size: 22rpx;"></u-search> :value="parameters.KeyWords2" text-color="#111"
<view class="clickSearch" @click="clickSearchCity()"> bg-color="rgba(0,0,0,0)"
:show-action="false"
clearabled
:disabled="parameters.KeyWords2==''"
@clear="clearKeyWords()"
style="font-size: 22rpx;"></u-search>
<view v-if="parameters.KeyWords2==''" class="clickSearch" @click="clickSearchCity()">
<view>0</view> <view>0</view>
</view> </view>
</view> </view>
...@@ -198,6 +204,7 @@ ...@@ -198,6 +204,7 @@
showTimePopup: false, showTimePopup: false,
parameters: { parameters: {
KeyWords: "", //关键字 KeyWords: "", //关键字
KeyWords2: "", //关键字
StartPrice: 100, StartPrice: 100,
EndPrice: 0, EndPrice: 0,
QOrderBy: "1", //排序类型 QOrderBy: "1", //排序类型
...@@ -329,24 +336,36 @@ ...@@ -329,24 +336,36 @@
this.regionList = this.regionListAll this.regionList = this.regionListAll
} }
}, },
clearKeyWords(){
this.parameters.hotelId = ''
this.city = this.parameters.CityName = this.PopularCities[0].CityList[0].CityName
this.parameters.CityCode2 = this.PopularCities[0].CityList[0].CityCode
this.parameters.CityCode = this.PopularCities[0].CityList[0].CityCode
this.parameters.KeyWords2= ''
this.research()
},
searchClose() { searchClose() {
this.showSearchCity = false this.showSearchCity = false
this.showCityList = false this.showCityList = false
this.research()
}, },
searchKey(type, key, City) { searchKey(type, key, City) {
if (type == 1) { if (type == 1) {
this.parameters.hotelId = null this.parameters.hotelId = null
if (this.parameters.KeyWords != key) { if (this.parameters.KeyWords != key) {
this.parameters.KeyWords = key this.parameters.KeyWords = key
} }
} else if (type == 2) { } else if (type == 2) {
this.parameters.KeyWords = null this.parameters.KeyWords = null
this.parameters.KeyWords2 = City
if (this.parameters.hotelId != key) { if (this.parameters.hotelId != key) {
this.parameters.hotelId = key this.parameters.hotelId = key
} }
} else if (type == 3) { } else if (type == 3) {
this.parameters.KeyWords = null this.parameters.KeyWords = null
this.parameters.hotelId = null this.parameters.hotelId = null
this.parameters.KeyWords2 = City
if (this.parameters.CityCode != key) { if (this.parameters.CityCode != key) {
this.city = this.parameters.CityName = City this.city = this.parameters.CityName = City
this.parameters.CityCode2 = key this.parameters.CityCode2 = key
...@@ -355,7 +374,6 @@ ...@@ -355,7 +374,6 @@
} }
this.searchClose() this.searchClose()
this.getRegion() this.getRegion()
this.research()
}, },
// 关键字搜索弹出层 // 关键字搜索弹出层
......
pages/hotel/detail.vue
View file @ e6ceedb3
...@@ -3,8 +3,15 @@ ...@@ -3,8 +3,15 @@
<scroll-view ref="scrollView" scroll-y="true" style="width: 100%; height: 100%" @scroll="scroll" <scroll-view ref="scrollView" scroll-y="true" style="width: 100%; height: 100%" @scroll="scroll"
:scroll-top="scrollTop"> :scroll-top="scrollTop">
<view class="media" :style="{ opacity: 100 - boxOption + '%' }" @click="openPicture"> <view class="media" :style="{ opacity: 100 - boxOption + '%' }" @click="openPicture">
<u-swiper :list="dataList.images" :effect3d="false" :height="545" :interval="5000" :border-radius="0" <u-swiper
name="url" v-if="active == 1"></u-swiper> :list="dataList.images"
:effect3d="false"
:height="545"
:interval="5000"
:border-radius="0"
name="url"
v-if="active == 1">
</u-swiper>
<view class="video-box" v-if="active == 0"> <view class="video-box" v-if="active == 0">
<video id="myVideo" :src="detailData.VideoUrl" style="width: 100%; height: 100%" <video id="myVideo" :src="detailData.VideoUrl" style="width: 100%; height: 100%"
:controls="controls" :show-center-play-btn="false" :show-fullscreen-btn="false" :controls="controls" :show-center-play-btn="false" :show-fullscreen-btn="false"
...@@ -179,7 +186,7 @@ ...@@ -179,7 +186,7 @@
<hotelRoom :dataList="dataList" :rooms="getQueryData" :roomMsg="roomMsg" :search="searchObj" <hotelRoom :dataList="dataList" :rooms="getQueryData" :roomMsg="roomMsg" :search="searchObj"
:day="dayObj" :qRoomType="qRoomTypeList" :qMealType="qMealTypeList"></hotelRoom> :day="dayObj" :qRoomType="qRoomTypeList" :qMealType="qMealTypeList"></hotelRoom>
</view> </view>
<u-empty v-show="getQueryData.length==0" text="暂无空房间" mode="data" padding-top="5"></u-empty> <u-empty v-show="getQueryData.length==0&&!loading" text="暂无空房间" mode="data" padding-top="5"></u-empty>
</view> </view>
<view style="border-radius: 15rpx 15rpx 0 0;background: #fff;overflow: hidden;"> <view style="border-radius: 15rpx 15rpx 0 0;background: #fff;overflow: hidden;">
<view class="hotelFacilitiesBox"> <view class="hotelFacilitiesBox">
...@@ -533,6 +540,7 @@ ...@@ -533,6 +540,7 @@
// 获取房间价格 // 获取房间价格
getHotelPrices() { getHotelPrices() {
let that = this let that = this
this.loading = true
this.apipost('dmc_post_GetDiDaPriceSearchList', { this.apipost('dmc_post_GetDiDaPriceSearchList', {
hotelId: this.roomMsg.hotelid, hotelId: this.roomMsg.hotelid,
sort: 0, sort: 0,
......
pages/hotel/order.vue
View file @ e6ceedb3
...@@ -65,19 +65,28 @@ ...@@ -65,19 +65,28 @@
</view> </view>
</view> </view>
<view> <view>
<template v-for="(item,index) in orderMsg.GuestList"> <view v-for="(item,index) in orderMsg.GuestList" class="form-items row" :key="index">
<view class="form-items row"> <view class="label">
<view class="label"> {{ orderMsg.GuestList.length==1?'住客信息':`房间${index+1}住客` }}
{{ orderMsg.GuestList.length==1?'住客信息':`房间${index+1}住客` }} </view>
</view> <view class="LastNameBox column val" style="width: 1px;flex: 1;">
<view class="LastNameBox column val" style="width: 1px;flex: 1;"> <view class="row items-center" v-for="(sItem,i) in item.GuestInfo" :key="i">
<view class="row" v-for="(sItem,i) in item.GuestInfo"> <input type="text" v-model="sItem.LastName" :placeholder="`住客 ${i+1} 姓`" />
<input type="text" v-model="sItem.LastName" :placeholder="`输入住客 ${i+1} 姓`" /> <input type="text" v-model="sItem.FirstName" :placeholder="`住客 ${i+1} 名`" />
<input type="text" v-model="sItem.FirstName" :placeholder="`输入住客 ${i+1} 名`" /> <view class="row" style="margin-left:20rpx;">
<image v-if="item.GuestInfo.length>1"
style="width: 27rpx;height: 27rpx;display: block;"
@click="deleteGuest(index,i)"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245939665786.png" />
<image v-else
style="width: 27rpx;height: 27rpx;display: block;"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638755711218891689.png" />
<image style="width: 27rpx;height: 27rpx;display: block;margin-left:20rpx;" @click="addGuest(index)"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245974558349.png" />
</view> </view>
</view> </view>
</view> </view>
</template> </view>
<view class="form-items"> <view class="form-items">
<view class="label"> <view class="label">
联系姓名 联系姓名
...@@ -666,6 +675,16 @@ ...@@ -666,6 +675,16 @@
changeDown(e) { changeDown(e) {
let i = [e] let i = [e]
}, },
addGuest(index) {
this.orderMsg.GuestList[index].GuestInfo.push({
LastName: "",
FirstName: "",
Age: ""
})
},
deleteGuest(index, index1) {
this.orderMsg.GuestList[index].GuestInfo.splice(index1, 1)
},
editNum(type) { editNum(type) {
if (type == 1) { if (type == 1) {
if (this.orderMsg.RoomCount > 1) { if (this.orderMsg.RoomCount > 1) {
...@@ -676,7 +695,7 @@ ...@@ -676,7 +695,7 @@
this.orderMsg.RoomCount++; this.orderMsg.RoomCount++;
this.orderMsg.GuestList.push({ this.orderMsg.GuestList.push({
RoomNum: this.orderMsg.GuestList.length + 1, RoomNum: this.orderMsg.GuestList.length + 1,
numberOfAdults: 1, numberOfAdults: 2,
numberOfChildren: 0, numberOfChildren: 0,
ChildAgeDetails: '', ChildAgeDetails: '',
GuestInfo: [{ GuestInfo: [{
......
pages/hotel/orderInfor.vue
View file @ e6ceedb3
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
> >
<u-swiper <u-swiper
:list="HotelInfo.images" :list="HotelInfo.images"
mode="number"
:effect3d="false" :effect3d="false"
:height="545" :height="545"
:interval="5000" :interval="5000"
...@@ -64,9 +65,9 @@ ...@@ -64,9 +65,9 @@
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638766148323678002.png"/> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638766148323678002.png"/>
</view> </view>
<view class="orderIforDiZhiRText"> <view class="orderIforDiZhiRText">
{{ HotelInfo.location.address }}, {{ HotelInfo.address }},
{{ HotelInfo.location.destination.name }}, {{ HotelInfo.destination }},
{{ HotelInfo.location.country.name }} {{ HotelInfo.country }}
</view> </view>
</view> </view>
</view> </view>
......
plugin/api.js
View file @ e6ceedb3
...@@ -24,9 +24,9 @@ export default { ...@@ -24,9 +24,9 @@ export default {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// "http://192.168.5.204:8030" // "http://192.168.5.204:8030"
Vue.prototype.host2 = process.env.NODE_ENV=="development"?"http://192.168.5.214:8033":"https://erpmallapi.oytour.com" Vue.prototype.host2 = process.env.NODE_ENV=="development"?"http://192.168.5.214:8033":"https://erpmallapi.oytour.com"
Vue.prototype.host3 = process.env.NODE_ENV=="development"?"http://192.168.5.204:8030":"https://reborn.oytour.com" Vue.prototype.host3 = process.env.NODE_ENV=="development"?"http://192.168.5.214":"https://reborn.oytour.com"
//Vue.prototype.host2 = "https://erpmallapi.oytour.com" // Vue.prototype.host2 = "https://erpmallapi.oytour.com"
//Vue.prototype.host3 = "https://reborn.oytour.com" // Vue.prototype.host3 = "https://reborn.oytour.com"
console.log() console.log()
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
......
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