Skip to content

M
million
Commit e9cb4923 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents f2ba2c0d 67fd5bfd
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 168 deletions
src/components/label_picture/diy-img-two.vue
View file @ e9cb4923
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
v-if="item.TripImageUrl" v-if="item.TripImageUrl"
> >
<a <a
@click="OpenNewUrl(item.LinkUrl)" @click="OpenNewUrl(item)"
:title="item.TripTitle" :title="item.TripTitle"
class="pd-link" class="pd-link"
> >
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
style="border-radius: 12px" style="border-radius: 12px"
/> />
<div class="col"> <div class="col">
<div class="q-mt-md text-subtitle1 text-dark ellipsis-2-lines cursor-pointer" @click="OpenNewUrl(item.LinkUrl)"> <div class="q-mt-md text-subtitle1 text-dark ellipsis-2-lines cursor-pointer" @click="OpenNewUrl(item)">
<!-- --> <!-- -->
{{ item.TripTitle }} {{ item.TripTitle }}
</div> </div>
...@@ -117,8 +117,8 @@ export default { ...@@ -117,8 +117,8 @@ export default {
} }
}, },
methods: { methods: {
OpenNewUrl(url){ OpenNewUrl(item){
window.location.href=url this.CommonJump('/detail/home/0/'+item.TripId,{},'blank')
} }
}, },
}; };
......
src/components/searchdata/kkday.vue
View file @ e9cb4923
...@@ -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 @ e9cb4923
...@@ -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 @ e9cb4923
...@@ -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>
......
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