Skip to content

M
million
Commit 6fb01a56 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/million

parents 172b71c2 27840e60
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 175 deletions
src/components/car/orderPreview.vue
View file @ 6fb01a56
...@@ -148,7 +148,6 @@ export default { ...@@ -148,7 +148,6 @@ export default {
this.p = n; this.p = n;
if(n&&n.startDate){ if(n&&n.startDate){
this.chosenObj.startDate = n.startDate; this.chosenObj.startDate = n.startDate;
console.log(this.chosenObj.startDate,this.dataAll,'===')
let arr = this.dataAll.filter(x=> x.Date==this.chosenObj.startDate) let arr = this.dataAll.filter(x=> x.Date==this.chosenObj.startDate)
if(arr.length>0){ if(arr.length>0){
this.TicketIds = arr[0].Price.map(x=> {return x.TicketId}) this.TicketIds = arr[0].Price.map(x=> {return x.TicketId})
......
src/components/navs/hor-big-one.vue
View file @ 6fb01a56
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
@click="CommonJump('/index', {})" @click="CommonJump('/index', {})"
/></div> /></div>
<!-- <div style="transform:scale(0.6,0.6)"> --> <!-- <div style="transform:scale(0.6,0.6)"> -->
<searchSf2 v-if="!(isHome ||isSearch)" :plugData="plugData"></searchSf2> <searchSf2 v-if="!isHome" :plugData="plugData"></searchSf2>
<!-- </div> --> <!-- </div> -->
<!-- pc --> <!-- pc -->
<div v-if="$q.platform.is.desktop"> <div v-if="$q.platform.is.desktop">
...@@ -380,7 +380,7 @@ export default { ...@@ -380,7 +380,7 @@ export default {
selectedArea: [], selectedArea: [],
selectedAreaId: "", selectedAreaId: "",
isHome: false, isHome: false,
isSearch: false, isSearch: true,
}; };
}, },
watch: { watch: {
...@@ -398,7 +398,7 @@ export default { ...@@ -398,7 +398,7 @@ export default {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log('val', val, oldVal) console.log('val', val, oldVal)
this.isHome = val.path === "/" || val.path === "/index"; this.isHome = val.path === "/" || val.path === "/index";
this.isSearch = val.path === "/search"; // this.isSearch = val.path === "/search";
}, },
// 深度观察监听 // 深度观察监听
deep: true, deep: true,
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
this.isHome = this.isHome =
this.$router.history.current.path === "/" || this.$router.history.current.path === "/" ||
this.$router.history.current.path === "/index"; this.$router.history.current.path === "/index";
this.isSearch = this.$router.history.current.path === "/search"; // this.isSearch = this.$router.history.current.path === "/search";
console.log( console.log(
'JSON.parse(window.localStorage.getItem("b2bUser"))', 'JSON.parse(window.localStorage.getItem("b2bUser"))',
JSON.parse(window.localStorage.getItem("b2bUser")) JSON.parse(window.localStorage.getItem("b2bUser"))
......
src/components/search_sf/search-top.vue
View file @ 6fb01a56
...@@ -86,7 +86,8 @@ ...@@ -86,7 +86,8 @@
<div class="q-mb-sm text-weight-bold">歷史搜索</div> <div class="q-mb-sm text-weight-bold">歷史搜索</div>
<div class="row"> <div class="row">
<div class="col overflow-hidden" style="height:36px"> <div class="col overflow-hidden" style="height:36px">
<q-chip style="background:#f6f7f9;" @click="goSearchHandler(x)" clickable text-color="dark" class="cursor-pointer" :label="x" v-for="(x,i) in historys" :key="i" /> <template v-for="(x,i) in historys">
<q-chip v-if="x" style="background:#f6f7f9;" @click="goSearchHandler(x)" clickable text-color="dark" class="cursor-pointer" :label="x" :key="i" /></template>
</div> </div>
<q-btn text-color="grey-6" icon="delete" class="q-py-none" dense size="sm" flat @click="clearHistorys"> <q-btn text-color="grey-6" icon="delete" class="q-py-none" dense size="sm" flat @click="clearHistorys">
<q-tooltip class="bg-dark" co>清空歷史</q-tooltip> <q-tooltip class="bg-dark" co>清空歷史</q-tooltip>
...@@ -328,6 +329,7 @@ export default { ...@@ -328,6 +329,7 @@ export default {
created() { created() {
}, },
mounted() { mounted() {
this.isSearch = this.$router.history.current.path === "/search";
this.initAreaList() this.initAreaList()
var jObj = JSON.parse(window.localStorage.getItem('baseifo')); var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
const hotList = this.getHotList(jObj.AreaList) const hotList = this.getHotList(jObj.AreaList)
...@@ -430,6 +432,9 @@ export default { ...@@ -430,6 +432,9 @@ export default {
qsearchEndDate: this.searchEndDate, qsearchEndDate: this.searchEndDate,
areaId: item.Id areaId: item.Id
}); });
if(this.isSearch) {
window.location.reload()
}
}, },
//获取地区数据 //获取地区数据
getAera() { getAera() {
...@@ -506,6 +511,9 @@ export default { ...@@ -506,6 +511,9 @@ export default {
qsearchEndDate: this.searchEndDate, qsearchEndDate: this.searchEndDate,
}); });
this.showSplitPannel = false this.showSplitPannel = false
if(this.isSearch) {
window.location.reload()
}
}, },
clearHistorys(){ clearHistorys(){
this.historys =[] this.historys =[]
...@@ -561,7 +569,7 @@ export default { ...@@ -561,7 +569,7 @@ export default {
.banner-style9 .showbox { .banner-style9 .showbox {
position: absolute; position: absolute;
box-sizing: border-box; box-sizing: border-box;
width: 650px; width: 650px !important;
height: 345px; height: 345px;
background: #fff; background: #fff;
left: 0; left: 0;
......
src/components/search_sf/search_sf2.vue
View file @ 6fb01a56
...@@ -170,7 +170,8 @@ ...@@ -170,7 +170,8 @@
<div class="q-mb-sm text-weight-bold">歷史搜索</div> <div class="q-mb-sm text-weight-bold">歷史搜索</div>
<div class="row"> <div class="row">
<div class="col overflow-hidden" style="height:36px"> <div class="col overflow-hidden" style="height:36px">
<q-chip style="background:#f6f7f9;" @click="goSearchHandler(x)" clickable text-color="dark" class="cursor-pointer" :label="x" v-for="(x,i) in historys" :key="i" /> <template v-for="(x,i) in historys">
<q-chip v-if="x" style="background:#f6f7f9;" @click="goSearchHandler(x)" clickable text-color="dark" class="cursor-pointer" :label="x" :key="i" /></template>
</div> </div>
<q-btn text-color="grey-6" icon="delete" class="q-py-none" dense size="sm" flat @click="clearHistorys"> <q-btn text-color="grey-6" icon="delete" class="q-py-none" dense size="sm" flat @click="clearHistorys">
<q-tooltip class="bg-dark" co>清空歷史</q-tooltip> <q-tooltip class="bg-dark" co>清空歷史</q-tooltip>
......
src/components/searchdata/kkday.vue
View file @ 6fb01a56
...@@ -899,11 +899,11 @@ export default { ...@@ -899,11 +899,11 @@ export default {
this.goodsType = category.children; this.goodsType = category.children;
// this.ticked = categoryInfo; // this.ticked = categoryInfo;
console.log("this.areaListJSONTMP", this.areaListJSONTMP, this.areaList); console.log("this.areaListJSONTMP", this.areaListJSONTMP, this.areaList);
this.priceModel = { min: priceInfo.minPrice, max: priceInfo.maxPrice }; // this.priceModel = { min: priceInfo.minPrice, max: priceInfo.maxPrice };
this.msg.priceRange = { // this.msg.priceRange = {
min: priceInfo.minPrice, // min: priceInfo.minPrice,
max: priceInfo.maxPrice, // max: priceInfo.maxPrice,
}; // };
let arr = []; let arr = [];
dayInfo.forEach((item) => { dayInfo.forEach((item) => {
if (item < 6) { if (item < 6) {
......
src/pages/detailHotal.vue
View file @ 6fb01a56
...@@ -196,162 +196,6 @@ ...@@ -196,162 +196,6 @@
@click="getRoom" @click="getRoom"
/> />
</div> </div>
<!-- <template v-if="$q.platform.is.mobile">
<div class="col"></div>
<div style="height: 30px;">
<q-btn style="height: 33px;width: 33px;" unelevated round
color="primary" class="q-pt-xs iconfont iconchazhao">
<q-popup-proxy class="no-shadow" style="box-shadow: 0 0 50px #ddd !important" :offset="[0, 20]"
ref="qDateProxyMore">
<q-card class="q-pa-md rounded-borders" style="width: 300px">
<div class="q-mb-md text-subtitle2">更多</div>
<div class="q-my-md">
<div
:class="{'row no-wrap': $q.platform.is.desktop,'column': $q.platform.is.mobile,}">
<q-field stack-label label="入住 / 退房日期" standout dense>
<div class="self-center full-width no-outline row no-wrap items-center" tabindex="0">
<span>{{dateRangeFormat}} </span>
<q-chip size="9px" clickable
text-color="white"
color="dark" square>{{liveNvm}} 晚</q-chip>
</div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy">
<q-date v-model="dateRange" :options="optionsFn" range mask="YYYY/MM/DD" landscape
@range-end="dateRangeHandler"></q-date>
</q-popup-proxy>
</q-field>
<q-field stack-label label="人数及客房" standout dense>
<div class="self-center full-width no-outline" tabindex="0">
{{numberOfAdults}}成人
<template v-if="numberOfChildren>0"> {{numberOfChildren}}儿童</template>
{{roomGroup}}房
</div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy2">
<div class="q-pa-lg q-py-lg bg-white">
<div class="row items-center">
<span class="text-grey-7 product-price fz14 q-mr-lg">客房</span>
<div>
<q-input
v-model="roomGroup"
class="col"
mask="#"
reverse-fill-mask
dense
standout
readonly
>
<template v-slot:prepend>
<q-btn
color="primary"
size="sm"
class="q-px-none"
flat
icon="remove"
@click="addPeople('room', -1)"
/>
</template>
<template v-slot:append>
<q-btn
color="primary"
size="sm"
class="q-px-none"
flat
icon="add"
@click="addPeople('room', 1)"
/>
</template>
</q-input>
</div>
</div>
<q-separator color="grey-2" class="q-my-md" />
<div class="column" v-for="(x,index) in msg.searchroomGroup" :key="index">
<div class="row no-wrap">
<div class="row items-center">
<span class="text-grey-7 product-price fz14 q-mr-lg">成人</span>
<q-input
v-model="x.numberOfAdults"
mask="#"
reverse-fill-mask
dense
standout
readonly
>
<template v-slot:prepend>
<q-btn
color="primary"
size="sm"
class="q-px-none"
flat
icon="remove"
@click="addPeople('numberOfAdults', -1,x)"
/>
</template>
<template v-slot:append>
<q-btn
color="primary"
size="sm"
class="q-px-none"
flat
icon="add"
@click="addPeople('numberOfAdults', 1,x)"
/>
</template>
</q-input>
</div>
<div class="row items-center q-ml-lg">
<span class="text-grey-7 product-price fz14 q-mr-lg">儿童</span>
<q-input
v-model="x.numberOfChildren"
mask="#"
reverse-fill-mask
dense
standout
readonly
>
<template v-slot:prepend>
<q-btn
color="primary"
size="sm"
class="q-px-none"
flat
icon="remove"
@click="addPeople('numberOfChildren', -1,x)"
/>
</template>
<template v-slot:append>
<q-btn
color="primary"
size="sm"
class="q-px-none"
flat
icon="add"
@click="addPeople('numberOfChildren', 1,x)"
/>
</template>
</q-input>
</div>
</div>
<q-separator v-if="index!=(msg.searchroomGroup.length-1)" color="grey-2" class="q-my-md" />
</div>
</div>
</q-popup-proxy>
</q-field>
</div>
</div>
<div class="q-my-md row">
<q-btn
color="primary"
unelevated
class="q-px-xl col"
label="搜索"
@click="getRoom(),$refs.qDateProxyMore.hide()"
/>
</div>
</q-card>
</q-popup-proxy>
</q-btn>
</div>
</template> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -449,7 +293,7 @@ ...@@ -449,7 +293,7 @@
</div> </div>
<div <div
:style="{ width: $q.platform.is.mobile ? '100%' : '293px' }" :style="{ width: $q.platform.is.mobile ? '100%' : '293px' }"
class="rounded-borders q-px-md" class="bg-grey-3 rounded-borders q-px-md"
:class="{ :class="{
'q-py-lg': $q.platform.is.desktop, 'q-py-lg': $q.platform.is.desktop,
'row justify-between items-center q-mt-sm q-py-sm': 'row justify-between items-center q-mt-sm q-py-sm':
...@@ -460,7 +304,7 @@ ...@@ -460,7 +304,7 @@
CNY：{{ moneyFormat(MinPrice, 0) }} CNY：{{ moneyFormat(MinPrice, 0) }}
<span class="f16 text-grey-6 normal">起</span> <span class="f16 text-grey-6 normal">起</span>
</div> </div>
<div v-else class="text-subtitle1 f30 bold text-grey-6">暫無報價</div> <div v-else class="product-price text-subtitle1 f30 bold text-grey-6">暫無報價</div>
<q-btn <q-btn
color="primary" color="primary"
label="選擇方案" label="選擇方案"
......
src/pages/detailsCar.vue
View file @ 6fb01a56
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
icon="iconfont iconcancel" icon="iconfont iconcancel"
label="3天前可免費取消" :label="`${dataList.FreeCancelDay}天前可免费取消`"
/> />
</div> </div>
</div> </div>
......
src/pages/usercenter/setUsersList.vue
View file @ 6fb01a56
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
/>添加出行人</q-btn />添加出行人</q-btn
> >
</div> </div>
<div class="mt flex justify-end"> <div class="mt flex justify-end" v-if="pageCount">
<q-pagination <q-pagination
v-model="current" v-model="current"
:max="pageCount" :max="pageCount"
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
<div class="bg-white dialog-box" style="padding: 20px"> <div class="bg-white dialog-box" style="padding: 20px">
<div class="f22 bold">{{ form.Id ? "编辑" : "新增" }}出行人信息</div> <div class="f22 bold">{{ form.Id ? "编辑" : "新增" }}出行人信息</div>
<form @submit.prevent.stop="submit" class="q-gutter-md"> <form @submit.prevent.stop="submit" class="q-gutter-md">
<div> <div class="q-pt-md">
<div :class="$q.platform.is.desktop ? 'row': 'culmuns'"> <div :class="$q.platform.is.desktop ? 'row': 'culmuns'">
<div class="col q-mt-md"> <div class="col">
<div class="title">姓</div> <div class="title">姓</div>
<q-input <q-input
class="form-item" class="form-item"
......
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