Skip to content

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

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

parents 5e8336a8 636b5b98
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 115 deletions
src/components/searchdata/kkday.vue
View file @ 1b005a83
...@@ -410,10 +410,12 @@ export default { ...@@ -410,10 +410,12 @@ export default {
console.log("handleSelected", target); console.log("handleSelected", target);
}, },
handleTicked(target) { handleTicked(target) {
this.msg.pageIndex = 1
this.ticked = target; this.ticked = target;
this.goSearchHandler(); this.goSearchHandler();
}, },
handleAreaTicked(target) { handleAreaTicked(target) {
this.msg.pageIndex = 1
this.areaTicked = target; this.areaTicked = target;
console.log("this.areaTicked", target); console.log("this.areaTicked", target);
this.msg.placeIds = this.getChoseAddressCity().join(","); this.msg.placeIds = this.getChoseAddressCity().join(",");
...@@ -517,6 +519,7 @@ export default { ...@@ -517,6 +519,7 @@ export default {
} }
}); });
this.msg.dayNumList = arr; this.msg.dayNumList = arr;
this.msg.pageIndex = 1
this.goSearchHandler(); this.goSearchHandler();
}, },
optionsFn(cd) { optionsFn(cd) {
...@@ -529,12 +532,14 @@ export default { ...@@ -529,12 +532,14 @@ export default {
this.$forceUpdate(); this.$forceUpdate();
this.msg.minPrice = e.min; this.msg.minPrice = e.min;
this.msg.maxPrice = e.max; this.msg.maxPrice = e.max;
this.msg.pageIndex = 1
this.goSearchHandler(); this.goSearchHandler();
}, },
dateRangeHandler(e) { dateRangeHandler(e) {
this.msg.startDate = `${e.from.year}/${e.from.month}/${e.from.day}`; this.msg.startDate = `${e.from.year}/${e.from.month}/${e.from.day}`;
this.msg.endDate = `${e.to.year}/${e.to.month}/${e.to.day} `; this.msg.endDate = `${e.to.year}/${e.to.month}/${e.to.day} `;
this.$refs.qDateProxy.hide(); this.$refs.qDateProxy.hide();
this.msg.pageIndex = 1
this.goSearchHandler(); this.goSearchHandler();
}, },
initGoods() { initGoods() {
......
src/pages/ScenicSpotTicket/orderForm.vue
View file @ 1b005a83
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
{ {
SurName: this.parameters.Name?this.parameters.Name:this.userInfo.Surname+this.userInfo.Name, SurName: this.parameters.Name?this.parameters.Name:this.userInfo.Surname+this.userInfo.Name,
Name: '', Name: '',
ContactNumber: this.userInfo.Mobile,// 联系电话 ContactNumber: this.parameters.Mobile?this.parameters.Mobile:this.userInfo.Mobile,// 联系电话
Mailbox: this.userInfo.Mailbox,//邮箱 Mailbox: this.userInfo.Mailbox,//邮箱
GoodsId: this.parameters.CouponsId,//商品id GoodsId: this.parameters.CouponsId,//商品id
GoodsName: this.details.Name,//商品名称 GoodsName: this.details.Name,//商品名称
......
src/pages/hotel/orderForm.vue
View file @ 1b005a83
...@@ -909,9 +909,7 @@ export default { ...@@ -909,9 +909,7 @@ export default {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.userInfo = r.data.data; this.userInfo = r.data.data;
if(r.data.data.Moblie){ if(r.data.data.Moblie){
if(this.parameters.MailingState!=4){ this.parameters.guestEmail = r.data.data.Moblie
this.parameters.Mobile = r.data.data.Moblie
}
this.userInfo.Mobile = r.data.data.Moblie this.userInfo.Mobile = r.data.data.Moblie
} }
} else { } else {
......
src/pages/line/orderPreview.vue
View file @ 1b005a83
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
</div> </div>
</div> </div>
<div class="q-mt-md text-grey-6"> <div class="q-mt-md text-grey-6">
<div class="row"> <div class="row" v-if="(unionCity&&unionCity.cityName)||(trip&&trip.startCityName)">
<div style="width: 80px">出發城市：</div> <div style="width: 80px">出發城市：</div>
<div class="q-ml-md"> <div class="q-ml-md">
{{ unionCity ? unionCity.cityName : trip.startCityName }}起止 {{ unionCity ? unionCity.cityName : trip.startCityName }}起止
......
src/pages/usercenter/order/groupPriceDetail.vue
View file @ 1b005a83
...@@ -3,79 +3,131 @@ ...@@ -3,79 +3,131 @@
</style> </style>
<template> <template>
<div> <div>
<div <div
class="rounded-borders bg-white q-py-md" class="rounded-borders bg-white q-py-md"
style="width: 300px" style="width: 300px"
:style="{ :style="{
width: width:
$q.screen.width < 1200 || $q.platform.is.mobile $q.platform.is.mobile
? 'unset' ? 'unset'
: '300px', : '300px',
position:$q.platform.is.mobile?'unset':'sticky', position: $q.platform.is.mobile ? 'unset' : 'sticky',
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-grey-9">
<!-- <div class="q-mt-md text-grey-6"> <div class="row q-mb-sm" v-if="chosenObj.ManNum > 0">
<div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name"> <div class="col">成人佔床 x {{ chosenObj.ManNum }}</div>
<div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div> <div>CNY {{ moneyFormat(price.B2CMemberPrice, 2) }}</div>
<div class="q-ml-md ellipsis-2-lines">{{AirportObj.Name}}</div> </div>
</div> <div class="row q-mb-sm" v-if="chosenObj.ChirdNeedBedNum > 0">
<div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name"> <div class="col">兒童佔床 x {{ chosenObj.ChirdNeedBedNum }}</div>
<div style="width: 80px">{{details.CarType==1?'抵達':'起飛'}}時間：</div> <div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.FlightTime}}</div> CNY
</div> {{
<div class="row q-pb-xs no-wrap" v-if="parameters.GetonAddress"> moneyFormat(price.B2CMemberPrice + price.ChildNeedPrice, 2)
<div style="width: 80px">上車點：</div> }}
<div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div> </div>
</div> </div>
<div class="row q-pb-xs no-wrap" v-if="parameters.GetoffAddress"> <div class="row q-mb-sm" v-if="chosenObj.ChirdNum - chosenObj.ChirdNeedBedNum > 0">
<div style="width: 80px">下車點：</div> <div class="col">兒童不佔床 x {{ chosenObj.ChirdNum - chosenObj.ChirdNeedBedNum }}</div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div> <div>
</div> CNY
<div class="row"> {{
<div style="width: 80px"> moneyFormat(
接駁日期：</div> price.B2CMemberPrice - price.ChildNoNeedPrice,
<div class="q-ml-md"> 2
{{parameters.OrderDate}} )
</div> }}
</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>
<div class="text-grey-5" v-else>暫無優惠</div> <div class="row q-mb-sm" v-if="chosenObj.BabyNum > 0">
<div class="col">嬰兒不佔床 x {{ chosenObj.BabyNum }}</div>
<div>CNY {{ moneyFormat(price.BabyPrice, 2) }}</div>
</div>
<div v-if="price.safeMoney > 0">
<div class="row q-mb-sm" v-if="price.safeMoney > 0">
<div class="col">保險費 x {{ price.safeMoney }}/人</div>
<div>
CNY
{{
moneyFormat(
price.safeMoney *
(chosenObj.ManNum +
chosenObj.ChirdNum +
chosenObj.BabyNum),
2
)
}}
</div>
</div>
</div>
<div v-if="price.VisaPrice > 0 || price.OtherPrice > 0">
<div class="row q-mb-sm" v-if="price.VisaPrice > 0">
<div class="col">簽證費 x {{ price.VisaPrice }}/人</div>
<div>
CNY
{{
moneyFormat(
price.VisaPrice *
(chosenObj.ManNum +
chosenObj.ChirdNum +
chosenObj.BabyNum),
2
)
}}
</div>
</div>
<div class="row q-mb-sm" v-if="price.OtherPrice > 0">
<div class="col">雜費 x {{ price.OtherPrice }}/人</div>
<div>
CNY
{{
moneyFormat(
price.OtherPrice *
(chosenObj.ManNum +
chosenObj.ChirdNum +
chosenObj.BabyNum),
2
)
}}
</div>
</div>
</div>
<div class="row q-mb-sm" v-if="chosenObj.ChirdNum > 0">
<div class="col">兒童附加費 x {{ chosenObj.ChirdNum }}</div>
<div>CNY {{ moneyFormat(price.BabyChargePrice, 2) }}</div>
</div>
<div class="row q-mb-sm" v-if="chosenObj.SingleRoomNum > 0">
<div class="col">單房差價 x {{ chosenObj.SingleRoomNum }}</div>
<div>CNY {{ moneyFormat(price.SingleRoomPrice, 2) }}</div>
</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>
<div class="row q-mb-sm items-center">
<div class="col">優惠金額</div>
<div
class="text-subtitle2 text-weight-bolder text-teal"
v-if="price.discountPrice > 0"
>
CNY - {{ moneyFormat(price.discountPrice, 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(sumPrice - price.discountPrice, 2) }}
</div>
</div> -->
</div> </div>
<!-- <hr style="border:none;" class="bg-transparent q-mb-sm" /> </div>
<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> </div>
</template> </template>
<script> <script>
...@@ -88,50 +140,26 @@ export default { ...@@ -88,50 +140,26 @@ export default {
}, },
data() { data() {
return { return {
details: null, chosenObj: {},
sumPrice: 0,//总金额 price: {},
DiscountsMoney: 0,//优惠金额 sumPrice: 0,
Money: 0, // 支付金額
} }
}, },
mounted() { mounted() {
this.getGroupData() this.getOrder()
this.getCarOrder()
}, },
methods: { methods: {
// 获取团的详情 getOrder() {
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.$q.loading.show();
this.apipost( this.apipost(
"CarSingle_post_GetTYMyCarOrderInfo", "sellorder_post_GetOrderEntity",
{ OrderId: this.orderInfo.ErpOrderId }, { ID: this.orderInfo.ErpOrderId },
(r) => { (r) => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.dataList = r.data.data; this.chosenObj = r.data.data.model;
this.Money = r.data.data.Money; this.price = r.data.data.modelPrice;
this.calcMoney()
} else { } else {
this.$q.notify({ this.$q.notify({
type: "negative", type: "negative",
...@@ -146,11 +174,38 @@ export default { ...@@ -146,11 +174,38 @@ export default {
); );
}, },
emitAddress() {
const {PlaceList} = this.dataList calcMoney() {
PlaceList.findItem(item => item.id === this.id) let money = this.price.B2CMemberPrice * this.chosenObj.ManNum;
this.$emit('address', this.dataList) console.log('money1', money, this.price.B2CMemberPrice * this.chosenObj.ManNum)
} money +=
(this.price.B2CMemberPrice -
this.price.ChildNoNeedPrice +
this.price.BabyChargePrice) *(this.chosenObj.ChirdNum - this.chosenObj.ChirdNeedBedNum);
console.log('money2', money, (this.price.B2CMemberPrice -
this.price.ChildNoNeedPrice +
this.price.BabyChargePrice) *(this.chosenObj.ChirdNum - this.chosenObj.ChirdNeedBedNum))
money +=
(this.price.B2CMemberPrice +
this.price.ChildNeedPrice +
this.price.BabyChargePrice) *(this.chosenObj.ChirdNum - this.chosenObj.ChirdNeedBedNum)
console.log('money3', money, (this.price.B2CMemberPrice +
this.price.ChildNeedPrice +
this.price.BabyChargePrice) *(this.chosenObj.ChirdNum - this.chosenObj.ChirdNeedBedNum))
money += this.price.BabyPrice * this.chosenObj.BabyNum;
console.log('money4', money, this.price.BabyPrice * this.chosenObj.BabyNum)
money += this.price.SingleRoomPrice * this.chosenObj.SingleRoomNum;
console.log('money5', money, this.price.SingleRoomPrice * this.chosenObj.SingleRoomNum)
let sumCount = this.chosenObj.ManNum + this.chosenObj.ChirdNum;
money += (this.price.VisaPrice||0) * sumCount;
console.log('money6', money, (this.price.VisaPrice||0) * sumCount)
money += (this.price.safeMoney||0) * sumCount;
console.log('money7', money, (this.price.safeMoney||0) * sumCount)
money += (this.price.OtherPrice||0) * sumCount;
console.log('money8', money, (this.price.OtherPrice||0) * sumCount)
this.sumPrice = money;
},
} }
} }
</script> </script>
\ No newline at end of file
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