Skip to content

M
million
Commit 7c2d7e45 authored by 罗超's avatar 罗超
Browse files
Options

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

parents b181a58a ebea6448
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 122 deletions
src/components/car/Map.vue
View file @ 7c2d7e45
......@@ -115,73 +115,6 @@
var local = new BMapGL.LocalSearch(this.map, {renderOptions: {map: this.map, autoViewport: false}});
local.searchNearby(this.keywords,mPoint,this.center.Range);
},
// 根据地图缩放比例获取当前地图比例尺
getMapScale(zoom){
let scale = 0;
switch (zoom) {
case 1:
scale = 10000000;
break;
case 2:
scale = 5000000;
break;
case 3:
scale = 2000000;
break;
case 4:
scale = 1000000;
break;
case 5:
scale = 500000;
break;
case 6:
scale = 200000;
break;
case 7:
scale = 100000;
break;
case 8:
scale = 50000;
break;
case 9:
scale = 25000;
break;
case 10:
scale = 20000;
break;
case 11:
scale = 10000;
break;
case 12:
scale = 5000;
break;
case 13:
scale = 2000;
break;
case 14:
scale = 1000;
break;
case 15:
scale = 500;
break;
case 16:
scale = 200;
break;
case 17:
scale = 100;
break;
case 18:
scale = 50;
break;
case 19:
scale = 20;
break;
default:
scale = 0;
break;
}
return scale;
},
},
}
......
src/components/hotal/RoomCard.vue
View file @ 7c2d7e45
......@@ -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/pages/Pickuporder/orderForm.vue
View file @ 7c2d7e45
......@@ -158,11 +158,12 @@
v-model="parameters.ContactWay"
label="联络方式"
placeholder="例：WeChat"
:rules="[(val) => !!val || '請輸联络方式']"
ref="ContactWay"
mask="X"
reverse-fill-mask
>
<!-- :rules="[(val) => !!val || '請輸联络方式']" -->
</q-input>
</div>
<div :class="filedGuestWidth">
......@@ -486,19 +487,19 @@
</div>
<div class="q-mt-md text-grey-6">
<div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name">
<div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div>
<div style="width: 80px;flex-shrink: 0;">{{details.CarType==1?'接':'送'}}機機場：</div>
<div class="q-ml-md ellipsis-2-lines">{{AirportObj.Name}}</div>
</div>
<div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name">
<div style="width: 80px">{{details.CarType==1?'抵達':'起飛'}}時間：</div>
<div style="width: 80px;flex-shrink: 0;">{{details.CarType==1?'抵達':'起飛'}}時間：</div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.FlightTime}}</div>
</div>
<div class="row q-pb-xs no-wrap" v-if="parameters.GetonAddress">
<div style="width: 80px">上車點：</div>
<div style="width: 80px;flex-shrink: 0;">上車點：</div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div>
</div>
<div class="row q-pb-xs no-wrap" v-if="parameters.GetoffAddress">
<div style="width: 80px">下車點：</div>
<div style="width: 80px;flex-shrink: 0;">下車點：</div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div>
</div>
<div class="row">
......@@ -778,7 +779,7 @@ export default {
this.$refs.SurName.validate()
this.$refs.Name.validate()
this.$refs.ContactWay.validate()
// this.$refs.ContactWay.validate()
this.$refs.Mobile.validate()
this.$refs.OrderDate.validate()
this.$refs.ManNum.validate()
......
src/pages/ScenicSpotTicket/details.vue
View file @ 7c2d7e45
......@@ -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/ScenicSpotTicket/orderForm.vue
View file @ 7c2d7e45
......@@ -568,7 +568,7 @@
this.apipost(
"AddOrderInfo_post",
{
SurName: this.parameters.Name?this.parameters.Name:this.userInfo.FullName,
SurName: this.parameters.Name?this.parameters.Name:this.userInfo.Surname+this.userInfo.Name,
Name: '',
ContactNumber: this.userInfo.Mobile,// 联系电话
Mailbox: this.userInfo.Mailbox,//邮箱
......
src/pages/detailHotal.vue
View file @ 7c2d7e45
......@@ -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,
......@@ -1021,9 +1015,7 @@ export default {
this.detaMsg.hotelId = decodeURIComponent(this.$route.params.id)
this.msg.hotelId = decodeURIComponent(this.$route.params.id)
}
if(this.$route.params.b2CPrice){
this.MinPrice = this.$route.params.b2CPrice
}
},
mounted() {
......@@ -1095,11 +1087,15 @@ export default {
},
// 日期筛选
dateRangeHandler(e) {
this.msg.arrivalDate = `${e.from.year}-${e.from.month}-${e.from.day}`
this.msg.departureDate = `${e.to.year}-${e.to.month}-${e.to.day} `
let arrivalDate = `${e.from.year}-${e.from.month}-${e.from.day}`
let departureDate = `${e.to.year}-${e.to.month}-${e.to.day} `
let liveNvm = this.dateDiffer(arrivalDate,departureDate)
if(liveNvm>9||liveNvm==0) return this.$message.error(`住宿时间最多九晚,至少一晚`)
this.liveNvm = liveNvm
this.msg.arrivalDate = arrivalDate
this.msg.departureDate = departureDate
this.dateRangeFormat = `${this.msg.arrivalDate} - ${this.msg.departureDate} `
if (this.$refs.qDateProxy) this.$refs.qDateProxy.hide()
this.liveNvm = this.dateDiffer(this.msg.arrivalDate,this.msg.departureDate)
if(this.$q.platform.is.mobile){
this.getData()
}
......@@ -1518,7 +1514,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 +1526,7 @@ export default {
});
} else {
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
});
this.$message.error(res.data.message);
}
},
......@@ -1550,14 +1542,14 @@ 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 {
this.SimilarList = res.data.data.roomRateDetails;
}
console.log(this.SimilarList[0].roomOptions)
let arrList = function(arr){
arr.forEach(item=>{
item.images=[]
......@@ -1585,21 +1577,30 @@ export default {
arr.push(x.roomOptions);
x.roomOptions = arr;
}
});
this.JapanIncrease = res.data.data.JapanIncrease;
if(this.SimilarList.length>0&&this.SimilarList[0].roomOptions.length>0){
this.MinPrice = this.getPrice2(this.SimilarList[0].roomOptions[0].chargeableRateInfoPerPersonForANightBySetCurrency)
}else{
if(this.$route.params.b2CPrice){
this.MinPrice = this.$route.params.b2CPrice
}
}
} 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)
}
},
null
);
},
getPrice2(price){
if(this.JapanIncrease)
return Math.ceil(price / this.JapanIncrease)
},
menu() {
this.scroll =
......
src/pages/detailsCar.vue
View file @ 7c2d7e45
......@@ -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
......
src/pages/hotel/orderForm.vue
View file @ 7c2d7e45
......@@ -777,11 +777,12 @@ export default {
})
},
AddOrderInfo(ErpOrderId){
let Name = this.parameters.guestLastName+this.parameters.guestFirstName
this.apipost(
"AddOrderInfo_post",
{
SurName: this.parameters.Name?this.parameters.Name:this.userInfo.FullName,
Name: '',
SurName: this.parameters.guestLastName?this.parameters.guestLastName:this.userInfo.Surname,
Name: this.parameters.guestFirstName?this.parameters.guestFirstName:this.userInfo.Name,
ContactNumber: this.userInfo.Mobile,// 联系电话
Mailbox: this.userInfo.Mailbox,//邮箱
GoodsId: this.parameters.hotelId,//商品id
......
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