Skip to content

M
million
Commit 71e7d550 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 5dfb30c6 d0c270fb
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 73 deletions
src/components/navs/city-category.vue
View file @ 71e7d550
......@@ -133,11 +133,11 @@
font-weight: 400;
}
.category-l2:hover {
background: #ee4454;
background: var(--q-color-primary);
color: #fff;
}
.category-l2-select {
background: #ee4454;
background: var(--q-color-primary);
color: #fff;
}
.category-l3 {
......
src/components/navs/hor-big-one.vue
View file @ 71e7d550
......@@ -188,7 +188,7 @@
@click="CommonJump('/index', {})"
/></div>
<!-- <div style="transform:scale(0.6,0.6)"> -->
<!-- <searchSf2 v-if="$q.platform.is.desktop" :plugData="plugData"></searchSf2> -->
<searchSf2 v-if="!(isHome ||isSearch)" :plugData="plugData"></searchSf2>
<!-- </div> -->
<!-- pc -->
<div v-if="$q.platform.is.desktop">
......@@ -313,7 +313,6 @@
</div>
<!-- 移动端 -->
<div v-else>
<!-- <searchSf2 :plugData="plugData"></searchSf2> -->
<img
@click="avatarClick"
class="avatar q-mt-sm"
......@@ -381,6 +380,7 @@ export default {
selectedArea: [],
selectedAreaId: "",
isHome: false,
isSearch: false,
};
},
watch: {
......@@ -396,7 +396,9 @@ export default {
},
$route: {
handler: function (val, oldVal) {
console.log('val', val, oldVal)
this.isHome = val.path === "/" || val.path === "/index";
this.isSearch = val.path === "/search";
},
// 深度观察监听
deep: true,
......@@ -414,6 +416,7 @@ export default {
this.isHome =
this.$router.history.current.path === "/" ||
this.$router.history.current.path === "/index";
this.isSearch = this.$router.history.current.path === "/search";
console.log(
'JSON.parse(window.localStorage.getItem("b2bUser"))',
JSON.parse(window.localStorage.getItem("b2bUser"))
......
src/components/search_sf/search-top.vue
View file @ 71e7d550
......@@ -6,7 +6,7 @@
style="border-radius: 6px"
>
<div>
<div v-if="!$q.screen.xs">
<div class="relative" v-if="!$q.screen.xs">
<div
class="row rounded-borders overflow-hidden"
style="width: 300px"
......@@ -34,7 +34,7 @@
icon="search"
style="
width: 100%;
height: 56px;
height: 40px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
"
......@@ -100,8 +100,10 @@
</div>
</div>
</div>
<div v-if="$q.screen.xs">
<q-input
<div v-if="$q.screen.xs" @click="showPopupHandler">
<i class="iconfont iconchazhao"></i>
<!-- <q-icon name="search" /> -->
<!-- <q-input
filled
v-model="searchKey"
class="bg-grey-1 q-mx-md"
......@@ -112,7 +114,7 @@
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
</q-input> -->
</div>
</div>
</div>
......@@ -135,7 +137,33 @@
<q-tab class="text-teal" name="kw" label="關鍵字" />
</q-tabs>
<div v-show="tab == 'dest'">
<div class="q-mb-md">
<q-card flat class="rounded-borders q-py-md">
<div class="text-subtitle1 text-weight-bold q-mx-md">篩選目的地</div>
<!-- <q-input
v-model="searchAdd.name"
type="text"
standout
placeholder="搜尋目的地"
class="q-ma-md"
@input="changeAddrSearchHandler"
/> -->
<q-tree
ref="area"
:nodes="areaList"
no-connectors
node-key="Id"
label-key="Name"
tick-strategy="leaf"
@update:ticked="handleAreaTicked"
@update:selected="handleAreaSelected"
:ticked="areaTicked"
text-color="#666"
no-nodes-label=" "
no-results-label=" "
/>
</q-card>
<!-- <div class="q-mb-md">
<q-select
filled
v-model="chosenResult.fl"
......@@ -174,7 +202,7 @@
option-value="Name"
label="請選擇地區"
/>
</div>
</div> -->
</div>
<div v-show="tab == 'kw'" class="q-mb-md">
<q-input
......@@ -260,6 +288,8 @@ export default {
},
data() {
return {
areaTicked: [],
areaList: [],
setectHotTag: '',
hotList: [],
slide: 0,
......@@ -296,12 +326,9 @@ export default {
};
},
created() {
// this.$EventBus.$on('hotList', (hotList) => {
// console.log('hotList', hotList);
// this.hotList = hotList
// })
},
mounted() {
this.initAreaList()
var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
const hotList = this.getHotList(jObj.AreaList)
console.log('hotList mounted', jObj, hotList)
......@@ -338,6 +365,44 @@ export default {
},
computed: {},
methods: {
handleAreaTicked(target) {
console.log("this.areaTicked", target, this.areaTicked)
// if(!this.areaTicked.length) {
// this.areaTicked = target
// } else if(this.areaTicked[0] === target[0]) {
// this.areaTicked = target[1] ? [target[1]] : []
// } else {
// this.areaTicked = target
// }
this.areaTicked = target
},
handleAreaSelected(target) {
// console.log("this.handleAreaSelected", target);
},
initAreaList() {
let jObj = JSON.parse(window.localStorage.getItem("baseifo"));
let arr = [];
jObj.AreaList.forEach((x) => {
x.selectable = false
x.children = x.SubList;
x.children.forEach((y) => {
y.checked = false;
y.explsed = false;
y.isShow = true;
if (y.SubList) {
y.selectable = false
y.children = y.SubList;
y.children.forEach((z) => {
z.checked = false;
z.explsed = false;
z.isShow = true;
});
}
});
this.areaList = jObj.AreaList;
this.areaListJSON = JSON.parse(JSON.stringify(this.areaList));
});
},
getHotList(arr) {
let hotArr = [];
arr.forEach(item => {
......@@ -436,9 +501,11 @@ export default {
this.CommonJump("/search", {
qsearchKey: this.searchKey,
areaIds: this.areaTicked.join(','),
qsearchDate: this.searchDate,
qsearchEndDate: this.searchEndDate,
});
this.showSplitPannel = false
},
clearHistorys(){
this.historys =[]
......@@ -449,21 +516,6 @@ export default {
</script>
<style>
::v-deep .q-field__control {
height: 40px;
}
::v-deep .q-field__control-container {
height: 40px;
}
::v-deep .q-field--auto-height .q-field__control {
min-height: 40px;
}
::v-deep .q-field__marginal {
height: 40px;
}
::v-deep .q-field--auto-height .q-field__native {
min-height: 40px;
}
.banner-style9 {
/* margin-top: 0px; */
/* position: relative; */
......@@ -509,7 +561,7 @@ export default {
.banner-style9 .showbox {
position: absolute;
box-sizing: border-box;
width: 100%;
width: 650px;
height: 345px;
background: #fff;
left: 0;
......@@ -603,7 +655,7 @@ export default {
.chosen-box .split-word {
font-size: 15px;
color: #333;
line-height: 56px;
line-height: 40px;
}
</style>
<style scoped>
......@@ -620,4 +672,25 @@ cursor: pointer;
background: #EE4454;
color: #fff;
}
</style>
<style lang="scss" scoped>
::v-deep .q-field__control {
height: 40px;
}
::v-deep .q-field__control-container {
height: 40px;
}
::v-deep .q-field--auto-height .q-field__control {
height: 40px;
}
::v-deep .q-field__marginal {
height: 40px;
}
::v-deep .q-field--auto-height .q-field__native {
height: 40px;
}
::v-deep .q-field__label {
top: 13px
}
</style>
\ No newline at end of file
src/components/searchdata/kkday.vue
View file @ 71e7d550
......@@ -511,6 +511,9 @@ export default {
this.goSearchHandler();
},
mounted() {
console.log('kkday', this.msg)
this.areaTicked = this.msg.areaId ? [this.msg.areaId] : (this.msg.areaIds ? this.msg.areaIds : []);
this.msg.placeIds = this.getChoseAddressCity().join(",");
var CategoryName = this.getUrlKey("CategoryName", window.location.href);
if (CategoryName) {
let list = this.goodsType.find(
......@@ -542,6 +545,7 @@ export default {
this.areaTicked = target;
console.log("this.areaTicked", target);
this.msg.placeIds = this.getChoseAddressCity().join(",");
console.log('handleAreaTicked', this.areaTicked, this.msg.placeIds)
this.goSearchHandler();
},
initAreaList() {
......@@ -577,7 +581,7 @@ export default {
if (this.msg.areaId) {
this.$nextTick(() => {
this.$refs.area.setTicked([...new Set(arr)], true);
this.$refs.area?.setTicked([...new Set(arr)], true);
});
}
},
......@@ -701,7 +705,7 @@ export default {
this.goodsTypeJSON = JSON.stringify(this.goodsType);
if (this.msg.categoryId) {
this.$nextTick(() => {
this.$refs.category.setTicked([...new Set(arr)], true);
this.$refs.category?.setTicked([...new Set(arr)], true);
});
}
},
......
src/pages/About.vue
View file @ 71e7d550
......@@ -73,7 +73,7 @@
.circle {
width: 32px;
height: 32px;
background: $primary;
background: var(--q-color-primary);
border-radius: 50%;
text-align: center;
color: #fff;
......
src/pages/Search.vue
View file @ 71e7d550
......@@ -1456,6 +1456,7 @@ export default {
var qsearchDate = this.getUrlKey("qsearchDate", window.location.href);
var qsearchEndDate = this.getUrlKey("qsearchEndDate", window.location.href);
var areaId = this.getUrlKey("areaId", window.location.href);
var areaIds = this.getUrlKey("areaIds", window.location.href)
var categoryId = this.getUrlKey("categoryId", window.location.href);
if (qsearchKey) {
this.qMsg.searchKey = qsearchKey;
......@@ -1469,6 +1470,9 @@ export default {
if (areaId) {
this.qMsg.areaId = Number(areaId);
}
if (areaIds) {
this.qMsg.areaIds = areaIds.split(',').map(item => Number(item));
}
if (categoryId) {
this.qMsg.categoryId = Number(categoryId);
}
......
src/pages/detailHotal.vue
View file @ 71e7d550
......@@ -372,19 +372,19 @@
@click="CommonJump('/index', {})"
/>
<q-breadcrumbs-el label="日本" class="cursor-pointer" />
<q-breadcrumbs-el>
<!-- <q-breadcrumbs-el>
<span>
<span class="cursor-pointer">{{ hotelSummary.hotelStateProvince }} </span>
<span class="q-mr-sm"></span>
</span>
</q-breadcrumbs-el>
</q-breadcrumbs-el> -->
<q-breadcrumbs-el
v-if="$q.platform.is.desktop"
:label="hotelSummary.address"
:label="hotelSummary.hotelName"
class="text-grey-6 ellipsis"
/>
</q-breadcrumbs>
<div class="text-grey-6 f12">Product No. # </div>
<div class="text-grey-6 f12">Product No. # {{dataList.hotelId}}</div>
</div>
<div class="row rounded-borders bg-white overflow-hidden relative">
<q-img class="col-5 cursor-pointer" :src="hotelDetails.hotelImageUrl1" :ratio="16/9" @click="showImageHandler(hotelDetails.hotelImageUrl1)"/>
......@@ -457,7 +457,6 @@
}"
>
<div class="product-price f30 bold" v-if="MinPrice > 0">
<!-- CNY：{{ dataList. }} -->
CNY：{{ moneyFormat(MinPrice, 0) }}
<span class="f16 text-grey-6 normal">起</span>
</div>
......@@ -510,7 +509,7 @@
<hotel-map></hotel-map>
</div> -->
<div
class="q-pa-lg bg-grey-3 q-mt-lg text-grey-9"
class="q-pa-lg bg-grey-3 text-grey-9"
ref="pricelist"
>
<div
......@@ -1222,6 +1221,7 @@ export default {
(res) => {
this.$q.loading.hide();
if (res.data.resultCode == 1) {
this.dataList = res.data.data
this.hotelDetails = res.data.data.hotelDetails;
this.hotelSummary = res.data.data.hotelSummary;
this.roomReviewRating = Number(this.hotelDetails.roomReviewRating);
......
src/pages/detailsCar.vue
View file @ 71e7d550
......@@ -58,20 +58,14 @@
class="cursor-pointer"
@click="CommonJump('/index', {})"
/>
<q-breadcrumbs-el label="日本" class="cursor-pointer" />
<q-breadcrumbs-el>
<span v-for="(x, i) in citys" :key="i">
<span class="cursor-pointer">{{ x }} </span>
<span v-if="i + 1 != citys.length" class="q-mr-sm">，</span>
</span>
</q-breadcrumbs-el>
<q-breadcrumbs-el :label="dataList.CityList2[0].CountryName" class="cursor-pointer" />
<q-breadcrumbs-el
v-if="$q.platform.is.desktop"
:label="dataList.title"
:label="dataList.Name"
class="text-grey-6 ellipsis"
/>
</q-breadcrumbs>
<div class="text-grey-6 f12">Product No. # {{ dataList.id }}</div>
<div class="text-grey-6 f12">Product No. # {{ dataList.Id }}</div>
</div>
<div style="padding-bottom: calc((100% - 0px) / 3); position: relative">
<div
......@@ -120,7 +114,6 @@
<div
class="q-py-lg"
:class="{ row: $q.platform.is.desktop, column: $q.platform.is.mobile }"
style="border-bottom: 1px solid #eee"
>
<div class="col q-mr-lg">
<div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
......@@ -184,21 +177,6 @@
/>
</div>
</div>
<div class="q-mt-lg" v-if="dataList.productRecommend">
<div
class="q-mt-sm"
v-for="(x, i) in dataList.productRecommend.split('\n')"
:key="i"
>
<q-icon
name="iconfont iconhongqi"
color="primary"
size="16px"
class="q-mr-md"
/>
{{ x }}
</div>
</div>
</div>
<div
class="bg-white"
......@@ -234,7 +212,7 @@
</div>
<div
v-if="dataList"
class="q-pa-lg bg-grey-3 q-mt-lg text-grey-9"
class="q-pa-lg bg-grey-3 text-grey-9"
ref="pricelist"
>
<div
......
src/pages/hotel/selectRoom.vue
View file @ 71e7d550
<style lang="scss" scoped>
.select-day {
background: $primary;
background: var(--q-color-primary);
color: #fff !important;
border-radius: 8px;
}
......
src/pages/login.vue
View file @ 71e7d550
......@@ -327,7 +327,16 @@ export default {
if (res.data.resultCode == 1) {
const { type, unoinid } = res.data.data;
if (type === 1) {
this.CommonJump("/index", {});
window.localStorage.setItem(
"b2bUser",
JSON.stringify(res.data.data)
);
if (this.path) {
this.CommonJump(this.path, {});
} else {
this.CommonJump("/index", {});
}
} else {
this.isLogin = false;
// 绑定邮箱
......
src/pages/usercenter/coupon.vue
View file @ 71e7d550
......@@ -68,7 +68,7 @@
width: 20px;
height: 4px;
border-radius: 2px;
background-color: $primary;
background-color: var(--q-color-primary);
margin: -8px auto 0 auto;
}
.img {
......
src/pages/usercenter/loginInfo.vue
View file @ 71e7d550
......@@ -147,7 +147,7 @@ export default {
changeWechat() {
const { AppID, State, OpenRedirectUri } = this.openInfo;
let redirect_uri = OpenRedirectUri;
const url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${redirect_uri}/loginInfo&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
const url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${redirect_uri}/#/loginInfo&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
window.location.href = url;
},
changeEmail() {
......
src/pages/usercenter/mobileUserCenter.vue
View file @ 71e7d550
......@@ -68,7 +68,7 @@ margin: 10px 13px 0 13px;
line-height: 14px;
border-radius: 50%;
color: #fff;
background-color: $primary;
background-color: var(--q-color-primary);
}
</style>
<template>
......
src/pages/usercenter/setUsersList.vue
View file @ 71e7d550
......@@ -69,7 +69,7 @@
width: 20px;
height: 4px;
border-radius: 2px;
background-color: $primary;
background-color: var(--q-color-primary);
margin: -8px auto 0 auto;
}
.card-info {
......
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