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
ff45f2a0
Commit
ff45f2a0
authored
Mar 07, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
fe552134
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
29 deletions
+64
-29
orderPreview.vue
src/components/car/orderPreview.vue
+11
-4
detailsCar.vue
src/pages/detailsCar.vue
+53
-25
No files found.
src/components/car/orderPreview.vue
View file @
ff45f2a0
<
template
>
<
template
>
<div
class=
"column full-height"
>
<div
class=
"column full-height"
>
<div
class=
"col"
>
<div
class=
"col"
>
<div
class=
"text-right"
>
<div
class=
"text-right"
v-if=
"$q.platform.is.desktop"
>
<q-btn
<q-btn
color=
"primary"
color=
"primary"
icon=
"refresh"
icon=
"refresh"
...
@@ -112,23 +112,29 @@
...
@@ -112,23 +112,29 @@
<span
class=
"text-subtitle2 text-grey-6 col"
>
總金額
</span>
<span
class=
"text-subtitle2 text-grey-6 col"
>
總金額
</span>
<span
class=
"text-h6 text-primary product-price"
>
CNY {{ moneyFormat(sumPrice,0) }}
</span>
<span
class=
"text-h6 text-primary product-price"
>
CNY {{ moneyFormat(sumPrice,0) }}
</span>
</div>
</div>
<div
class=
"q-mt-md text-right"
>
<div
class=
"q-mt-md text-right"
<span
class=
"q-mr-lg f12 text-negative"
v-if=
"!p.startDate"
>
:class=
"{'row wrap justify-end items-start':$q.platform.is.mobile}"
>
<span
:class=
"{'col-12 q-mb-sm':$q.platform.is.mobile}"
>
<span
class=
"f12 text-negative"
v-if=
"!p.startDate"
:class=
"{'q-mr-lg':$q.platform.is.desktop}"
>
{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}}
{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}}
</span>
</span>
<span
class=
"q-mr-lg f12 text-negative"
<span
class=
"f12 text-negative"
:class=
"{'q-mr-lg':$q.platform.is.desktop}"
v-if=
"(p.startDate&&!selectedCarObj)
v-if=
"(p.startDate&&!selectedCarObj)
||(p.startDate&&dataList.CarType==1&&(!selectedAirportObj||!unCarObj))
||(p.startDate&&dataList.CarType==1&&(!selectedAirportObj||!unCarObj))
||(p.startDate&&dataList.CarType==2&&(!selectedAirportObj||!onCarObj))
||(p.startDate&&dataList.CarType==2&&(!selectedAirportObj||!onCarObj))
||(p.startDate&&dataList.CarType==3&&(!onCarObj||!unCarObj))"
>
||(p.startDate&&dataList.CarType==3&&(!onCarObj||!unCarObj))"
>
{{`請選擇上面的${dataList.CarType==3?'車類型、上車下車點':dataList.CarType==1?'機場、車類型、下車點':'機場、車類型、上車點'}`}}
{{`請選擇上面的${dataList.CarType==3?'車類型、上車下車點':dataList.CarType==1?'機場、車類型、下車點':'機場、車類型、上車點'}`}}
</span>
</span>
</span>
<q-btn
color=
"primary"
label=
"立即訂購"
unelevated
class=
"q-px-lg"
<q-btn
color=
"primary"
label=
"立即訂購"
unelevated
class=
"q-px-lg"
:disable=
"sumPrice==0||!selectedCarObj
:disable=
"sumPrice==0||!selectedCarObj
||(dataList.CarType!=3&&!selectedAirportObj)
||(dataList.CarType!=3&&!selectedAirportObj)
||(dataList.CarType==1&&!unCarObj)||(dataList.CarType==2&&!onCarObj)
||(dataList.CarType==1&&!unCarObj)||(dataList.CarType==2&&!onCarObj)
||(dataList.CarType==3&&(!onCarObj||!unCarObj))"
||(dataList.CarType==3&&(!onCarObj||!unCarObj))"
@
click=
"goOrderHandler"
/>
@
click=
"goOrderHandler"
/>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -176,6 +182,7 @@ export default {
...
@@ -176,6 +182,7 @@ export default {
},
},
created
()
{
created
()
{
this
.
initModel
();
this
.
initModel
();
console
.
log
(
this
.
p
,
'======='
)
if
(
this
.
p
.
startDate
){
if
(
this
.
p
.
startDate
){
this
.
chosenObj
.
startDate
=
this
.
p
.
startDate
;
this
.
chosenObj
.
startDate
=
this
.
p
.
startDate
;
this
.
calcMoney
()
this
.
calcMoney
()
...
...
src/pages/detailsCar.vue
View file @
ff45f2a0
...
@@ -12,6 +12,12 @@
...
@@ -12,6 +12,12 @@
z-index: 999;
z-index: 999;
"
"
class=
"bg-white"
class=
"bg-white"
v-if=
"
(currentHeight > navs[0].top + 100 && $q.platform.is.desktop) ||
(currentHeight > priceListHeight &&
currentHeight
<
navs
[
0
].
top
&&
$
q
.
platform
.
is
.
mobile
)
"
:style=
"
{ transform: stickyHeight }"
:style=
"
{ transform: stickyHeight }"
>
>
<div
<div
...
@@ -243,20 +249,12 @@
...
@@ -243,20 +249,12 @@
style=
"max-width: 1200px; margin-left: auto; margin-right: auto"
style=
"max-width: 1200px; margin-left: auto; margin-right: auto"
>
>
<div
class=
"text-h6"
>
選擇方案
</div>
<div
class=
"text-h6"
>
選擇方案
</div>
<div
style=
"
background: #fff;
padding: 20px;
border-radius: 10px;
margin-top: 20px;
"
>
<div
<div
class=
"rounded-borders bg-white q-pa-md q-mt-md"
class=
"rounded-borders bg-white q-pa-md q-mt-md"
v-if=
"$q.platform.is.mobile"
v-if=
"$q.platform.is.mobile"
>
>
<q-field
<q-field
class=
"q-m
y
-md"
class=
"q-m
t
-md"
stack-label
stack-label
label=
"選擇日期、選項"
label=
"選擇日期、選項"
standout
standout
...
@@ -274,22 +272,20 @@
...
@@ -274,22 +272,20 @@
></calendar>
></calendar>
</q-popup-proxy>
</q-popup-proxy>
</q-field>
</q-field>
<template
v-if=
"currentPrice && currentPrice.startDate"
>
<order-preview
<order-preview
:dataList=
"dataList"
class=
"q-pa-md"
:configId=
"msg.configId"
:dataList=
"dataList"
:Month=
"currentYM.str"
:configId=
"msg.configId"
:price=
"currentPrice"
:Month=
"currentYM.str"
@
reset=
"resetHandler"
:price=
"currentPrice"
@
getPriceList=
"getPriceList"
@
reset=
"resetHandler"
></order-preview>
@
getPriceList=
"getPriceList"
></order-preview>
</
template
>
</div>
</div>
<!--方案选择区 -->
<!--方案选择区 -->
<
!-- <
div class="text-h6 q-pt-lg" v-if="$q.platform.is.mobile">
<div
class=
"text-h6 q-pt-lg"
v-if=
"$q.platform.is.mobile"
>
所選方案詳情
所選方案詳情
</div>
-->
</div>
<div
<div
class=
"bg-white rounded-borders q-mt-md"
class=
"bg-white rounded-borders q-mt-md"
v-if=
"priceList && priceList.length > 0"
v-if=
"priceList && priceList.length > 0"
...
@@ -331,7 +327,7 @@
...
@@ -331,7 +327,7 @@
color=
"primary"
color=
"primary"
outline
outline
:label=
"showOrderPreview ? '取消選擇' : '選擇'"
:label=
"showOrderPreview ? '取消選擇' : '選擇'"
@
click=
"
showOrderPreview = !showOrderPreview
"
@
click=
"
changeShowOrderPreviewHandler
"
class=
"q-px-lg"
class=
"q-px-lg"
/>
/>
</div>
</div>
...
@@ -384,7 +380,7 @@
...
@@ -384,7 +380,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -749,6 +745,13 @@ export default {
...
@@ -749,6 +745,13 @@ export default {
immediate
:
true
,
immediate
:
true
,
deep
:
true
,
deep
:
true
,
},
},
currentPrice
:
{
handler
:
function
(
val
,
oldval
)
{
this
.
currentPrice
=
val
;
},
immediate
:
false
,
deep
:
true
,
},
},
},
created
()
{
created
()
{
if
(
this
.
$route
.
params
.
id
)
{
if
(
this
.
$route
.
params
.
id
)
{
...
@@ -777,6 +780,29 @@ export default {
...
@@ -777,6 +780,29 @@ export default {
// this.getCarPriceData();
// this.getCarPriceData();
},
},
methods
:
{
methods
:
{
changeShowOrderPreviewHandler
(){
this
.
showOrderPreview
=!
this
.
showOrderPreview
if
(
!
this
.
showOrderPreview
){
// // this.currentPrice=null
// if(this.currentPrice){
// this.currentPrice.isSupportChildren=null
// this.currentPrice.unionCityList=null
// this.currentPrice.singleRoomPrice=0
// this.currentPrice.originalB2CPrice=0
// }
this
.
changeTripShowHandler
()
}
},
changeTripShowHandler
()
{
this
.
$nextTick
(()
=>
{
this
.
navs
.
forEach
((
x
)
=>
{
x
.
top
=
this
.
$refs
[
x
.
val
].
getBoundingClientRect
().
top
+
this
.
currentHeight
-
60
;
});
});
},
getPriceList
(
Arr
,
id
){
getPriceList
(
Arr
,
id
){
this
.
priceList
=
JSON
.
parse
(
Arr
)
this
.
priceList
=
JSON
.
parse
(
Arr
)
if
(
this
.
selectedCar
===
id
)
{
if
(
this
.
selectedCar
===
id
)
{
...
@@ -859,7 +885,9 @@ export default {
...
@@ -859,7 +885,9 @@ export default {
},
},
resetHandler
()
{
resetHandler
()
{
this
.
currentPrice
.
startDate
=
""
;
this
.
currentPrice
.
startDate
=
""
;
this
.
$refs
.
calendar
.
reset
();
if
(
!
this
.
$q
.
platform
.
is
.
mobile
){
this
.
$refs
.
calendar
.
reset
();
}
},
},
changeChosenDateHandler
(
val
)
{
changeChosenDateHandler
(
val
)
{
val
.
price
.
version
=
new
Date
().
getTime
();
val
.
price
.
version
=
new
Date
().
getTime
();
...
...
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