Skip to content

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

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

parents e6476c6a 3365aa48
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 67 deletions
src/App.vue
View file @ 85770ff5
......@@ -79,6 +79,14 @@ body {
display: flex;
align-items: center;
}
.BMap_cpyCtrl {
display: none;
}
.anchorBL {
display: none;
}
@media only screen and (max-width: 1200px) {
.section-block {
max-width: 768px !important;
......
src/components/car/Map.vue
View file @ 85770ff5
......@@ -53,8 +53,14 @@
let map = new BMapGL.Map(`baidu-map_${this.center.Id}`); // 创建地图实例
let point = new BMapGL.Point(this.center.Lng, this.center.Lat); // 创建点坐标
map.centerAndZoom(point, 15); // 初始化地图，设置中心点坐标和地图级别
map.enableScrollWheelZoom(true);
var scaleCtrl = new BMapGL.ScaleControl(); // 添加比例尺控件
map.addControl(scaleCtrl);
var zoomCtrl = new BMapGL.ZoomControl(); // 添加缩放控件//开启鼠标滚轮缩放
map.addControl(zoomCtrl);
this.map = map;
},
addMarker() {
let icon = require(`../../assets/img/marker.png`);
var myIcon = new BMapGL.Icon(icon, new BMapGL.Size(23, 25), {
......@@ -97,13 +103,19 @@
addCircle(){
var mPoint = new BMapGL.Point(this.center.Lng, this.center.Lat);
var circle = new BMapGL.Circle(mPoint,this.center.Range,{fillColor:"blue", strokeWeight: 1 ,fillOpacity: 0.3, strokeOpacity: 0.3});
this.map.addOverlay(circle);
this.map.addOverlay(circle);
let getNeSw = circle.getBounds()
var mPoint1 = new BMapGL.Point(getNeSw.ne.lng,getNeSw.ne.lat)
var mPoint2 = new BMapGL.Point(getNeSw.sw.lng,getNeSw.sw.lat)
let points=[mPoint1,mPoint2]
this.map.centerAndZoom(mPoint, this.map.getViewport(points).zoom+1);
},
getLocalSearch(){
var mPoint = new BMapGL.Point(this.center.Lng, this.center.Lat);
var local = new BMapGL.LocalSearch(this.map, {renderOptions: {map: this.map, autoViewport: false}});
local.searchNearby(this.keywords,mPoint,this.center.Range);
},
},
}
</script>
src/components/hotal/RoomCard.vue
View file @ 85770ff5
......@@ -81,7 +81,7 @@
</div>
<q-separator color="grey-2" class="q-my-md"/>
</div>
<div v-if="!prices" class="text-center q-my-xl">
<div v-if="prices.length==0" class="text-center q-my-xl">
<none-data
iconType="order"
title="沒有找到您的房間信息哦"
......@@ -113,7 +113,8 @@
watch: {
priceList: {
handler(newVal, oldValue) {
this.prices = newVal;
this.prices = JSON.parse(JSON.stringify(newVal));
this.$forceUpdate();
this.init();
},
deep: true, // 深度监听
......
src/components/navs/hor-big-one.vue
View file @ 85770ff5
......@@ -213,39 +213,69 @@
:src="LoginUser.photo"
/>
<img class="avatar" v-else src="../../assets/img/avatar.png" />
<!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> -->
</template>
<div class="row no-wrap q-pa-md">
<div class="row no-wrap">
<div class="column">
<q-list>
<q-item clickable v-close-popup to="/account">
<q-list class="text-grey-8" dense>
<q-item clickable v-close-popup to="/setUserInfo">
<q-item-section avatar>
<q-avatar icon="folder" text-color="#474747" />
<q-avatar icon="iconfont iconpeople1"/>
</q-item-section>
<q-item-section>
<q-item-label>帳號設定</q-item-label>
<q-item-label>個人信息</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup to="/orderlist">
<q-item clickable v-close-popup to="/coupon">
<q-item-section avatar>
<q-avatar icon="assignment" text-color="#474747" />
<q-avatar icon="iconfont iconqianbao"/>
</q-item-section>
<q-item-section>
<q-item-label>我的訂單</q-item-label>
<q-item-label>優惠券</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup to="/demandlist">
<q-item clickable v-close-popup to="/order">
<q-item-section avatar>
<q-avatar icon="assignment" text-color="#474747" />
<q-avatar icon="iconfont iconorder"/>
</q-item-section>
<q-item-section>
<q-item-label>我的需求單</q-item-label>
<q-item-label>訂單</q-item-label>
</q-item-section>
</q-item>
<q-separator inset class="q-mx-lg" />
<div class="flex flex-center padding-top">
<q-btn label="登出" @click="loginOut" flat v-close-popup />
</div>
<q-item clickable v-close-popup to="/setUsersList">
<q-item-section avatar>
<q-avatar icon="iconfont iconpeople"/>
</q-item-section>
<q-item-section>
<q-item-label>出行人信息管理</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup to="/setAddress">
<q-item-section avatar>
<q-avatar icon="iconfont iconemail"/>
</q-item-section>
<q-item-section>
<q-item-label>管理邮寄地址</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup to="/setInfo">
<q-item-section avatar>
<q-avatar icon="iconfont iconset"/>
</q-item-section>
<q-item-section>
<q-item-label>賬戶設置</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="loginOut">
<q-item-section avatar>
<q-avatar icon="iconfont iconlog-in"/>
</q-item-section>
<q-item-section>
<q-item-label>登出</q-item-label>
</q-item-section>
</q-item>
</q-list>
</div>
<!-- <q-separator vertical inset class="q-mx-lg" />
......
src/pages/ScenicSpotTicket/details.vue
View file @ 85770ff5
......@@ -151,12 +151,6 @@
square
icon="iconfont icontime"
label="行程時間 1 天" />
<q-chip
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconnetwork-fill"
label="日本語/中文 導覽"
/>
<q-chip
class="transparent q-mr-xl no-padding"
square
......@@ -855,7 +849,7 @@ export default {
this.selectedId = this.dataList.TicketList.find(x=>x.Id)
this.dataList.imgCover = this.dataList.PicPathList;
this.AddressObj = this.dataList
this.AddressObj.Address = `${this.dataList.CountryName}-${this.dataList.CityName}-${this.dataList.ProvinceName}-${this.dataList.Address}`
this.AddressObj.Address = `${this.dataList.CountryName?this.dataList.CountryName+'-':''}${this.dataList.CityName?this.dataList.CityName+'-':''}${this.dataList.ProvinceName?this.dataList.ProvinceName+'-':''}${this.dataList.Address}`
this.isShow = true;
if (this.dataList.videoStr && this.dataList.videoStr != "") {
this.options.loop = false;
......
src/pages/detailsHotal.vue → src/pages/detailHotal.vue
View file @ 85770ff5
......@@ -445,12 +445,6 @@
square
icon="iconfont icontime"
:label="`住宿時間 ${liveNvm} 晚`" />
<q-chip
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconnetwork-fill"
label="日本語/中文 導覽"
/>
</div>
</div>
<div
......@@ -669,9 +663,9 @@
<div class="q-mt-sm column":class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<div class="q-pb-md"><span class="text-weight-bold">接送服务</span> {{hotelDetails.pickupService}}</div>
<div class="q-pb-md"><span class="text-weight-bold q-pr-lg">接送服务</span> {{hotelDetails.pickupService}}</div>
<div class="q-pb-md row no-wrap">
<span class="text-weight-bold">客房网络连接</span>
<span class="text-weight-bold q-mt-xs">客房网络连接</span>
<span class="q-pl-md row wrap col">
<q-chip size="9px" clickable
text-color="white"
......@@ -1008,9 +1002,9 @@ export default {
};
},
watch: {
days: {
SimilarList: {
handler: function (val, oldval) {
this.days = val;
this.SimilarList = val;
},
immediate: true,
deep: true,
......@@ -1027,7 +1021,7 @@ export default {
},
mounted() {
window.addEventListener("scroll", this.handleScroll);
this.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
this.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
......@@ -1518,7 +1512,7 @@ export default {
setTimeout(() => {
this.navs.forEach((x) => {
x.top =
this.$refs[x.val].getBoundingClientRect().top + this.currentHeight - 150;
this.$refs[x.val].getBoundingClientRect().top + this.currentHeight - 140;
});
this.priceListHeight =
this.$refs.pricelist.getBoundingClientRect().top +
......@@ -1530,11 +1524,7 @@ export default {
});
} else {
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
});
this.$message.error(res.data.message);
}
},
......@@ -1550,9 +1540,7 @@ export default {
(res) => {
this.$q.loading.hide();
if (res.data.resultCode == 1) {
if (
Object.prototype.toString.call(res.data.data.roomRateDetails) ==
"[object Object]"
if (Object.prototype.toString.call(res.data.data.roomRateDetails) =="[object Object]"
) {
this.SimilarList.push(res.data.data.roomRateDetails);
} else {
......@@ -1587,15 +1575,10 @@ export default {
}
});
this.JapanIncrease = res.data.data.JapanIncrease;
this.$nextTick(()=>{
window.addEventListener("scroll", this.handleScroll);
})
} else {
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
});
this.SimilarList = []
this.$message.error(res.data.message=='No results match your search.'?'當前入住日期未報價,請選擇其他日期看看吧':res.data.message)
}
},
......
src/pages/detailsCar.vue
View file @ 85770ff5
......@@ -29,7 +29,7 @@
class="col product-price text-subtitle1 text-weight-bold"
style="text-align: left"
>
<span v-if="dataList&&dataList.MinPrice">{{dataList.CurrencyCode}} {{ moneyFormat(dataList.MinPrice, 0) }}</span>
<span v-if="priceList.length>0&&priceList[0].originalB2CPrice">CNY {{ moneyFormat(priceList[0].originalB2CPrice, 0) }}</span>
<span class="q-ml-sm f12 text-grey-7">起</span>
</span>
<q-btn
......@@ -151,12 +151,6 @@
square
icon="iconfont icontime"
:label="`包車時長：${dataList.TravelHours} h`" />
<q-chip
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconnetwork-fill"
label="日本語/中文 導覽"
/>
<q-chip
class="transparent q-mr-xl no-padding"
square
......@@ -174,9 +168,8 @@
$q.platform.is.mobile,
}"
>
<div class="product-price text-h6" v-if="dataList.MinPrice > 0">
<!-- CNY：{{ dataList. }} -->
{{dataList.CurrencyCode}}：{{ moneyFormat(dataList.MinPrice, 0) }}
<div class="product-price text-h6" v-if="priceList.length>0&&priceList[0].originalB2CPrice > 0">
CNY：{{ moneyFormat(priceList[0].originalB2CPrice, 0) }}
<span class="f12 text-grey-6">起</span>
</div>
<div v-else class="text-subtitle1 text-grey-6">暫無報價</div>
......@@ -317,7 +310,7 @@
<div class="" v-if="$q.platform.is.desktop">
<div class="row items-center">
<span class="product-price text-h6 q-mr-md"
>{{dataList.CurrencyCode}}
>CNY
{{
moneyFormat(priceList[0].originalB2CPrice, 0)
}}</span
......
src/pages/line/orderPreview.vue
View file @ 85770ff5
......@@ -713,7 +713,7 @@ export default {
BrandId: 0,
TradeWay: 0,
PlatformOrder: "",
GuestNum: this.chosenObj.crCount + this.chosenObj.etCount,
GuestNum: this.chosenObj.crCount + this.chosenObj.etCount +this.chosenObj+yeCount,
IsChildrenTour: this.price.isSupportChildren,
IsBirdDiscount: 2,
PredictRoomNum:
......
src/pages/usercenter/order.vue
View file @ 85770ff5
<style lang="scss" scoped>
</style>
<template>
<div :class="$q.platform.is.desktop ? 'q-ma-lg content': 'full-width'" style="min-height:80vh">
<div :class="$q.platform.is.desktop ? 'q-ma-lg col': 'full-width'" style="min-height:80vh">
<div class="" :class="{'row items-center':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<div :class="{'row items-center':$q.platform.is.mobile}">
<q-btn-dropdown color="dark" flat dense :label="`訂單狀態：${orderStatusFiled}`" class="q-px-md" :class="{'col':$q.platform.is.mobile}">
......@@ -53,7 +53,7 @@
<div class="text-grey-6 q-mt-sm">下單日期：{{ item.createTimeStr }}</div>
</div>
<div class="q-mt-sm" :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<div class="row col">
<div class="row col full-width">
<q-img
:src="item.goodsPic"
class="rounded-borders q-mr-md"
......
src/router/routes.js
View file @ 85770ff5
......@@ -58,7 +58,7 @@ const routes = [{
path: '/detailHotal/:id/:b2CPrice',
meta: { title: '酒店' },
component: () =>
import ('pages/detailsHotal.vue')
import ('pages/detailHotal.vue')
}, { // 酒店下单
path: '/HotalForm/:id',
component: () =>
......
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