Skip to content

M
million
Commit 1b553dc2 authored by 罗超's avatar 罗超
Browse files
Options

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

parents e18ee443 3f0e3452
Show whitespace changes
Inline Side-by-side
Showing with 963 additions and 68 deletions
package.json
View file @ 1b553dc2
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"qrcode.vue": "^1.7.0", "qrcode.vue": "^1.7.0",
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"quasar": "^1.22.5", "quasar": "1.22.5",
"swiper": "3.0.4", "swiper": "3.0.4",
"v-viewer": "^1.6.4", "v-viewer": "^1.6.4",
"vue-awesome-swiper": "^3.0.4", "vue-awesome-swiper": "^3.0.4",
......
src/assets/img/login-bg.jpg 0 → 100644
View file @ 1b553dc2
This diff is collapsed.
src/assets/img/login-bg.png deleted 100644 → 0
View file @ e18ee443
This diff is collapsed.
src/components/navs/city-category.vue
View file @ 1b553dc2
<<<<<<< HEAD
=======
>>>>>>> c020ad40be0c4ddc009c7e515bf5c6c1ac25638c
<style scoped> <style scoped>
.header-box { .header-box {
max-width: 1200px; max-width: 1200px;
......
src/pages/Pickuporder/orderForm.vue
View file @ 1b553dc2
...@@ -514,8 +514,8 @@ ...@@ -514,8 +514,8 @@
<q-separator color="grey-2" class="q-my-md"/> <q-separator color="grey-2" class="q-my-md"/>
<div class="text-grey-9"> <div class="text-grey-9">
<div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj"> <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
<div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div> <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }} 辆</div>
<div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div> <div>CNY {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
</div> </div>
<hr <hr
style="border: none; border-top: 1px dashed #eee !important" style="border: none; border-top: 1px dashed #eee !important"
......
src/pages/hotel/orderForm.vue
View file @ 1b553dc2
...@@ -783,8 +783,8 @@ export default { ...@@ -783,8 +783,8 @@ export default {
{ {
SurName: this.parameters.guestLastName?this.parameters.guestLastName:this.userInfo.Surname, SurName: this.parameters.guestLastName?this.parameters.guestLastName:this.userInfo.Surname,
Name: this.parameters.guestFirstName?this.parameters.guestFirstName:this.userInfo.Name, Name: this.parameters.guestFirstName?this.parameters.guestFirstName:this.userInfo.Name,
ContactNumber: this.userInfo.Mobile,// 联系电话 ContactNumber: this.parameters.guestPhoneNumber?this.parameters.guestPhoneNumber:this.userInfo.Mobile,// 联系电话
Mailbox: this.userInfo.Mailbox,//邮箱 Mailbox: this.parameters.guestEmail?this.parameters.guestEmail:this.userInfo.Mailbox,//邮箱
GoodsId: this.parameters.hotelId,//商品id GoodsId: this.parameters.hotelId,//商品id
GoodsName: this.parameters.HotelName,//商品名称 GoodsName: this.parameters.HotelName,//商品名称
GoodsPic: this.parameters.HotelPic,//商品图片 GoodsPic: this.parameters.HotelPic,//商品图片
......
src/pages/login.vue
View file @ 1b553dc2
<style> <style>
.login { .login {
background: url("../assets/img/login-bg.png"); background: url("../assets/img/login-bg.jpg");
background-size: cover; background-size: cover;
width: 100%; width: 100%;
height: 100%; height: 100%;
......
src/pages/resetPassword.vue
View file @ 1b553dc2
<style> <style>
.login { .login {
background: url("../assets/img/login-bg.png"); background: url("../assets/img/login-bg.jpg");
background-size: cover; background-size: cover;
width: 100%; width: 100%;
height: 100%; height: 100%;
......
src/pages/usercenter/order/carMap.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div>
<div
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="assemblypoint"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
>
接送點範圍
</div>
<div
class="q-mt-lg trip-text rounded-borders q-mb-xl"
style="border: 1px dashed var(--q-color-warning)"
:class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
v-for="(x,index) in dataList.PlaceList">
<div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
<div class="text-weight-bold text-h6">地點名稱：{{x.Name}}</div>
<div class="text-grey-9">地址：{{x.Address}}</div>
</div>
<div class="q-pa-md" :class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<componentsMap :AddressObj="x"/>
</div>
</div>
<div
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="experiencelocation"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
>
機場地點
</div>
<div
class="q-mt-lg trip-text rounded-borders q-mb-xl"
style="border: 1px dashed var(--q-color-warning)"
:class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
v-for="(x,index) in dataList.AirportList">
<div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
<div class="text-weight-bold text-h6">地点名称：{{x.Name}}</div>
<div class="text-grey-9">地址：{{x.Address}}</div>
</div>
<div class="q-pa-md" :class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<componentsMap :AddressObj="x"/>
</div>
</div>
</div>
</template>
<script>
import componentsMap from "../../../components/car/Map.vue";
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
components: {componentsMap},
data() {
return {
dataList: [],
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
}
},
mounted() {
this.getCarData()
// this.getCarOrder()
},
methods: {
// 获取车的详情
getCarData() {
// this.$q.loading.show();
this.apipost(
"b2c_get_GetCarSingleProductDetail",
{ ProductId: this.orderInfo.GoodsId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
this.details = r.data.data;
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
// this.$q.loading.hide();
},
null
);
},
getCarOrder() {
this.$q.loading.show();
this.apipost(
"CarSingle_post_GetTYMyCarOrderInfo",
{ OrderId: this.orderInfo.ErpOrderId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
this.Money = r.data.data.Money;
const {DiscountsMoney,Money} = r.data.data;
this.Money = Money;
this.DiscountsMoney = DiscountsMoney
this.sumPrice = Money + DiscountsMoney
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
this.$q.loading.hide();
},
null
);
},
}
}
</script>
\ No newline at end of file
src/pages/usercenter/order/carPriceDetail.vue
View file @ 1b553dc2
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
</style> </style>
<template> <template>
<div>价格详情 <div>
<div <div
class="rounded-borders bg-white q-pa-md" class="rounded-borders bg-white q-py-md"
style="width: 300px" style="width: 300px"
:style="{ :style="{
width: width:
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
top:$q.platform.is.mobile?'unset':'50px', top:$q.platform.is.mobile?'unset':'50px',
}" }"
> >
<div class="text-subtitle1 text-weight-bolder">付款明細</div> <!-- <div class="text-subtitle1 text-weight-bolder">付款明細</div> -->
<!-- <div class="q-mt-md text-grey-6"> <!-- <div class="q-mt-md text-grey-6">
<div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name"> <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">{{details.CarType==1?'接':'送'}}機機場：</div>
...@@ -48,31 +48,31 @@ ...@@ -48,31 +48,31 @@
<div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div> <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
</div> --> </div> -->
<hr <hr
style="border: none; border-top: 1px dashed #eee !important" style="border: none;"
class="bg-transparent q-mb-sm" class="bg-transparent q-mb-sm"
/> />
<div class="row q-mb-sm items-center"> <div class="row q-mb-sm items-center">
<div class="col">總金額</div> <div class="q-mr-lg">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary"> <div class="text-subtitle2 text-weight-bolder">
CNY {{ moneyFormat(sumPrice, 2) }} CNY {{ moneyFormat(sumPrice, 2) }}
</div> </div>
</div> </div>
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <hr style="border:none;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center"> <div class="row q-mb-sm items-center">
<div class="col">優惠金額</div> <div class="q-mr-lg">優惠金額</div>
<div <div
class="text-subtitle2 text-weight-bolder text-teal" class="text-subtitle2 text-weight-bolder"
v-if="DiscountsMoney > 0" v-if="DiscountsMoney > 0"
> >
CNY - {{ moneyFormat(DiscountsMoney, 2) }} CNY - {{ moneyFormat(DiscountsMoney, 2) }}
</div> </div>
<div class="text-grey-5" v-else>暫無優惠</div> <div class="text-grey-5" v-else>暫無優惠</div>
</div> </div>
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <!-- <hr style="border:none;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center"> <div class="row q-mb-sm items-center">
<div class="col">支付金額</div> <div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div> <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
</div> </div> -->
</div> </div>
</div> </div>
...@@ -99,29 +99,6 @@ export default { ...@@ -99,29 +99,6 @@ export default {
this.getCarOrder() this.getCarOrder()
}, },
methods: { methods: {
// 获取团的详情
getGroupData() {
// this.$q.loading.show();
this.apipost(
"b2c_get_GetCarSingleProductDetail",
{ ProductId: this.orderInfo.GoodsId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
this.emitAddress()
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
// this.$q.loading.hide();
},
null
);
},
// 获取车的详情 // 获取车的详情
getCarData() { getCarData() {
// this.$q.loading.show(); // this.$q.loading.show();
...@@ -155,6 +132,10 @@ export default { ...@@ -155,6 +132,10 @@ export default {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.dataList = r.data.data; this.dataList = r.data.data;
this.Money = r.data.data.Money; this.Money = r.data.data.Money;
const {DiscountsMoney,Money} = r.data.data;
this.Money = Money;
this.DiscountsMoney = DiscountsMoney
this.sumPrice = Money + DiscountsMoney
} else { } else {
this.$q.notify({ this.$q.notify({
type: "negative", type: "negative",
...@@ -169,11 +150,6 @@ export default { ...@@ -169,11 +150,6 @@ export default {
); );
}, },
emitAddress() {
const {PlaceList} = this.dataList
PlaceList.findItem(item => item.id === this.id)
this.$emit('address', this.dataList)
}
} }
} }
</script> </script>
\ No newline at end of file
src/pages/usercenter/order/groupMap.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div></div>
</template>
<script>
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
data() {
return {
dataList: null,
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
}
},
mounted() {
this.getGroupData()
},
methods: {
getGroupData() {
this.$q.loading.show();
this.apipost(
"b2b_get_GetB2BTravelInfoV1",{ProductId: this.orderInfo.GoodsId},
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
if (this.dataList.dayList && this.dataList.dayList.length > 0) {
this.dataList.dayList.forEach((item) => {
item.slide = 0;
});
if (r.data.data.scenicList) {
r.data.data.scenicList.forEach((x) => {
if (x.cityName) {
this.citys.push(x.cityName);
}
});
}
}
this.dataList.imgCover = JSON.parse(this.dataList.imgCover);
this.dayList = this.dataList.dayList;
this.isShow = true;
this.isDirect = this.dataList.isDirect;
if (this.dataList.videoStr && this.dataList.videoStr != "") {
this.options.loop = false;
this.options.currentPage = 1;
this.$nextTick(() => {
setTimeout(() => {
let t = document.querySelectorAll(".slider-wrapper");
if (t.length > 0) {
let d = t[0].getBoundingClientRect();
this.videoPosition = d.top + d.height;
}
}, 1000);
});
}
this.$nextTick(() => {
if (this.dataList.feature.featureHtml != "") {
let tw =
parseFloat(
this.$refs.diyContext.getBoundingClientRect().width
) / 1123.0;
let divArr = document.querySelectorAll("#setZoom>div");
for (let i = 0; i < divArr.length; i++) {
let div = divArr[i];
if (this.$q.platform.is.mobile) {
div.style.zoom =
div.offsetWidth > 1000
? 0.999
: document.documentElement.clientWidth / 1123.0;
} else {
div.style.zoom = 1;
}
}
this.zoomDiyContext = tw > 1 ? 1 : tw.toFixed(2);
}
setTimeout(() => {
this.navs.forEach((x) => {
x.top =
this.$refs[x.val].getBoundingClientRect().top +
this.currentHeight -
60;
});
this.priceListHeight =
this.$refs.pricelist.getBoundingClientRect().top +
this.currentHeight -
60;
this.days = [];
this.dayList.forEach((x) => {
let dayListObj = {
val: "day" + x.dayNum,
top: 0,
isActive: false,
display: x.dayNum > 9 ? x.dayNum : "0" + x.dayNum,
};
this.days.push(dayListObj);
});
}, 1000);
try {
document
.querySelector("#scrollId .q-page-container")
.addEventListener("scroll", this.handleScrollDay);
} catch (error) {
// console.log(document.querySelector('#scrollId .q-page-container'))
// console.log('异常信息', error)
}
});
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
this.$q.loading.hide();
},
null
);
},
}
}
</script>
\ No newline at end of file
src/pages/usercenter/order/groupPriceDetail.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div>
<div
class="rounded-borders bg-white q-py-md"
style="width: 300px"
:style="{
width:
$q.screen.width < 1200 || $q.platform.is.mobile
? 'unset'
: '300px',
position:$q.platform.is.mobile?'unset':'sticky',
top:$q.platform.is.mobile?'unset':'50px',
}"
>
<!-- <div class="text-subtitle1 text-weight-bolder">付款明細</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 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 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 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 class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div>
</div>
<div class="row">
<div style="width: 80px">
接駁日期：</div>
<div class="q-ml-md">
{{parameters.OrderDate}}
</div>
</div>
</div>
<q-separator color="grey-2" class="q-my-md"/> -->
<div class="text-grey-9">
<!-- <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
<div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
<div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
</div> -->
<!-- <hr
style="border: none; border-top: 1px dashed #eee !important"
class="bg-transparent q-mb-sm"
/> -->
<div class="row q-mb-sm items-center">
<div class="q-mr-lg">總金額</div>
<div class="text-subtitle2 text-weight-bolder">
CNY {{ moneyFormat(sumPrice, 2) }}
</div>
</div>
<hr style="border:none;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center">
<div class="q-mr-lg">優惠金額</div>
<div
class="text-subtitle2 text-weight-bolder text-teal"
v-if="DiscountsMoney > 0"
>
CNY - {{ moneyFormat(DiscountsMoney, 2) }}
</div>
<div class="text-grey-5" v-else>暫無優惠</div>
</div>
<!-- <hr style="border:none;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center">
<div class="q-mr-lg">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
</div> -->
</div>
</div>
</div>
</template>
<script>
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
data() {
return {
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
}
},
mounted() {
this.getGroupData()
this.getCarOrder()
},
methods: {
// 获取团的详情
getGroupData() {
// this.$q.loading.show();
this.apipost(
"b2c_get_GetCarSingleProductDetail",
{ ProductId: this.orderInfo.GoodsId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
this.emitAddress()
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
// this.$q.loading.hide();
},
null
);
},
getCarOrder() {
this.$q.loading.show();
this.apipost(
"CarSingle_post_GetTYMyCarOrderInfo",
{ OrderId: this.orderInfo.ErpOrderId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
this.Money = r.data.data.Money;
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
this.$q.loading.hide();
},
null
);
},
emitAddress() {
const {PlaceList} = this.dataList
PlaceList.findItem(item => item.id === this.id)
this.$emit('address', this.dataList)
}
}
}
</script>
\ No newline at end of file
src/pages/usercenter/order/hotelMap.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div>
<div
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="assemblypoint"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
>
酒店地址
</div>
<div
class="q-mt-lg trip-text rounded-borders q-mb-xl"
style="border: 1px dashed var(--q-color-warning)"
:class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
<div class="text-weight-bold text-h6">酒店名稱：{{hotelSummary.hotelName}}</div>
<div class="text-grey-9">地址：{{`${hotelSummary.address}`}}</div>
</div>
<div class="q-pa-md" :class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}" v-for="(x,index) in travelLngLat" :key="index">
<componentsMap v-if="x.Lng&&x.Lat" :AddressObj="x"/>
<div v-else class="card text-center">经纬度未知</div>
</div>
</div></div>
</template>
<script>
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
data() {
return {hotelSummary: {},
travelLngLat: []
}
},
mounted() {
this.getData()
},
methods: {
// 获取详情
getData() {
this.$q.loading.show();
this.apipost(
"dmc_post_Get_GetJAPAN_HotelDetail",
{ ProductId: this.orderInfo.GoodsId },
(res) => {
this.$q.loading.hide();
if (res.data.resultCode == 1) {
this.hotelDetails = res.data.data.hotelDetails;
this.hotelSummary = res.data.data.hotelSummary;
this.roomReviewRating = Number(this.hotelDetails.roomReviewRating);
this.travelLngLat.push({
Lat: this.hotelSummary.latitudeW,
Lng: this.hotelSummary.longitudeW,
Address: this.hotelSummary.hotelName
});
} else {
this.$message.error(res.data.message);
}
},
null
);
},
}
}
</script>
\ No newline at end of file
src/pages/usercenter/order/hotelPriceDetail.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div>
<div class="row q-mb-sm items-center">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">
CNY {{ moneyFormat(sumPrice, 2) }}
</div>
</div>
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center" v-if="DiscountsMoney > 0">
<div class="col">優惠金額</div>
<div
class="text-subtitle2 text-weight-bolder text-teal"
v-if="DiscountsMoney > 0"
>
CNY - {{ moneyFormat(DiscountsMoney, 2) }}
</div>
<div class="text-grey-5" v-else>暫無優惠</div>
</div>
<div class="row q-mb-sm items-center">
<div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">
CNY {{ moneyFormat(Money, 2) }}
</div>
</div>
</div>
</template>
<script>
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
data() {
return {
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
}
},
mounted() {
this.getGroupData()
this.getCarOrder()
},
methods: {
// 获取团的详情
getGroupData() {
// this.$q.loading.show();
this.apipost(
"dmc_post_GetThirdHotelOrder",
{ ProductId: this.orderInfo.GoodsId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
const {DiscountsMoney,MailingState,Money} = r.data.data;
console.log('getTicket Data', r.data.data,DiscountsMoney,MailingState,Money)
// sumPrice: 0,//总金额
// DiscountsMoney: 0,//优惠金额
// Money: 0, // 支付金額
// MailingState: '',//邮寄状态 1自取 2邮寄
this.Money = Money;
this.DiscountsMoney = DiscountsMoney
this.MailingState = MailingState;
this.sumPrice = Money + DiscountsMoney
// this.sumPrice = this.moneyFormat(this.sumPrice, 2)
// this.Money = this.moneyFormat(this.Money, 2)
// this.DiscountsMoney = this.moneyFormat(this.DiscountsMoney, 2)
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
// this.$q.loading.hide();
},
null
);
},
}
}
</script>
\ No newline at end of file
src/pages/usercenter/order/orderDetail.vue
View file @ 1b553dc2
...@@ -16,19 +16,33 @@ ...@@ -16,19 +16,33 @@
</div> </div>
</div> </div>
<q-separator color="grey-2" class="q-my-md" /> <q-separator color="grey-2" class="q-my-md" />
<div v-if="detail.OrderNo">
<carPriceDetail v-if="[12,13,14].includes(detail.GoodsType)" :orderInfo="detail"></carPriceDetail>
<groupPriceDetail v-if="[1,2,3].includes(detail.GoodsType)" :orderInfo="detail"></groupPriceDetail>
<hotelPriceDetail v-if="[8,9,10,11].includes(detail.GoodsType)" :orderInfo="detail"></hotelPriceDetail>
<ticketPriceDetail v-if="[4,5,6,7].includes(detail.GoodsType)" :orderInfo="detail"></ticketPriceDetail>
</div>
<div class="row"> <div class="row">
<div class="text-subtitle1 col"> <div class="text-subtitle1 col">
<span>應付金額：</span> <span>應付金額：</span>
<span class="text-subtitle2">CNY</span> <span class="text-subtitle2">CNY</span>
<span class="q-ml-sm text-weight-bolder">{{ moneyFormat(detail.TotalPrice,2) }}</span> <span class="q-ml-sm text-weight-bolder">{{ moneyFormat(detail.TotalPrice,2) }}</span>
</div> </div>
<div class=""> <div class="row items-center">
<q-btn color="primary" outline dense class="q-mr-md q-px-md"> <q-btn color="primary" flat dense class="q-mr-md q-px-md">
<i class="iconfont iconmessage1"></i>联系客服</q-btn> <i class="iconfont iconmessage1"></i>联系客服</q-btn>
<q-btn color="primary" outline dense class="q-mr-md q-px-md"> <q-btn color="primary" dense flat class="q-mr-md q-px-md" @click="showCode = true">
<i class="iconfont iconiconfontscan"></i>扫码咨询</q-btn> <i class="iconfont iconiconfontscan"></i>扫码咨询</q-btn>
<q-btn color="primary" outline dense label="取消訂單" class="q-mr-md q-px-md"/> <!-- <q-btn color="primary" outline dense label="取消訂單" @click="cancalOrder" class="q-mr-md q-px-md"/>
<q-btn color="primary" unelevated dense label="前往付款" class="q-px-md"/> <q-btn color="primary" unelevated dense label="前往付款" @click="goPayOrder" class="q-px-md"/> -->
<div class="text-right" v-if="detail.OrderStatus==1">
<q-btn color="primary" dense outline class="q-px-sm" label="取消訂單" @click="cancalOrder(item.orderNo)" />
<q-btn color="primary" dense unelevated class="q-px-sm q-ml-sm" label="立即支付" @click="CommonJump('/pay/'+item.orderNo,{},'blank')" />
</div>
<div class="text-right" v-else>
<q-btn color="dark" dense flat class="q-px-sm" @click="CommonJump('/orderinfo/'+orderNo,{},'blank')" label="查看訂單" />
</div>
</div> </div>
</div> </div>
</q-card> </q-card>
...@@ -44,12 +58,12 @@ ...@@ -44,12 +58,12 @@
/> />
<div class="col"> <div class="col">
<div class="text-body1 ellipsis">{{detail.GoodsName}}</div> <div class="text-body1 ellipsis">{{detail.GoodsName}}</div>
<div class="q-mt-sm text-grey-6">2023-03-15從成都出發 成人x2; </div> <div class="q-mt-sm text-grey-6">{{detail.OrderMake}}</div>
<div class="q-mt-sm text-dark"> <!-- <div class="q-mt-sm text-dark">
出行日期：{{detail.SelectStartTime}}（本地时间） 出行日期：{{detail.SelectStartTime}}（本地时间）
</div> </div> -->
<div class="q-mt-sm text-grey-6"> <div class="q-mt-sm text-grey-6">
商品類型：{{detail.GoodsType}} 商品類型：{{goodTypeList[detail.GoodsType]}}
</div> </div>
</div> </div>
</div> </div>
...@@ -84,17 +98,13 @@ ...@@ -84,17 +98,13 @@
</div> </div>
</div> </div>
</q-card> </q-card>
<q-card class="rounded-borders q-pa-md q-mt-md" flat v-if="![1,2,3].includes(detail.GoodsType)">
<div v-if="detail.OrderNo">
<q-card class="rounded-borders q-pa-md q-mt-md" flat> <car-map v-if="[12,13,14].includes(detail.GoodsType)" :orderInfo="detail"></car-map>
<div class="text-subtitle1 text-weight-bolder">使用地点</div> <!-- <groupMap v-if="[1,2,3].includes(detail.GoodsType)" :orderInfo="detail"></groupMap> -->
<hotelMap v-if="[8,9,10,11].includes(detail.GoodsType)" :orderInfo="detail"></hotelMap>
<div class="q-pa-md" :class="{ <ticketMap v-if="[4,5,6,7].includes(detail.GoodsType)" :orderInfo="detail"></ticketMap>
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<componentsMap :AddressObj="detail"/>
</div> </div>
<carPriceDetail v-if="detail.OrderNo" :orderInfo="detail"></carPriceDetail>
</q-card> </q-card>
<div v-if="(!orderNo || orderNo == '') && !loading" class="text-center q-my-xl"> <div v-if="(!orderNo || orderNo == '') && !loading" class="text-center q-my-xl">
<none-data <none-data
...@@ -103,16 +113,29 @@ ...@@ -103,16 +113,29 @@
subtitle="趕緊去挑選心儀的旅遊產品吧,三秒後自動跳轉到首頁" subtitle="趕緊去挑選心儀的旅遊產品吧,三秒後自動跳轉到首頁"
></none-data> ></none-data>
</div> </div>
<q-dialog v-model="showCode">
<img src="../../../assets/img/kefu.png"/>
</q-dialog>
</div> </div>
</template> </template>
<script> <script>
import componentsMap from "../../../components/car/Map.vue"; import componentsMap from "../../../components/car/Map.vue";
import carPriceDetail from './carPriceDetail.vue' import carPriceDetail from './carPriceDetail.vue'
import groupPriceDetail from './groupPriceDetail.vue'
import hotelPriceDetail from './hotelPriceDetail.vue'
import ticketPriceDetail from './ticketPriceDetail.vue'
import carMap from './carMap.vue'
import groupMap from './groupMap.vue'
import hotelMap from './hotelMap.vue'
import ticketMap from './ticketMap.vue'
export default { export default {
components: {componentsMap, carPriceDetail}, components: {componentsMap, carPriceDetail,groupPriceDetail,hotelPriceDetail,ticketPriceDetail,carMap,groupMap,hotelMap,ticketMap},
// GoodsType: this.productType,//商品类型（见枚举） 12包车 13 接机 14送机
data() { data() {
return { return {
goodTypeList: ['','一日游','多日游','小包团','景点门票','主题乐园','博物馆','历史景点','温泉饭店','星级饭店','度假村','民宿','包车','接机','送机'],
showCode: false,
detail: {}, detail: {},
orderIcon: '', orderIcon: '',
iconColor: '', iconColor: '',
...@@ -130,6 +153,29 @@ mounted() { ...@@ -130,6 +153,29 @@ mounted() {
} }
}, },
methods: { methods: {
goPayOrder() {
this.CommonJump('/pay/' + this.orderNo)
},
cancalOrder() {
console.log(this.$q.dialog)
this.$q.dialog({
title: '取消確認',
message: '訂單取消後，系統將立即釋放位置，請問是否執行?',
cancel: true,
persistent: true
}).onOk(() => {
this.apipost('GetCancelOrder_post',{OrderNo: this.orderNo},r=>{
if(r.data.resultCode==1){
this.$message.success('訂單取消成功')
this.getOrderList()
}else{
this.$message.error('訂單取消失敗，請重新嘗試')
}
})
}).onCancel(() => {
// console.log('>>>> Cancel')
})
},
goHomeHandler(){ goHomeHandler(){
this.loading=false this.loading=false
setTimeout(() => { setTimeout(() => {
...@@ -147,7 +193,7 @@ methods: { ...@@ -147,7 +193,7 @@ methods: {
this.orderIcon = ["","icontime1","iconsuccess", "iconsuccess", "icontishi"][this.detail.OrderStatus] this.orderIcon = ["","icontime1","iconsuccess", "iconsuccess", "icontishi"][this.detail.OrderStatus]
this.iconColor = ["","blue","blue", "green", "grey"][this.detail.OrderStatus] this.iconColor = ["","blue","blue", "green", "grey"][this.detail.OrderStatus]
console.log('get detail', this.orderIcon, this.iconColor) console.log('get detail', this.orderIcon, this.iconColor)
this.orderNo=OrderNo this.orderNo=orderNo
this.orderInfo=r.data.data this.orderInfo=r.data.data
this.loading=false this.loading=false
} else { } else {
......
src/pages/usercenter/order/ticketMap.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div>
<div
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="assemblypoint"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
>
景區地址
</div>
<div
class="q-mt-lg trip-text rounded-borders q-mb-xl"
style="border: 1px dashed var(--q-color-warning)"
:class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
<div class="text-weight-bold text-h6">地點名稱：{{dataList.Name}}</div>
<div class="text-grey-9">地址：{{`${dataList.Address}`}}</div>
</div>
<div class="q-pa-md" :class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<componentsMap v-if="AddressObj.Lng&&AddressObj.Lat" :AddressObj="AddressObj"/>
<div v-else class="card text-center">经纬度未知</div>
</div>
</div></div>
</template>
<script>
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
data() {
return {
dataList: {},
AddressObj: {},
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
MailingMoney: 0, // 邮寄费
MailingState: '',//邮寄状态 1自取 2邮寄
}
},
mounted() {
this.getData()
// this.getOrder()
},
methods: {
// 获取商品详情
getData() {
this.$q.loading.show();
this.apipost(
"b2c_get_GetTicketCouponsDetail",
{ CouponsId: this.msg.configId },
(r) => {
if (r.data.resultCode == 1) {
let addList = function (arr) {
arr.forEach(item => {
item.checked = false
item.Count = 1
});
};
addList(r.data.data.TicketList);
this.dataList = r.data.data;
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.isShow = true;
if (this.dataList.videoStr && this.dataList.videoStr != "") {
this.options.loop = false;
this.options.currentPage = 1;
this.$nextTick(() => {
setTimeout(() => {
let t = document.querySelectorAll(".slider-wrapper");
if (t.length > 0) {
let d = t[0].getBoundingClientRect();
this.videoPosition = d.top + d.height;
}
}, 1000);
});
}
this.$nextTick(() => {
this.getCarPriceData()
setTimeout(() => {
this.navs.forEach((x) => {
x.top =
this.$refs[x.val].getBoundingClientRect().top + this.currentHeight - 60;
});
this.priceListHeight =
this.$refs.pricelist.getBoundingClientRect().top +
this.currentHeight -
60;
}, 1000);
try {
document
.querySelector("#scrollId .q-page-container")
.addEventListener("scroll", this.handleScrollDay);
} catch (error) {
// console.log(document.querySelector('#scrollId .q-page-container'))
// console.log('异常信息', error)
}
});
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
});
}
this.$q.loading.hide();
},
null
);
},
}
}
</script>
\ No newline at end of file
src/pages/usercenter/order/ticketPriceDetail.vue 0 → 100644
View file @ 1b553dc2
<style lang="scss" scoped>
</style>
<template>
<div>
<div
class="rounded-borders bg-white q-py-md"
style="width: 300px"
:style="{
width:$q.platform.is.mobile
? 'unset'
: '300px',
position:$q.platform.is.mobile?'unset':'sticky',
top:$q.platform.is.mobile?'unset':'50px',
}"
>
<!-- <div class="text-subtitle1 text-weight-bolder">付款明細</div> -->
<!-- <q-separator color="grey-2" class="q-my-md"/> -->
<!-- <hr
style="border: none; border-top: 1px dashed #eee !important"
class="bg-transparent q-mb-sm"
/> -->
<div class="row q-mb-sm items-center">
<div class="q-mr-lg">總金額</div>
<div class="text-subtitle2 text-weight-bolder">
CNY {{sumPrice }}
</div>
</div>
<hr style="border:none;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center" v-if="MailingState==2&&MailingMoney>0">
<div class="q-mr-lg">邮寄费</div>
<div
class="text-subtitle2 text-weight-bolder text-grey-6"
>
CNY {{ MailingMoney }}
</div>
</div>
<div class="row q-mb-sm items-center">
<div class="q-mr-lg">優惠金額</div>
<div
class="text-subtitle2 text-weight-bolder text-teal"
v-if="DiscountsMoney > 0"
>
CNY - {{ DiscountsMoney }}
</div>
<div class="text-grey-5" v-else>暫無優惠</div>
</div>
<!-- <div class="row q-mb-sm items-center">
<div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">
CNY {{ Money }}
</div>
</div> -->
</div>
</div>
</div>
</template>
<script>
export default {
props: {
orderInfo: {
type: Object,
default: () => ({})
}
},
data() {
return {
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
MailingMoney: 0, // 邮寄费
MailingState: '',//邮寄状态 1自取 2邮寄
}
},
mounted() {
this.getData()
this.getOrder()
},
methods: {
// 获取商品详情
getData() {
this.$q.loading.show();
this.apipost("b2c_get_GetTicketCouponsDetail",
{ CouponsId: this.orderInfo.GoodsId },
(r) => {
if (r.data.resultCode == 1) {
this.details = r.data.data;
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
this.$q.loading.hide();
},
null
);
},
getOrder() {
// http://dev.api.oytour.com/#/home/project/inside/api/detail?groupID=703&childGroupID=710&apiID=4256&projectName=REBORN&projectID=2
this.$q.loading.show();
this.apipost(
"ticket_post_GetSaleTicketOrderInfo",
{ OrderId: this.orderInfo.ErpOrderId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
const {DiscountsMoney,MailingMoney,MailingState,Money} = r.data.data;
console.log('getTicket Data', r.data.data,DiscountsMoney,MailingMoney,MailingState,Money)
// sumPrice: 0,//总金额
// DiscountsMoney: 0,//优惠金额
// Money: 0, // 支付金額
// MailingMoney: 0, // 邮寄费
// MailingState: '',//邮寄状态 1自取 2邮寄
this.Money = Money;
this.DiscountsMoney = DiscountsMoney
this.MailingMoney = MailingMoney;
this.MailingState = MailingState;
this.sumPrice = Money + MailingMoney + DiscountsMoney
this.sumPrice = this.moneyFormat(this.sumPrice, 2)
this.Money = this.moneyFormat(this.Money, 2)
this.DiscountsMoney = this.moneyFormat(this.DiscountsMoney, 2)
this.MailingMoney = this.moneyFormat(this.MailingMoney, 2)
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
this.$q.loading.hide();
},
null
);
},
emitAddress() {
const {PlaceList} = this.dataList
PlaceList.findItem(item => item.id === this.id)
this.$emit('address', this.dataList)
}
}
}
</script>
\ No newline at end of file
yarn.lock
View file @ 1b553dc2
...@@ -7644,7 +7644,7 @@ qs@~6.5.2: ...@@ -7644,7 +7644,7 @@ qs@~6.5.2:
resolved "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz" resolved "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz"
integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
quasar@^1.22.5: quasar@1.22.5:
version "1.22.5" version "1.22.5"
resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.22.5.tgz#7c33a02a5541b62b057f1d805b64cbcb59243152" resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.22.5.tgz#7c33a02a5541b62b057f1d805b64cbcb59243152"
integrity sha512-cb/Q1Nvx1Lo3i2Gq+7j6kN/DJzZrTPG6JJKus3WJ0YpqsiovoWchnbDrGkTyL8nCnj2Im4SAX50DF0Vbd6pK3w== integrity sha512-cb/Q1Nvx1Lo3i2Gq+7j6kN/DJzZrTPG6JJKus3WJ0YpqsiovoWchnbDrGkTyL8nCnj2Im4SAX50DF0Vbd6pK3w==
......
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