Skip to content

M
million
Commit a8cb8872 authored by youjie's avatar youjie
Browse files
Options

no message

parent 8abbed4f
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 62 deletions
src/components/car/orderPreview.vue
View file @ a8cb8872
...@@ -201,26 +201,13 @@ export default { ...@@ -201,26 +201,13 @@ export default {
methods: { methods: {
goOrderHandler(){ goOrderHandler(){
let order = { let order = {
key: null, CarId: this.selectedCarObj.Id,
CarObj: this.selectedCarObj, AirportId: this.selectedAirportObj?this.selectedAirportObj.Id:'',
AirportObj: { startDate: this.p.startDate,
Address: this.selectedAirportObj?this.selectedAirportObj.Address:'', originalB2CPrice: this.p.originalB2CPrice,
AirportId: this.selectedAirportObj?this.selectedAirportObj.AirportId:'', orderInfo: this.chosenObj,
AirportName: this.selectedAirportObj?this.selectedAirportObj.AirportName:'',
Id: this.selectedAirportObj?this.selectedAirportObj.Id:'',
Name: this.selectedAirportObj?this.selectedAirportObj.Name:''
},
calculationAmount: this.p,
calculationNum: this.chosenObj,
sumPrice: this.sumPrice, sumPrice: this.sumPrice,
details: { Id: this.dataList.Id,
Name: this.dataList.Name,
Description: this.dataList.Description,
videoStr: this.dataList.videoStr,
imgCover: this.dataList.imgCover,
CarType: this.dataList.CarType,
Id: this.dataList.Id,
},
onCarObj: { onCarObj: {
Address: this.onCarObj?this.onCarObj.Address:'', Address: this.onCarObj?this.onCarObj.Address:'',
Name: this.onCarObj?this.onCarObj.Name:'', Name: this.onCarObj?this.onCarObj.Name:'',
...@@ -237,8 +224,13 @@ export default { ...@@ -237,8 +224,13 @@ export default {
}, },
} }
let key = this.$md5(JSON.stringify(order)) let key = this.$md5(JSON.stringify(order))
order.key = key let pickuporderCars = localStorage.getItem('pickuporderCars')
localStorage.setItem("pickuporderCars",JSON.stringify(order)) pickuporderCars = pickuporderCars?JSON.parse(pickuporderCars):[]
pickuporderCars.push({
key,
order
})
localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars))
this.CommonJump('/PickuporderForm/'+key, {}); this.CommonJump('/PickuporderForm/'+key, {});
}, },
// 获取车的详情 // 获取车的详情
......
src/pages/Pickuporder/orderForm.vue
View file @ a8cb8872
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
/> />
<q-img <q-img
v-else v-else
:src="details?details.imgCover[0]:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'" :src="details?details.ImageList[0]:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'"
class="rounded-borders" class="rounded-borders"
spinner-color="grey-3" spinner-color="grey-3"
style="width: 80px" style="width: 80px"
...@@ -108,11 +108,11 @@ ...@@ -108,11 +108,11 @@
<div class="q-mt-md row"> <div class="q-mt-md row">
<div class="text-grey-9"> <div class="text-grey-9">
<q-icon name="iconfont iconrili" size="20px" class="q-mr-sm" /> <q-icon name="iconfont iconrili" size="20px" class="q-mr-sm" />
<span>{{calculationAmount.startDate}}</span> <span>{{OrderDate.startDate}}</span>
</div> </div>
<div class="text-grey-9 q-ml-md"> <div class="text-grey-9 q-ml-md" v-if="chosenObj.Count > 0&&CarObj">
<q-icon name="iconfont iconjiaotong" size="20px" class="q-mr-sm" /> <q-icon name="iconfont iconjiaotong" size="20px" class="q-mr-sm" />
<span class="q-mr-sm" v-if="chosenObj.Count > 0" <span class="q-mr-sm"
>{{CarObj.CarName}} x {{ chosenObj.Count }}辆 </span >{{CarObj.CarName}} x {{ chosenObj.Count }}辆 </span
> >
<span class="q-mr-sm" <span class="q-mr-sm"
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
/> />
<q-img <q-img
v-else v-else
:src="details?details.imgCover[0]:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'" :src="details?details.ImageList[0]:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'"
class="rounded-borders" class="rounded-borders"
spinner-color="grey-3" spinner-color="grey-3"
style="width: 80px" style="width: 80px"
...@@ -480,25 +480,24 @@ ...@@ -480,25 +480,24 @@
接駁日期：</div> 接駁日期：</div>
<div class="q-ml-md"> <div class="q-ml-md">
{{parameters.OrderDate}} {{parameters.OrderDate}}
<!-- {{calculationAmount.startDate}} -->
</div> </div>
</div> </div>
</div> </div>
<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"> <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>CNY {{ moneyFormat(sumPrice,2) }}</div> <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
</div> </div>
<!-- <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <!-- <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="(chosenObj.Count)>0"> <div class="row q-mb-sm items-center" v-if="(chosenObj.Count)>0">
<div class="col">總金額</div> <div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">CNY {{ moneyFormat(sumPrice,2) }}</div> <div class="text-subtitle2 text-weight-bolder text-primary">{{details.CurrencyCode}} {{ moneyFormat(OrderDate.sumPrice,2) }}</div>
</div> --> </div> -->
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <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="chosenObj.Count>0"> <div class="row q-mb-sm items-center" v-if="chosenObj.Count>0">
<div class="col">支付金額</div> <div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(sumPrice,2) }}</div> <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(OrderDate.sumPrice,2) }}</div>
</div> </div>
</div> </div>
<div class="text-right q-mt-md" v-if="step!=3"> <div class="text-right q-mt-md" v-if="step!=3">
...@@ -550,15 +549,20 @@ ...@@ -550,15 +549,20 @@
}, },
data() { data() {
return { return {
order: null,
orderKey: "", orderKey: "",
isRangeClick: true, isRangeClick: true,
isShowDialog: false, isShowDialog: false,
AddressObj: null, AddressObj: null,
onCarObj: null,//上车范围 onCarObj: null,//上车范围
unCarObj: null,//下车范围 unCarObj: null,//下车范围
onCarId: null,//上车范围
unCarId: null,//下车范围
CarObj: null,//车型 CarObj: null,//车型
AirportObj: null,//机场 AirportObj: null,//机场
calculationAmount: null,//日期 CarId: null,//车型
AirportId: null,//机场
startDate: null,
calculationNum: null,//数量 calculationNum: null,//数量
sumPrice: null,//总价 sumPrice: null,//总价
details: null,//产品详情 details: null,//产品详情
...@@ -640,39 +644,63 @@ ...@@ -640,39 +644,63 @@
}, },
created() {}, created() {},
mounted() { mounted() {
this.checkParamsHandler() if(this.checkParamsHandler()){
this.getCarData()
}
this.initCountry(); this.initCountry();
this.initGuestHandler(); this.initGuestHandler();
}, },
methods: { methods: {
// 获取商品详情
getCarData() {
this.$q.loading.show();
this.apipost(
"b2c_get_GetCarSingleProductDetail",
{ ProductId: this.parameters.ProductId },
(r) => {
this.$q.loading.hide();
if (r.data.resultCode == 1) {
this.details = r.data.data;
this.CarObj = this.details.CarTypeList.find((x) => this.OrderDate.CarId == x.Id);
if(this.details.CarType!=3){
this.AirportObj = this.details.AirportList.find((x) => this.OrderDate.AirportId == x.Id);
this.parameters.AirportId = this.OrderDate.AirportId
this.parameters.FlightTime = this.OrderDate.startDate
}
this.parameters.OrderType = this.details.CarType
} else {
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
null
);
},
checkParamsHandler() { checkParamsHandler() {
try { try {
if (this.$route.params && this.$route.params.id) { if (this.$route.params && this.$route.params.id) {
let key = this.$route.params.id; let key = this.$route.params.id;
console.log(key,'99999')
let pickuporderCars = localStorage.getItem("pickuporderCars"); let pickuporderCars = localStorage.getItem("pickuporderCars");
let OrderDate = pickuporderCars ? JSON.parse(pickuporderCars) : null; pickuporderCars = pickuporderCars ? JSON.parse(pickuporderCars) : [];
if (OrderDate) { if (pickuporderCars.length > 0) {
this.CarObj = OrderDate.CarObj,//车型 this.order = pickuporderCars.find((x) => x.key == key);
this.AirportObj = OrderDate.AirportObj,//机场 if (this.order) {
this.calculationAmount = OrderDate.calculationAmount,//日期
this.chosenObj = OrderDate.calculationNum,//数量
this.sumPrice = OrderDate.sumPrice,//总金额
this.details = OrderDate.details//产品详情
this.onCarObj = OrderDate.onCarObj//上车范围
this.unCarObj = OrderDate.unCarObj//下车范围
this.parameters.ProductId = this.details.Id
this.parameters.OrderDate = this.calculationAmount.startDate
if(this.details.CarType!=3){
this.parameters.AirportId = this.AirportObj.Id
this.parameters.FlightTime = this.calculationAmount.startDate
}
this.parameters.CarId = this.CarObj.Id
this.parameters.OrderType = this.details.CarType
this.parameters.Unit_Price = this.calculationAmount.originalB2CPrice
this.parameters.Num = this.chosenObj.Count
this.parameters.Money = this.sumPrice
if (OrderDate) {
this.orderKey = key; this.orderKey = key;
this.chosenObj = this.order.order.orderInfo;
this.OrderDate = this.order.order
this.parameters.ProductId = this.order.order.Id
this.parameters.OrderDate = this.OrderDate.startDate
this.parameters.Unit_Price = OrderDate.originalB2CPrice
this.parameters.Num = this.OrderDate.chosenObj.Count
this.parameters.Money = this.OrderDate.sumPrice
this.onCarObj = this.OrderDate.onCarObj//上车范围
this.unCarObj = this.OrderDate.unCarObj//下车范围
} }
} }
} }
...@@ -725,6 +753,7 @@ ...@@ -725,6 +753,7 @@
&& !this.$refs.GetonAddress.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError && !this.$refs.GetonAddress.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError
} }
if(!flag) return this.goScrollToForm('baseUserInfoTitle') if(!flag) return this.goScrollToForm('baseUserInfoTitle')
console.log(this.parameters,'------')
this.SetCarOrder() this.SetCarOrder()
}, },
goScrollToForm(formName){ goScrollToForm(formName){
...@@ -755,6 +784,15 @@ ...@@ -755,6 +784,15 @@
}) })
}, },
AddOrderInfo(ErpOrderId){ AddOrderInfo(ErpOrderId){
let GoodsType = null
//13接机 14送机 12包车
if(this.parameters.OrderType==1){
GoodsType = 13
}else if(this.parameters.OrderType==2){
GoodsType = 14
}else if(this.parameters.OrderType==3){
GoodsType = 12
}
this.apipost( this.apipost(
"AddOrderInfo_post", "AddOrderInfo_post",
{ {
...@@ -764,8 +802,8 @@ ...@@ -764,8 +802,8 @@
Mailbox: this.userInfo.mail,//邮箱 Mailbox: this.userInfo.mail,//邮箱
GoodsId: this.parameters.ProductId,//商品id GoodsId: this.parameters.ProductId,//商品id
GoodsName: this.details.Name,//商品名称 GoodsName: this.details.Name,//商品名称
GoodsPic: this.details.imgCover[0],//商品图片 GoodsPic: this.details.ImageList[0],//商品图片
GoodsType: this.parameters.OrderType,//商品类型（见枚举） GoodsType: GoodsType,//商品类型（见枚举） 12包车 13 接机 14送机
OrderMake: this.parameters.OrderDate,//订单摘要（例如出行时间） OrderMake: this.parameters.OrderDate,//订单摘要（例如出行时间）
TotalPrice: this.parameters.Money,//总价格 TotalPrice: this.parameters.Money,//总价格
PreferentialPrice: 0,// 优惠总金额 PreferentialPrice: 0,// 优惠总金额
...@@ -779,6 +817,13 @@ ...@@ -779,6 +817,13 @@
(r) => { (r) => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.step = 3 this.step = 3
this.$q.notify({
color: "green-4",
textColor: "white",
icon: "cloud_done",
message: "訂單提交成功",
position:'center',
});
}else{ }else{
this.$q.notify({ this.$q.notify({
type: "negative", type: "negative",
...@@ -795,10 +840,10 @@ ...@@ -795,10 +840,10 @@
// 1航班时间 2预约时间 // 1航班时间 2预约时间
this.onoffbus = type this.onoffbus = type
if(type==1){ if(type==1){
this.parameters.FlightTime = this.calculationAmount.startDate+' '+this.flightTime this.parameters.FlightTime = this.OrderDate.startDate+' '+this.flightTime
this.$refs.qDateProxy1.hide() this.$refs.qDateProxy1.hide()
}else if(type==2){ }else if(type==2){
this.parameters.OrderDate = this.calculationAmount.startDate+' '+this.getBusTime this.parameters.OrderDate = this.OrderDate.startDate+' '+this.getBusTime
this.$refs.qDateProxy2.hide() this.$refs.qDateProxy2.hide()
} }
......
src/pages/detailsCar.vue
View file @ a8cb8872
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
class="col product-price text-subtitle1 text-weight-bold" class="col product-price text-subtitle1 text-weight-bold"
style="text-align: left" style="text-align: left"
> >
<span v-if="dataList&&dataList.MinPrice">CNY {{ moneyFormat(dataList.MinPrice, 0) }}</span> <span v-if="dataList&&dataList.MinPrice">{{dataList.CurrencyCode}} {{ moneyFormat(dataList.MinPrice, 0) }}</span>
<span class="q-ml-sm f12 text-grey-7">起</span> <span class="q-ml-sm f12 text-grey-7">起</span>
</span> </span>
<q-btn <q-btn
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
> >
<div class="product-price text-h6" v-if="dataList.MinPrice > 0"> <div class="product-price text-h6" v-if="dataList.MinPrice > 0">
<!-- CNY：{{ dataList. }} --> <!-- CNY：{{ dataList. }} -->
CNY：{{ moneyFormat(dataList.MinPrice, 0) }} {{dataList.CurrencyCode}}：{{ moneyFormat(dataList.MinPrice, 0) }}
<span class="f12 text-grey-6">起</span> <span class="f12 text-grey-6">起</span>
</div> </div>
<div v-else class="text-subtitle1 text-grey-6">暫無報價</div> <div v-else class="text-subtitle1 text-grey-6">暫無報價</div>
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
<div class="" v-if="$q.platform.is.desktop"> <div class="" v-if="$q.platform.is.desktop">
<div class="row items-center"> <div class="row items-center">
<span class="product-price text-h6 q-mr-md" <span class="product-price text-h6 q-mr-md"
>CNY >{{dataList.CurrencyCode}}
{{ {{
moneyFormat(priceList[0].originalB2CPrice, 0) moneyFormat(priceList[0].originalB2CPrice, 0)
}}</span }}</span
......
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