Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
million
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
million
Commits
73aa2f84
Commit
73aa2f84
authored
Mar 06, 2023
by
沈良进
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/viitto/million
parents
fe5dcf0f
a8cb8872
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
211 additions
and
121 deletions
+211
-121
orderPreview.vue
src/components/car/orderPreview.vue
+18
-35
orderForm.vue
src/pages/Pickuporder/orderForm.vue
+184
-81
detailsCar.vue
src/pages/detailsCar.vue
+8
-4
routes.js
src/router/routes.js
+1
-1
No files found.
src/components/car/orderPreview.vue
View file @
73aa2f84
...
...
@@ -144,7 +144,7 @@
||(dataList.CarType!=3&&!selectedAirportObj)
||(dataList.CarType==1&&!unCarObj)||(dataList.CarType==2&&!onCarObj)
||(dataList.CarType==3&&(!onCarObj||!unCarObj))"
@
click=
"go
Url
"
/>
@
click=
"go
OrderHandler
"
/>
</div>
</div>
</div>
...
...
@@ -199,27 +199,15 @@ export default {
},
methods
:
{
goUrl
(){
let
OrderDate
=
{
CarObj
:
this
.
selectedCarObj
,
AirportObj
:
{
Address
:
this
.
selectedAirportObj
?
this
.
selectedAirportObj
.
Address
:
''
,
AirportId
:
this
.
selectedAirportObj
?
this
.
selectedAirportObj
.
AirportId
:
''
,
AirportName
:
this
.
selectedAirportObj
?
this
.
selectedAirportObj
.
AirportName
:
''
,
Id
:
this
.
selectedAirportObj
?
this
.
selectedAirportObj
.
Id
:
''
,
Name
:
this
.
selectedAirportObj
?
this
.
selectedAirportObj
.
Name
:
''
},
calculationAmount
:
this
.
p
,
calculationNum
:
this
.
chosenObj
,
goOrderHandler
(){
let
order
=
{
CarId
:
this
.
selectedCarObj
.
Id
,
AirportId
:
this
.
selectedAirportObj
?
this
.
selectedAirportObj
.
Id
:
''
,
startDate
:
this
.
p
.
startDate
,
originalB2CPrice
:
this
.
p
.
originalB2CPrice
,
orderInfo
:
this
.
chosenObj
,
sumPrice
:
this
.
sumPrice
,
details
:
{
Name
:
this
.
dataList
.
Name
,
Description
:
this
.
dataList
.
Description
,
videoStr
:
this
.
dataList
.
videoStr
,
imgCover
:
this
.
dataList
.
imgCover
,
CarType
:
this
.
dataList
.
CarType
,
Id
:
this
.
dataList
.
Id
,
},
Id
:
this
.
dataList
.
Id
,
onCarObj
:
{
Address
:
this
.
onCarObj
?
this
.
onCarObj
.
Address
:
''
,
Name
:
this
.
onCarObj
?
this
.
onCarObj
.
Name
:
''
,
...
...
@@ -235,20 +223,15 @@ export default {
Range
:
this
.
unCarObj
?
this
.
unCarObj
.
Range
:
''
},
}
// console.log(OrderDate,'========')
// return
this
.
CommonJump
(
"/PickuporderForm"
,
{
OrderDate
:
encodeURIComponent
(
JSON
.
stringify
(
OrderDate
)),
// CarObj: JSON.stringify(this.selectedCarObj),
// AirportObj: JSON.stringify(this.selectedAirportObj),
// calculationAmount: JSON.stringify(this.p),
// calculationNum: JSON.stringify(this.chosenObj),
// sumPrice: JSON.stringify(this.sumPrice),
// details: JSON.stringify(this.dataList)
}
);
let
key
=
this
.
$md5
(
JSON
.
stringify
(
order
))
let
pickuporderCars
=
localStorage
.
getItem
(
'pickuporderCars'
)
pickuporderCars
=
pickuporderCars
?
JSON
.
parse
(
pickuporderCars
):[]
pickuporderCars
.
push
({
key
,
order
})
localStorage
.
setItem
(
"pickuporderCars"
,
JSON
.
stringify
(
pickuporderCars
))
this
.
CommonJump
(
'/PickuporderForm/'
+
key
,
{});
},
// 获取车的详情
getCarPriceData2
()
{
...
...
src/pages/Pickuporder/orderForm.vue
View file @
73aa2f84
...
...
@@ -40,7 +40,7 @@
>
<div
class=
"col"
>
<q-card
flat
class=
"q-pa-md"
>
<div
class=
"text-subtitle1 text-weight-bolder"
>
訂購人資訊
</div>
<div
class=
"text-subtitle1 text-weight-bolder"
ref=
"baseUserInfoTitle"
>
訂購人資訊
</div>
<q-separator
color=
"grey-2"
class=
"q-my-md"
/>
<div
class=
"row q-col-gutter-md"
>
<div
:class=
"filedWidth"
>
...
...
@@ -56,25 +56,12 @@
standout
/>
</div>
<div
:class=
"filedWidth"
>
<q-input
standout
v-model=
"parameters.Mobile"
label=
"電話"
:rules=
"[(val) => !!val && val.length == 11 || '請輸正確電話']"
ref=
"Mobile"
>
<template
v-slot:prepend
>
<div
class=
"text-subtitle2"
>
+
{{
userInfo
.
areaCode
}}
</div>
</
template
>
</q-input>
</div>
<div
:class=
"filedWidth"
>
<q-input
standout
v-model=
"userInfo.mail"
label=
"郵箱地址"
:rules=
"[(val) =>
!!val || '請輸入
郵箱地址']"
:rules=
"[(val) =>
/^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]
{2,5}$/.test(val) || '請輸入正確的
郵箱地址']"
ref="mail"
/>
</div>
...
...
@@ -82,7 +69,7 @@
</q-card>
<q-card
flat
class=
"q-pa-md q-mt-lg"
v-if=
"details"
>
<div
class=
"text-subtitle1 text-weight-bolder q-mb-md"
>
旅客資料
</div>
<div
class=
"text-subtitle1 text-weight-bolder q-mb-md"
ref=
"passengerInformation"
>
旅客資料
</div>
<div
class=
"row"
>
<vue-core-video-players
...
...
@@ -104,7 +91,7 @@
/>
<q-img
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"
spinner-color=
"grey-3"
style=
"width: 80px"
...
...
@@ -121,11 +108,11 @@
<div
class=
"q-mt-md row"
>
<div
class=
"text-grey-9"
>
<q-icon
name=
"iconfont iconrili"
size=
"20px"
class=
"q-mr-sm"
/>
<span>
{{
calculationAmount
.startDate}}
</span>
<span>
{{
OrderDate
.
startDate
}}
</span>
</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"
/>
<span
class=
"q-mr-sm"
v-if=
"chosenObj.Count > 0"
<span
class=
"q-mr-sm"
>
{{
CarObj
.
CarName
}}
x
{{
chosenObj
.
Count
}}
辆
</span
>
<span
class=
"q-mr-sm"
...
...
@@ -167,6 +154,8 @@
placeholder=
"例:WeChat"
:rules=
"[(val) => !!val || '請輸联络方式']"
ref=
"ContactWay"
mask=
"X"
reverse-fill-mask
>
</q-input>
</div>
...
...
@@ -177,6 +166,8 @@
label=
"電話"
:rules=
"[(val) => !!val && val.length == 11 || '請輸正確電話']"
ref=
"Mobile"
mask=
"#"
reverse-fill-mask
>
<template
v-slot:prepend
>
<div
class=
"text-subtitle2"
>
+
{{
userInfo
.
areaCode
}}
</div>
...
...
@@ -214,7 +205,12 @@
placeholder=
"例:航廈"
:rules=
"[(val) => !!val || '請輸航廈']"
ref=
"AirportTerminal"
/>
readonly
>
<q-popup-proxy
:offset=
"[0, 10]"
ref=
"qDateProxy7"
>
<q-input
type=
"textarea"
dense
standout
autofocus
v-model=
"parameters.AirportTerminal"
placeholder=
"請輸航廈"
/>
</q-popup-proxy>
</q-input>
</div>
<div
:class=
"filedGuestWidth"
>
<q-input
...
...
@@ -224,7 +220,12 @@
placeholder=
""
:rules=
"[(val) => !!val || '請輸航空公司名稱']"
ref=
"AirLine"
/>
readonly
>
<q-popup-proxy
:offset=
"[0, 10]"
ref=
"qDateProxy8"
>
<q-input
type=
"textarea"
dense
standout
autofocus
v-model=
"parameters.AirLine"
placeholder=
"請輸航空公司名稱"
/>
</q-popup-proxy>
</q-input>
</div>
<div
:class=
"filedGuestWidth"
>
<q-input
...
...
@@ -234,6 +235,8 @@
placeholder=
"例:CA123"
:rules=
"[(val) => !!val || '請輸航班編號']"
ref=
"FlightNumber"
mask=
"X"
reverse-fill-mask
/>
</div>
<div
:class=
"filedGuestWidth"
>
...
...
@@ -302,11 +305,16 @@
v-model=
"parameters.GetonAddress"
label=
"上車地點"
placeholder=
""
:rules=
"[(val) => !!val || '請輸上車地點和地址供司機參考']"
ref=
"GetonAddress"
>
:rules=
"[(val) => !!val || '請輸上車地點供司機參考']"
ref=
"GetonAddress"
readonly
>
<
template
v-slot:append
>
<
q-icon
name=
"iconfont iconaddress"
size=
"20px"
class=
"q-mr-sm"
@
click=
"getAddress(1)"
/
>
<
!--
<q-icon
name=
"iconfont iconaddress"
size=
"20px"
class=
"q-mr-sm"
@
click=
"getAddress(1)"
/>
--
>
</
template
>
<q-popup-proxy
:offset=
"[0, 10]"
ref=
"qDateProxy5"
>
<q-input
type=
"textarea"
dense
standout
autofocus
v-model=
"parameters.GetonAddress"
placeholder=
"請輸上車地點供司機參考"
/>
</q-popup-proxy>
</q-input>
</div>
<div
:class=
"filedGuestWidth"
v-if=
"details.CarType!=2"
>
...
...
@@ -315,11 +323,16 @@
v-model=
"parameters.GetoffAddress"
label=
"下車地點"
placeholder=
""
:rules=
"[(val) => !!val || '請輸下車地點和地址供司機參考']"
ref=
"GetoffAddress"
>
:rules=
"[(val) => !!val || '請輸下車地點供司機參考']"
ref=
"GetoffAddress"
readonly
>
<
template
v-slot:append
>
<
q-icon
name=
"iconfont iconaddress"
size=
"20px"
class=
"q-mr-sm"
@
click=
"getAddress(2)"
/
>
<
!--
<q-icon
name=
"iconfont iconaddress"
size=
"20px"
class=
"q-mr-sm"
@
click=
"getAddress(2)"
/>
--
>
</
template
>
<q-popup-proxy
:offset=
"[0, 10]"
ref=
"qDateProxy6"
>
<q-input
type=
"textarea"
dense
standout
autofocus
v-model=
"parameters.GetoffAddress"
placeholder=
"請輸下車地點供司機參考"
/>
</q-popup-proxy>
</q-input>
</div>
...
...
@@ -334,31 +347,34 @@
<div
class=
"row q-col-gutter-md"
>
<div
:class=
"filedGuestWidth"
>
<q-input
type=
"Number"
standout
v-model=
"parameters.ManNum"
label=
"成人數(18-99岁)"
@
input=
"getNum"
:rules=
"[(val) => !!val || '請輸成人數']"
ref=
"ManNum"
mask=
"#"
reverse-fill-mask
/>
</div>
<div
:class=
"filedGuestWidth"
>
<q-input
type=
"Number"
standout
v-model=
"parameters.ChildNum"
label=
"兒童數(3-17岁)"
@
input=
"getNum"
mask=
"#"
reverse-fill-mask
/>
</div>
<div
:class=
"filedGuestWidth"
>
<q-input
type=
"Number"
standout
v-model=
"parameters.BabyNum"
label=
"嬰幼兒數(0-2岁)"
@
input=
"getNum"
mask=
"#"
reverse-fill-mask
/>
</div>
...
...
@@ -368,18 +384,20 @@
<div
class=
"row q-col-gutter-md"
>
<div
:class=
"filedGuestWidth"
>
<q-input
type=
"Number"
standout
v-model=
"parameters.HandLuggageNum"
label=
"手提行李"
mask=
"#"
reverse-fill-mask
/>
</div>
<div
:class=
"filedGuestWidth"
>
<q-input
type=
"Number"
standout
v-model=
"parameters.RegisteredLuggageNum"
label=
"托运行李"
mask=
"#"
reverse-fill-mask
/>
</div>
...
...
@@ -429,7 +447,7 @@
/>
<q-img
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"
spinner-color=
"grey-3"
style=
"width: 80px"
...
...
@@ -444,15 +462,15 @@
</div>
</div>
<div
class=
"q-mt-md text-grey-6"
>
<div
class=
"row q-pb-xs"
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
class=
"q-ml-md ellipsis-2-lines"
>
{{AirportObj.Name}}
</div>
</div>
<div
class=
"row q-pb-xs"
v-if=
"parameters.GetonAddress"
>
<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"
v-if=
"parameters.GetoffAddress"
>
<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>
...
...
@@ -462,25 +480,24 @@
接駁日期:
</div>
<div
class=
"q-ml-md"
>
{{parameters.OrderDate}}
<!-- {{calculationAmount.startDate}} -->
</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"
>
<div
class=
"row q-mb-sm"
v-if=
"chosenObj.Count>0
&&CarObj
"
>
<div
class=
"col"
>
{{CarObj.CarName}} x {{ chosenObj.Count }}
</div>
<div>
CNY {{ moneyFormat(sum
Price,2) }}
</div>
<div>
{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2C
Price,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="(chosenObj.Count)>0">
<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> -->
<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=
"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
class=
"text-right q-mt-md"
v-if=
"step!=3"
>
...
...
@@ -505,10 +522,20 @@
</div>
</q-card>
</q-dialog>
<div
v-if=
"!orderKey || orderKey == ''"
class=
"text-center q-my-xl"
>
<none-data
iconType=
"order"
title=
"沒有找到您的訂單信息哦"
subtitle=
"趕緊去挑選心儀的旅遊產品吧,三秒後自動跳轉到首頁"
></none-data>
</div>
<auth></auth>
</div>
</template>
<
script
>
import
NoneData
from
"src/components/common/noneData.vue"
;
import
auth
from
"src/components/common/auth.vue"
;
import
{
date
}
from
'quasar'
import
{
json
}
from
"body-parser"
;
import
coupon
from
'../../components/common/coupon.vue'
...
...
@@ -516,18 +543,26 @@
export
default
{
components
:{
coupon
,
componentsMap
componentsMap
,
NoneData
,
auth
},
data
()
{
return
{
order
:
null
,
orderKey
:
""
,
isRangeClick
:
true
,
isShowDialog
:
false
,
AddressObj
:
null
,
onCarObj
:
null
,
//上车范围
unCarObj
:
null
,
//下车范围
onCarId
:
null
,
//上车范围
unCarId
:
null
,
//下车范围
CarObj
:
null
,
//车型
AirportObj
:
null
,
//机场
calculationAmount
:
null
,
//日期
CarId
:
null
,
//车型
AirportId
:
null
,
//机场
startDate
:
null
,
calculationNum
:
null
,
//数量
sumPrice
:
null
,
//总价
details
:
null
,
//产品详情
...
...
@@ -609,34 +644,77 @@
},
created
()
{},
mounted
()
{
if
(
this
.
$route
.
query
.
OrderDate
){
let
obj
=
decodeURIComponent
(
this
.
$route
.
query
.
OrderDate
)
let
OrderDate
=
JSON
.
parse
(
obj
)
this
.
CarObj
=
OrderDate
.
CarObj
,
//车型
this
.
AirportObj
=
OrderDate
.
AirportObj
,
//机场
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
if
(
this
.
checkParamsHandler
()){
this
.
getCarData
()
}
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
this
.
initCountry
();
this
.
initGuestHandler
();
},
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
()
{
try
{
if
(
this
.
$route
.
params
&&
this
.
$route
.
params
.
id
)
{
let
key
=
this
.
$route
.
params
.
id
;
console
.
log
(
key
,
'99999'
)
let
pickuporderCars
=
localStorage
.
getItem
(
"pickuporderCars"
);
pickuporderCars
=
pickuporderCars
?
JSON
.
parse
(
pickuporderCars
)
:
[];
if
(
pickuporderCars
.
length
>
0
)
{
this
.
order
=
pickuporderCars
.
find
((
x
)
=>
x
.
key
==
key
);
if
(
this
.
order
)
{
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
//下车范围
}
}
}
}
catch
(
error
)
{
console
.
log
(
error
);
}
if
(
this
.
orderKey
==
""
)
{
setTimeout
(()
=>
{
},
3000
);
}
return
this
.
orderKey
!=
""
;
},
submit
(){
let
flag
=
false
...
...
@@ -648,6 +726,7 @@
this
.
$refs
.
Mobile
.
validate
()
this
.
$refs
.
OrderDate
.
validate
()
this
.
$refs
.
ManNum
.
validate
()
if
(
this
.
details
.
CarType
!=
3
){
this
.
$refs
.
AirportTerminal
.
validate
()
this
.
$refs
.
AirLine
.
validate
()
...
...
@@ -673,9 +752,15 @@
&&
!
this
.
$refs
.
Mobile
.
hasError
&&
!
this
.
$refs
.
OrderDate
.
hasError
&&
!
this
.
$refs
.
ManNum
.
hasError
&&
!
this
.
$refs
.
GetonAddress
.
hasError
&&
!
this
.
$refs
.
GetoffAddress
.
hasError
&&
!
this
.
$refs
.
mail
.
hasError
}
if
(
!
flag
)
return
if
(
!
flag
)
return
this
.
goScrollToForm
(
'baseUserInfoTitle'
)
console
.
log
(
this
.
parameters
,
'------'
)
this
.
SetCarOrder
()
},
goScrollToForm
(
formName
){
let
temp
=
this
.
$refs
[
formName
]
let
formObj
=
temp
instanceof
Array
?
temp
[
0
]
:
temp
window
.
scrollTo
(
0
,
formObj
.
offsetTop
)
},
SetCarOrder
(){
this
.
loading
=
true
this
.
apipost
(
...
...
@@ -699,6 +784,15 @@
})
},
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
(
"AddOrderInfo_post"
,
{
...
...
@@ -708,8 +802,8 @@
Mailbox
:
this
.
userInfo
.
mail
,
//邮箱
GoodsId
:
this
.
parameters
.
ProductId
,
//商品id
GoodsName
:
this
.
details
.
Name
,
//商品名称
GoodsPic
:
this
.
details
.
imgCover
[
0
],
//商品图片
GoodsType
:
this
.
parameters
.
OrderType
,
//商品类型(见枚举)
GoodsPic
:
this
.
details
.
ImageList
[
0
],
//商品图片
GoodsType
:
GoodsType
,
//商品类型(见枚举) 12包车 13 接机 14送机
OrderMake
:
this
.
parameters
.
OrderDate
,
//订单摘要(例如出行时间)
TotalPrice
:
this
.
parameters
.
Money
,
//总价格
PreferentialPrice
:
0
,
// 优惠总金额
...
...
@@ -723,6 +817,13 @@
(
r
)
=>
{
if
(
r
.
data
.
resultCode
==
1
)
{
this
.
step
=
3
this
.
$q
.
notify
({
color
:
"green-4"
,
textColor
:
"white"
,
icon
:
"cloud_done"
,
message
:
"訂單提交成功"
,
position
:
'center'
,
});
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
...
...
@@ -739,10 +840,10 @@
// 1航班时间 2预约时间
this
.
onoffbus
=
type
if
(
type
==
1
){
this
.
parameters
.
FlightTime
=
this
.
calculationAmount
.
startDate
+
' '
+
this
.
flightTime
this
.
parameters
.
FlightTime
=
this
.
OrderDate
.
startDate
+
' '
+
this
.
flightTime
this
.
$refs
.
qDateProxy1
.
hide
()
}
else
if
(
type
==
2
){
this
.
parameters
.
OrderDate
=
this
.
calculationAmount
.
startDate
+
' '
+
this
.
getBusTime
this
.
parameters
.
OrderDate
=
this
.
OrderDate
.
startDate
+
' '
+
this
.
getBusTime
this
.
$refs
.
qDateProxy2
.
hide
()
}
...
...
@@ -792,15 +893,17 @@
// 初始化国家
initCountry
()
{
this
.
apipost
(
"GetCountryInfo_post"
,
{},
(
r
)
=>
{
this
.
countrys
=
r
.
data
.
data
.
countList
;
this
.
userInfo
.
country
=
this
.
countrys
[
0
].
ID
;
this
.
areaCodes
=
r
.
data
.
data
.
phoneCountList
;
this
.
changeCountry
(
this
.
userInfo
.
country
);
this
.
areaCodes
.
forEach
((
x
)
=>
{
let
temp
=
this
.
countrys
.
find
((
y
)
=>
y
.
ID
==
x
.
ID
);
x
.
EnName
=
`
${
temp
.
EnName
}
(
${
x
.
PhoneCode
}
)`
;
});
if
(
r
.
data
.
resultCode
==
1
)
{
this
.
countrys
=
r
.
data
.
data
.
countList
;
this
.
userInfo
.
country
=
this
.
countrys
[
0
].
ID
;
this
.
areaCodes
=
r
.
data
.
data
.
phoneCountList
;
this
.
changeCountry
(
this
.
userInfo
.
country
);
this
.
areaCodes
.
forEach
((
x
)
=>
{
let
temp
=
this
.
countrys
.
find
((
y
)
=>
y
.
ID
==
x
.
ID
);
x
.
EnName
=
`
${
temp
.
EnName
}
(
${
x
.
PhoneCode
}
)`
;
});
}
});
},
changeCountry
(
id
)
{
...
...
src/pages/detailsCar.vue
View file @
73aa2f84
<
template
>
<div
style=
"min-height: 80vh"
>
<div
style=
"
position: fixed;
...
...
@@ -22,7 +23,7 @@
class=
"col product-price text-subtitle1 text-weight-bold"
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>
<q-btn
...
...
@@ -172,7 +173,7 @@
>
<div
class=
"product-price text-h6"
v-if=
"dataList.MinPrice > 0"
>
<!-- CNY:
{{
dataList
.
}}
-->
CNY
:
{{
moneyFormat
(
dataList
.
MinPrice
,
0
)
}}
{{
dataList
.
CurrencyCode
}}
:
{{
moneyFormat
(
dataList
.
MinPrice
,
0
)
}}
<span
class=
"f12 text-grey-6"
>
起
</span>
</div>
<div
v-else
class=
"text-subtitle1 text-grey-6"
>
暫無報價
</div>
...
...
@@ -326,7 +327,7 @@
<div
class=
""
v-if=
"$q.platform.is.desktop"
>
<div
class=
"row items-center"
>
<span
class=
"product-price text-h6 q-mr-md"
>
CNY
>
{{dataList.CurrencyCode}}
{{
moneyFormat(priceList[0].originalB2CPrice, 0)
}}
</span
...
...
@@ -597,10 +598,12 @@
</div>
</
template
>
</div>
<!-- <auth></auth> -->
</div>
</template>
<
script
>
import
auth
from
"src/components/common/auth.vue"
;
import
{
slider
,
slideritem
}
from
"vue-concise-slider"
;
import
calendar
from
"../components/trip/calendar.vue"
;
import
OrderPreview
from
"src/components/car/orderPreview.vue"
;
...
...
@@ -729,7 +732,8 @@ export default {
smaple
,
Trip
,
block
,
componentsMap
componentsMap
,
auth
,
},
watch
:
{
days
:
{
...
...
src/router/routes.js
View file @
73aa2f84
...
...
@@ -33,7 +33,7 @@ const routes = [{
component
:
()
=>
import
(
'pages/detailsCar.vue'
)
},
{
// 包车,接机下单
path
:
'/PickuporderForm'
,
path
:
'/PickuporderForm
/:id
'
,
component
:
()
=>
import
(
'pages/Pickuporder/orderForm.vue'
)
},
{
// 酒店
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment