Skip to content

M
million
Commit 7cbd3931 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 8c32791b a3c752bc
Hide whitespace changes
Inline Side-by-side
Showing with 1276 additions and 890 deletions
package.json
View file @ 7cbd3931
...@@ -22,12 +22,14 @@ ...@@ -22,12 +22,14 @@
"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",
"v-viewer": "^1.6.4", "v-viewer": "^1.6.4",
"vue-awesome-swiper": "^3.0.4", "vue-awesome-swiper": "^3.0.4",
"vue-concise-slider": "^4.2.5", "vue-concise-slider": "^4.2.5",
"vue-core-video-player": "^0.2.0", "vue-core-video-player": "^0.2.0",
"vue-core-video-players": "0.0.5", "vue-core-video-players": "0.0.5",
"vue-i18n": "^8.0.0" "vue-i18n": "^8.0.0",
"vuelidate": "^0.7.7"
}, },
"devDependencies": { "devDependencies": {
"@quasar/app": "^1.0.0" "@quasar/app": "^1.0.0"
...@@ -40,4 +42,4 @@ ...@@ -40,4 +42,4 @@
"browserslist": [ "browserslist": [
"last 1 version, not dead, ie >= 11" "last 1 version, not dead, ie >= 11"
] ]
} }
\ No newline at end of file
src/components/car/orderPreview.vue
View file @ 7cbd3931
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
||(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="goUrl"/> @click="goOrderHandler"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -199,8 +199,9 @@ export default { ...@@ -199,8 +199,9 @@ export default {
}, },
methods: { methods: {
goUrl(){ goOrderHandler(){
let OrderDate = { let order = {
key: null,
CarObj: this.selectedCarObj, CarObj: this.selectedCarObj,
AirportObj: { AirportObj: {
Address: this.selectedAirportObj?this.selectedAirportObj.Address:'', Address: this.selectedAirportObj?this.selectedAirportObj.Address:'',
...@@ -219,6 +220,7 @@ export default { ...@@ -219,6 +220,7 @@ export default {
imgCover: this.dataList.imgCover, imgCover: this.dataList.imgCover,
CarType: this.dataList.CarType, CarType: this.dataList.CarType,
Id: this.dataList.Id, Id: this.dataList.Id,
CurrencyCode: this.dataList.CurrencyCode,
}, },
onCarObj: { onCarObj: {
Address: this.onCarObj?this.onCarObj.Address:'', Address: this.onCarObj?this.onCarObj.Address:'',
...@@ -235,20 +237,10 @@ export default { ...@@ -235,20 +237,10 @@ export default {
Range: this.unCarObj?this.unCarObj.Range:'' Range: this.unCarObj?this.unCarObj.Range:''
}, },
} }
// console.log(OrderDate,'========') let key = this.$md5(JSON.stringify(order))
// return order.key = key
this.CommonJump( localStorage.setItem("pickuporderCars",JSON.stringify(order))
"/PickuporderForm", this.CommonJump('/PickuporderForm/'+key, {});
{
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)
}
);
}, },
// 获取车的详情 // 获取车的详情
getCarPriceData2() { getCarPriceData2() {
......
src/pages/Pickuporder/orderForm.vue
View file @ 7cbd3931
<template> <template>
<div class="content-page order-preview"> <div class="content-page order-preview">
<q-stepper <q-stepper
v-model="step" v-model="step"
ref="stepper" ref="stepper"
color="primary" color="primary"
inactive-color="grey-5 " inactive-color="grey-5 "
class="bg-transparent" class="bg-transparent"
flat flat
animated animated
> >
<q-step <q-step
:name="1" :name="1"
title="確認訂單" title="確認訂單"
icon="settings" icon="settings"
:done="step > 1" :done="step > 1"
></q-step> ></q-step>
<q-step <q-step
:name="2" :name="2"
title="付款" title="付款"
icon="iconfont iconPayment-1" icon="iconfont iconPayment-1"
:done="step > 2" :done="step > 2"
></q-step> ></q-step>
<q-step <q-step
:name="3" :name="3"
title="訂購完成" title="訂購完成"
icon="iconfont iconicon_finish_R" icon="iconfont iconicon_finish_R"
:done="step == 3" :done="step == 3"
></q-step> ></q-step>
</q-stepper> </q-stepper>
<div <div
class="row q-pa-md" class="row q-pa-md"
style="min-width: 375px; margin: 0 auto" style="min-width: 375px; margin: 0 auto"
:class="{ :class="{
row: $q.screen.width >= 1200 && $q.platform.is.desktop, row: $q.screen.width >= 1200 && $q.platform.is.desktop,
column: $q.screen.width < 1200 || $q.platform.is.mobile, column: $q.screen.width < 1200 || $q.platform.is.mobile,
}" }"
> >
<div class="col"> <div class="col">
<q-card flat class="q-pa-md"> <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" /> <q-separator color="grey-2" class="q-my-md" />
<div class="row q-col-gutter-md">
<div :class="filedWidth">
<q-select
v-model="userInfo.country"
@input="changeCountry"
:options="countrys"
emit-value
option-label="Name"
option-value="ID"
map-options
label="國家/地區"
standout
/>
</div>
<div :class="filedWidth">
<q-input
standout
v-model="userInfo.mail"
label="郵箱地址"
:rules="[(val) => /^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/.test(val) || '請輸入正確的郵箱地址']"
ref="mail"
/>
</div>
</div>
</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" ref="passengerInformation">旅客資料</div>
<div class="row">
<vue-core-video-players
v-if="details.videoStr"
ref="video"
:src="details.videoStr"
:title="details.title"
:muted="true"
:autoplay="false"
@play="playHandler"
@pause="pauseHandler"
@seeked="seekedChangeHandler"
@timeupdate="timeChangeHandler"
logo="../statics/img/transparent_logo.png"
:loop="false"
id="trip_video"
class="rounded-borders"
style="width: 80px"
/>
<q-img
v-else
:src="details?details.imgCover[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"
/>
<div class="q-ml-md col">
<div class="text-subtitle1 ellipsis">
{{details.Name}}
</div>
<div class="text-caption text-grey-6 ellipsis q-mt-sm">
{{details.Description}}
</div>
</div>
</div>
<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>
</div>
<div class="text-grey-9 q-ml-md">
<q-icon name="iconfont iconjiaotong" size="20px" class="q-mr-sm" />
<span class="q-mr-sm" v-if="chosenObj.Count > 0"
>{{CarObj.CarName}} x {{ chosenObj.Count }}辆 </span
>
<span class="q-mr-sm"
>({{CarObj.PeopleNum}}人/辆)</span
>
</div>
</div>
<q-separator color="grey-2" class="q-mt-md" />
<div
class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item"
>
<div class="text-subtitle1 q-pb-md text-weight-bold"></div>
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md">
<div :class="filedWidth"> <div :class="filedGuestWidth">
<q-select <q-input
v-model="userInfo.country"
@input="changeCountry"
:options="countrys"
emit-value
option-label="Name"
option-value="ID"
map-options
label="國家/地區"
standout standout
v-model="parameters.SurName"
label="本國姓"
placeholder="例：張"
:rules="[(val) => !!val || '請輸本國姓']"
ref="SurName"
/> />
</div> </div>
<div :class="filedWidth"> <div :class="filedGuestWidth">
<q-input
standout
v-model="parameters.Name"
label="本國名"
placeholder="例：三"
:rules="[(val) => !!val || '請輸本國名']"
ref="Name"
/>
</div>
<div :class="filedGuestWidth">
<q-input
standout
v-model="parameters.ContactWay"
label="联络方式"
placeholder="例：WeChat"
:rules="[(val) => !!val || '請輸联络方式']"
ref="ContactWay"
mask="X"
reverse-fill-mask
>
</q-input>
</div>
<div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="parameters.Mobile" v-model="parameters.Mobile"
label="電話" label="電話"
:rules="[(val) => !!val && val.length == 11 || '請輸正確電話']" :rules="[(val) => !!val && val.length == 11 || '請輸正確電話']"
ref="Mobile" ref="Mobile"
mask="#"
reverse-fill-mask
> >
<template v-slot:prepend> <template v-slot:prepend>
<div class="text-subtitle2">+{{ userInfo.areaCode }}</div> <div class="text-subtitle2">+{{ userInfo.areaCode }}</div>
</template> </template>
</q-input> </q-input>
</div> </div>
<div :class="filedWidth"> <div :class="filedGuestWidth">
<q-input <div class="row items-center q-mt-md">
standout <span>選擇性別：</span>
v-model="userInfo.mail" <q-radio
label="郵箱地址" v-model="parameters.Sex"
:rules="[(val) => !!val || '請輸入郵箱地址']" dense
ref="mail" :val="1"
/> label="男"
</div> class="q-mr-lg"
</div> />
</q-card> <q-radio v-model="parameters.Sex" dense :val="2" label="女" />
<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="row">
<vue-core-video-players
v-if="details.videoStr"
ref="video"
:src="details.videoStr"
:title="details.title"
:muted="true"
:autoplay="false"
@play="playHandler"
@pause="pauseHandler"
@seeked="seekedChangeHandler"
@timeupdate="timeChangeHandler"
logo="../statics/img/transparent_logo.png"
:loop="false"
id="trip_video"
class="rounded-borders"
style="width: 80px"
/>
<q-img
v-else
:src="details?details.imgCover[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"
/>
<div class="q-ml-md col">
<div class="text-subtitle1 ellipsis">
{{details.Name}}
</div>
<div class="text-caption text-grey-6 ellipsis q-mt-sm">
{{details.Description}}
</div> </div>
</div> </div>
</div> </div>
<div class="q-mt-md row"> </div>
<div class="text-grey-9"> <template v-if="details.CarType!=3">
<q-icon name="iconfont iconrili" size="20px" class="q-mr-sm" /> <div class="text-subtitle1 text-weight-bolder q-my-md">{{details.CarType==1?'抵達':'起飛'}} 班机資料</div>
<span>{{calculationAmount.startDate}}</span>
</div>
<div class="text-grey-9 q-ml-md">
<q-icon name="iconfont iconjiaotong" size="20px" class="q-mr-sm" />
<span class="q-mr-sm" v-if="chosenObj.Count > 0"
>{{CarObj.CarName}} x {{ chosenObj.Count }}辆 </span
>
<span class="q-mr-sm"
>({{CarObj.PeopleNum}}人/辆)</span
>
</div>
</div>
<q-separator color="grey-2" class="q-mt-md" /> <q-separator color="grey-2" class="q-mt-md" />
<div <div
class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item" class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item"
...@@ -142,656 +200,671 @@ ...@@ -142,656 +200,671 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="parameters.SurName" v-model="parameters.AirportTerminal"
label="本國姓" label="航廈"
placeholder="例：張" placeholder="例：航廈"
:rules="[(val) => !!val || '請輸本國姓']" :rules="[(val) => !!val || '請輸航廈']"
ref="SurName" 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>
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="parameters.Name" v-model="parameters.AirLine"
label="本國名" label="航空公司"
placeholder="例：三" placeholder=""
:rules="[(val) => !!val || '請輸本國名']" :rules="[(val) => !!val || '請輸航空公司名稱']"
ref="Name" ref="AirLine"
/> readonly>
</div> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy8">
<div :class="filedGuestWidth"> <q-input type="textarea" dense standout autofocus
<q-input v-model="parameters.AirLine" placeholder="請輸航空公司名稱" />
standout </q-popup-proxy>
v-model="parameters.ContactWay"
label="联络方式"
placeholder="例：WeChat"
:rules="[(val) => !!val || '請輸联络方式']"
ref="ContactWay"
>
</q-input>
</div>
<div :class="filedGuestWidth">
<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> </q-input>
</div>
<div :class="filedGuestWidth">
<div class="row items-center q-mt-md">
<span>選擇性別：</span>
<q-radio
v-model="parameters.Sex"
dense
:val="1"
label="男"
class="q-mr-lg"
/>
<q-radio v-model="parameters.Sex" dense :val="2" label="女" />
</div>
</div> </div>
</div> <div :class="filedGuestWidth">
</div>
<template v-if="details.CarType!=3">
<div class="text-subtitle1 text-weight-bolder q-my-md">{{details.CarType==1?'抵達':'起飛'}} 班机資料</div>
<q-separator color="grey-2" class="q-mt-md" />
<div
class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item"
>
<div class="text-subtitle1 q-pb-md text-weight-bold"></div>
<div class="row q-col-gutter-md">
<div :class="filedGuestWidth">
<q-input
standout
v-model="parameters.AirportTerminal"
label="航廈"
placeholder="例：航廈"
:rules="[(val) => !!val || '請輸航廈']"
ref="AirportTerminal"
/>
</div>
<div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="parameters.AirLine" v-model="parameters.FlightNumber"
label="航空公司" label="航班編號"
placeholder="" placeholder="例：CA123"
:rules="[(val) => !!val || '請輸航空公司名稱']" :rules="[(val) => !!val || '請輸航班編號']"
ref="AirLine" ref="FlightNumber"
mask="X"
reverse-fill-mask
/> />
</div>
<div :class="filedGuestWidth">
<q-input
standout
v-model="parameters.FlightNumber"
label="航班編號"
placeholder="例：CA123"
:rules="[(val) => !!val || '請輸航班編號']"
ref="FlightNumber"
/>
</div>
<div :class="filedGuestWidth">
<q-input
class="q-pb-md"
standout
:value="!flightTime?'':parameters.FlightTime"
:label="`航班${details.CarType==1?'抵達':'起飛'}時間`"
:rules="[(val) => !!val || `請选航班${details.CarType==1?'抵達':'起飛'}時間`]"
ref="FlightTime"
>
<template v-slot:append>
<q-icon name="event" class="cursor-pointer"></q-icon>
</template>
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy1">
<div class="row">
<!-- <q-date
mask="YYYY-MM-DD HH:mm"
:title="$t('search_date_begin')"
subtitle="選擇"
v-model="parameters.FlightTime"
:options="optionsFn"
/>
<div class="q-px-sm"></div> -->
<q-time format24h v-model="flightTime" mask="HH:mm"
@input="getTime(1)"/>
</div>
</q-popup-proxy>
</q-input>
</div>
</div> </div>
</div>
</template>
<div class="text-subtitle1 text-weight-bolder q-my-md">
{{details.CarType==1?'接机':details.CarType==2?'送机':'包车'}}資料
</div>
<q-separator color="grey-2" class="q-mt-md" />
<div
class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item"
>
<div class="text-subtitle1 q-pb-md text-weight-bold"></div>
<div class="row q-col-gutter-md">
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
class="q-pb-md"
standout standout
v-model="!getBusTime?'':parameters.OrderDate" :value="!flightTime?'':parameters.FlightTime"
label="接駁日期" :label="`航班${details.CarType==1?'抵達':'起飛'}時間`"
:rules="[(val) => !!val || '請选接駁日期']" :rules="[(val) => !!val || `請选航班${details.CarType==1?'抵達':'起飛'}時間`]"
ref="OrderDate" ref="FlightTime"
> >
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"></q-icon> <q-icon name="event" class="cursor-pointer"></q-icon>
</template> </template>
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy2"> <q-popup-proxy :offset="[0, 0]" ref="qDateProxy1">
<div class="row"> <div class="row">
<q-time format24h v-model="getBusTime" mask="HH:mm" <!-- <q-date
@input="getTime(2)"/> mask="YYYY-MM-DD HH:mm"
:title="$t('search_date_begin')"
subtitle="選擇"
v-model="parameters.FlightTime"
:options="optionsFn"
/>
<div class="q-px-sm"></div> -->
<q-time format24h v-model="flightTime" mask="HH:mm"
@input="getTime(1)"/>
</div> </div>
</q-popup-proxy> </q-popup-proxy>
</q-input> </q-input>
</div> </div>
<div :class="filedGuestWidth" v-if="details.CarType!=1"> </div>
<q-input </div>
standout </template>
v-model="parameters.GetonAddress"
label="上車地點" <div class="text-subtitle1 text-weight-bolder q-my-md">
placeholder="" {{details.CarType==1?'接机':details.CarType==2?'送机':'包车'}}資料
:rules="[(val) => !!val || '請輸上車地點和地址供司機參考']" </div>
ref="GetonAddress"> <q-separator color="grey-2" class="q-mt-md" />
<template v-slot:append> <div
<q-icon name="iconfont iconaddress" size="20px" class="q-mr-sm" @click="getAddress(1)"/> class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item"
</template> >
</q-input> <div class="text-subtitle1 q-pb-md text-weight-bold"></div>
</div> <div class="row q-col-gutter-md">
<div :class="filedGuestWidth" v-if="details.CarType!=2"> <div :class="filedGuestWidth">
<q-input
standout
v-model="!getBusTime?'':parameters.OrderDate"
label="接駁日期"
:rules="[(val) => !!val || '請选接駁日期']"
ref="OrderDate"
>
<template v-slot:append>
<q-icon name="event" class="cursor-pointer"></q-icon>
</template>
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy2">
<div class="row">
<q-time format24h v-model="getBusTime" mask="HH:mm"
@input="getTime(2)"/>
</div>
</q-popup-proxy>
</q-input>
</div>
<div :class="filedGuestWidth" v-if="details.CarType!=1">
<q-input <q-input
standout standout
v-model="parameters.GetoffAddress" v-model="parameters.GetonAddress"
label="下車地點" label="上車地點"
placeholder="" placeholder=""
:rules="[(val) => !!val || '請輸下車地點和地址供司機參考']" :rules="[(val) => !!val || '請輸上車地點供司機參考']"
ref="GetoffAddress"> ref="GetonAddress"
readonly>
<template v-slot:append> <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(1)"/> -->
</template> </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> </q-input>
</div>
</div> </div>
<div :class="filedGuestWidth" v-if="details.CarType!=2">
<q-input
standout
v-model="parameters.GetoffAddress"
label="下車地點"
placeholder=""
:rules="[(val) => !!val || '請輸下車地點供司機參考']"
ref="GetoffAddress"
readonly>
<template v-slot:append>
<!-- <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>
</div> </div>
<div class="text-subtitle1 text-weight-bolder q-my-md">乘客資料</div> </div>
<q-separator color="grey-2" class="q-mt-md" /> <div class="text-subtitle1 text-weight-bolder q-my-md">乘客資料</div>
<div <q-separator color="grey-2" class="q-mt-md" />
class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item" <div
> class="bg-grey-1 rounded-borders q-pa-md q-mt-md guest-item"
<div class="text-subtitle1 q-pb-md text-weight-bold">乘客数量</div> >
<div class="text-subtitle1 q-pb-md text-weight-bold">乘客数量</div>
<div class="row q-col-gutter-md">
<div :class="filedGuestWidth">
<q-input
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
standout
v-model="parameters.ChildNum"
label="兒童數(3-17岁)"
@input="getNum"
mask="#"
reverse-fill-mask
/>
</div>
<div :class="filedGuestWidth">
<q-input
standout
v-model="parameters.BabyNum"
label="嬰幼兒數(0-2岁)"
@input="getNum"
mask="#"
reverse-fill-mask
/>
</div>
</div>
<template v-if="details.CarType!=3">
<div class="text-subtitle1 q-py-md text-weight-bold">行李数量</div>
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md">
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
type="Number"
standout standout
v-model="parameters.ManNum" v-model="parameters.HandLuggageNum"
label="成人數(18-99岁)" label="手提行李"
@input="getNum" mask="#"
:rules="[(val) => !!val || '請輸成人數']" reverse-fill-mask
ref="ManNum"
/> />
</div> </div>
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
type="Number"
standout standout
v-model="parameters.ChildNum" v-model="parameters.RegisteredLuggageNum"
label="兒童數(3-17岁)" label="托运行李"
@input="getNum" mask="#"
/> reverse-fill-mask
</div>
<div :class="filedGuestWidth">
<q-input
type="Number"
standout
v-model="parameters.BabyNum"
label="嬰幼兒數(0-2岁)"
@input="getNum"
/> />
</div> </div>
</div> </div>
<template v-if="details.CarType!=3"> </template>
<div class="text-subtitle1 q-py-md text-weight-bold">行李数量</div> </div>
<div class="row q-col-gutter-md"> <div class="text-subtitle1 q-my-md text-weight-bold">特殊需求備註：</div>
<div :class="filedGuestWidth"> <q-input standout v-model="parameters.Remark" input-style="height:170px;" type="textarea" placeholder="此欄位僅限資料備註。不在商品規範內的個人需求，不保證提供" maxlength="200" counter />
<q-input </q-card>
type="Number" </div>
standout <div class="relative-position" v-if="details"
v-model="parameters.HandLuggageNum" :class="{
label="手提行李" 'q-ml-lg': !($q.screen.width < 1200 || $q.platform.is.mobile),
/> 'q-mt-lg full-width': $q.screen.width < 1200 || $q.platform.is.mobile,
</div> }"
<div :class="filedGuestWidth"> >
<q-input <div
type="Number" class="rounded-borders bg-white q-pa-md"
standout style="width: 300px"
v-model="parameters.RegisteredLuggageNum" :style="{
label="托运行李" width:
/> $q.screen.width < 1200 || $q.platform.is.mobile
</div> ? 'unset'
: '300px',
</div> position:$q.platform.is.mobile?'unset':'sticky',
</template> top:$q.platform.is.mobile?'unset':'50px',
</div>
<div class="text-subtitle1 q-my-md text-weight-bold">特殊需求備註：</div>
<q-input standout v-model="parameters.Remark" input-style="height:170px;" type="textarea" placeholder="此欄位僅限資料備註。不在商品規範內的個人需求，不保證提供" maxlength="200" counter />
</q-card>
</div>
<div class="relative-position" v-if="details"
:class="{
'q-ml-lg': !($q.screen.width < 1200 || $q.platform.is.mobile),
'q-mt-lg full-width': $q.screen.width < 1200 || $q.platform.is.mobile,
}" }"
> >
<div <div class="text-subtitle1 text-weight-bolder">付款明細</div>
class="rounded-borders bg-white q-pa-md" <div class="row q-mt-md">
style="width: 300px" <vue-core-video-players
:style="{ v-if="details.videoStr"
width: ref="video"
$q.screen.width < 1200 || $q.platform.is.mobile :src="details.videoStr"
? 'unset' :title="details.title"
: '300px', :muted="true"
position:$q.platform.is.mobile?'unset':'sticky', :autoplay="false"
top:$q.platform.is.mobile?'unset':'50px', @play="playHandler"
}" @pause="pauseHandler"
> @seeked="seekedChangeHandler"
<div class="text-subtitle1 text-weight-bolder">付款明細</div> @timeupdate="timeChangeHandler"
<div class="row q-mt-md"> logo="../statics/img/transparent_logo.png"
<vue-core-video-players :loop="false"
v-if="details.videoStr" id="trip_video"
ref="video" class="rounded-borders"
:src="details.videoStr" style="width: 80px"
:title="details.title" />
:muted="true" <q-img
:autoplay="false" v-else
@play="playHandler" :src="details?details.imgCover[0]:'https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg'"
@pause="pauseHandler" class="rounded-borders"
@seeked="seekedChangeHandler" spinner-color="grey-3"
@timeupdate="timeChangeHandler" style="width: 80px"
logo="../statics/img/transparent_logo.png" />
:loop="false" <div class="q-ml-md col">
id="trip_video" <div class="text-subtitle1 ellipsis">
class="rounded-borders" {{details.Name}}
style="width: 80px"
/>
<q-img
v-else
:src="details?details.imgCover[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"
/>
<div class="q-ml-md col">
<div class="text-subtitle1 ellipsis">
{{details.Name}}
</div>
<div class="text-caption text-grey-6 ellipsis q-mt-sm">
{{details.Description}}
</div>
</div>
</div>
<div class="q-mt-md text-grey-6">
<div class="row q-pb-xs" 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 style="width: 80px">上車點：</div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div>
</div> </div>
<div class="row q-pb-xs" v-if="parameters.GetoffAddress"> <div class="text-caption text-grey-6 ellipsis q-mt-sm">
<div style="width: 80px">下車點：</div> {{details.Description}}
<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}}
<!-- {{calculationAmount.startDate}} -->
</div>
</div> </div>
</div> </div>
<q-separator color="grey-2" class="q-my-md"/> </div>
<div class="text-grey-9"> <div class="q-mt-md text-grey-6">
<div class="row q-mb-sm" v-if="chosenObj.Count>0"> <div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name">
<div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div> <div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div>
<div>CNY {{ moneyFormat(sumPrice,2) }}</div> <div class="q-ml-md ellipsis-2-lines">{{AirportObj.Name}}</div>
</div> </div>
<!-- <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <div class="row q-pb-xs no-wrap" v-if="parameters.GetonAddress">
<div class="row q-mb-sm items-center" v-if="(chosenObj.Count)>0"> <div style="width: 80px">上車點：</div>
<div class="col">總金額</div> <div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div>
<div class="text-subtitle2 text-weight-bolder text-primary">CNY {{ moneyFormat(sumPrice,2) }}</div> </div>
</div> --> <div class="row q-pb-xs no-wrap" v-if="parameters.GetoffAddress">
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <div style="width: 80px">下車點：</div>
<div class="row q-mb-sm items-center" v-if="chosenObj.Count>0"> <div class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div>
<div class="col">支付金額</div> </div>
<div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(sumPrice,2) }}</div> <div class="row">
<div style="width: 80px">
<!-- 出發日期： -->
接駁日期：</div>
<div class="q-ml-md">
{{parameters.OrderDate}}
<!-- {{calculationAmount.startDate}} -->
</div> </div>
</div> </div>
<div class="text-right q-mt-md" v-if="step!=3"> </div>
<q-btn v-if="step!=3" unelevated color="primary" <q-separator color="grey-2" class="q-my-md"/>
:loading="loading" :label="step!=3?'立即支付':'已支付'" @click="submit()" <div class="text-grey-9">
:disable="step!=3&&loading"/> <div class="row q-mb-sm" v-if="chosenObj.Count>0">
<q-btn v-else unelevated color="primary" label=""/> <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
<div>{{details.CurrencyCode}} {{ 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="(chosenObj.Count)>0">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">{{details.CurrencyCode}} {{ 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="chosenObj.Count>0">
<div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(sumPrice,2) }}</div>
</div> </div>
</div> </div>
<div class="text-right q-mt-md" v-if="step!=3">
<q-btn v-if="step!=3" unelevated color="primary"
:loading="loading" :label="step!=3?'立即支付':'已支付'" @click="submit()"
:disable="step!=3&&loading"/>
<q-btn v-else unelevated color="primary" label=""/>
</div>
</div> </div>
</div> </div>
<q-dialog v-model="isShowDialog">
<q-card class="q-pa-lg" :style="{'width':$q.platform.is.desktop?'100%':'500px'}">
<div class="text-h6Detail">
<span>乘客{{onoffbus==1?'上':'下'}}車範圍</span>
<i class="iconfont iconbaseline-close-px" @click="isShowDialog=false"></i>
</div>
<q-separator />
<div style="max-height: 600px;padding:20px 0" class="scroll">
<componentsMap :AddressObj="onCarObj"/>
</div>
</q-card>
</q-dialog>
</div> </div>
</template> <q-dialog v-model="isShowDialog">
<q-card class="q-pa-lg" :style="{'width':$q.platform.is.desktop?'100%':'500px'}">
<script> <div class="text-h6Detail">
import { date } from 'quasar' <span>乘客{{onoffbus==1?'上':'下'}}車範圍</span>
import { json } from "body-parser"; <i class="iconfont iconbaseline-close-px" @click="isShowDialog=false"></i>
import coupon from '../../components/common/coupon.vue' </div>
import componentsMap from "../../components/car/Map.vue"; <q-separator />
export default { <div style="max-height: 600px;padding:20px 0" class="scroll">
components:{ <componentsMap :AddressObj="onCarObj"/>
coupon, </div>
componentsMap </q-card>
}, </q-dialog>
data() { <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'
import componentsMap from "../../components/car/Map.vue";
export default {
components:{
coupon,
componentsMap,
NoneData,
auth
},
data() {
return {
orderKey: "",
isRangeClick: true,
isShowDialog: false,
AddressObj: null,
onCarObj: null,//上车范围
unCarObj: null,//下车范围
CarObj: null,//车型
AirportObj: null,//机场
calculationAmount: null,//日期
calculationNum: null,//数量
sumPrice: null,//总价
details: null,//产品详情
options: {
currentPage: 0,
speed: 300,
itemAnimation: true,
centeredSlides: true,
thresholdDistance: 100,
thresholdTime: 300,
loopedSlides: 2,
slidesToScroll: 1,
loop: true,
},
OrderDate: null,//接收产品相关信息
step: 1,
userInfo: {
lastName: "",
firstName: "",
country: 0,
phone: "",
areaCode: "",
mail: "",
},
chosenObj: {},
isUpdateUserInfo: false,
countrys: [],
areaCodes: [],
loading: false,
parameters: {
OrderId: 0,
OrderType: 0,
OrderDate:'',//预定日期
Unit_Price: '',//单价
Num: '',//数量
Money: 0.0,
Sex: 1,//1男2女
SurName: '',//姓
Name: '',//名
Remark: '',
AirportId: '',
AirportTerminal: '',//航厦
AirLine: '',//航空公司名称
FlightNumber: '',//航班号
FlightTime: '',//航班时间
GetonAddress: '',//上车点
GetoffAddress: '',//下车点
ManNum: null,//成人数
ChildNum: null,//儿童数
BabyNum: null,//婴儿数
HandLuggageNum: null,//手提行李数量
RegisteredLuggageNum: null,//托运行李数量
ContactWay: '',//联络方式 WeChat
Mobile:'',//电话
ProductId: '',
CarId: '',//产品类型ID
pType: 1,//类型 1来源B2C
},
flightTime: null,//航班起飞抵达时间
getBusTime: null,//预约车时间
TotalPeople: 0,//总人数
onoffbus: 1,//1 上车 2下车
ErpOrderId: 0,//erp订单Id
};
},
computed: {
filedWidth() {
return { return {
isRangeClick: true, "col-12": this.$q.screen.width < 1200,
isShowDialog: false, "col-6": this.$q.screen.width >= 1200,
AddressObj: null,
onCarObj: null,//上车范围
unCarObj: null,//下车范围
CarObj: null,//车型
AirportObj: null,//机场
calculationAmount: null,//日期
calculationNum: null,//数量
sumPrice: null,//总价
details: null,//产品详情
options: {
currentPage: 0,
speed: 300,
itemAnimation: true,
centeredSlides: true,
thresholdDistance: 100,
thresholdTime: 300,
loopedSlides: 2,
slidesToScroll: 1,
loop: true,
},
OrderDate: null,//接收产品相关信息
step: 1,
userInfo: {
lastName: "",
firstName: "",
country: 0,
phone: "",
areaCode: "",
mail: "",
},
chosenObj: {},
isUpdateUserInfo: false,
countrys: [],
areaCodes: [],
loading: false,
parameters: {
OrderId: 0,
OrderType: 0,
OrderDate:'',//预定日期
Unit_Price: '',//单价
Num: '',//数量
Money: 0.0,
Sex: 1,//1男2女
SurName: '',//姓
Name: '',//名
Remark: '',
AirportId: '',
AirportTerminal: '',//航厦
AirLine: '',//航空公司名称
FlightNumber: '',//航班号
FlightTime: '',//航班时间
GetonAddress: '',//上车点
GetoffAddress: '',//下车点
ManNum: null,//成人数
ChildNum: null,//儿童数
BabyNum: null,//婴儿数
HandLuggageNum: null,//手提行李数量
RegisteredLuggageNum: null,//托运行李数量
ContactWay: '',//联络方式 WeChat
Mobile:'',//电话
ProductId: '',
CarId: '',//产品类型ID
pType: 1,//类型 1来源B2C
},
flightTime: null,//航班起飞抵达时间
getBusTime: null,//预约车时间
TotalPeople: 0,//总人数
onoffbus: 1,//1 上车 2下车
ErpOrderId: 0,//erp订单Id
}; };
}, },
computed: { filedGuestWidth() {
filedWidth() { return {
return { "col-12": this.$q.screen.width < 1200,
"col-12": this.$q.screen.width < 1200, "col-4": this.$q.screen.width >= 1200,
"col-6": this.$q.screen.width >= 1200, };
};
},
filedGuestWidth() {
return {
"col-12": this.$q.screen.width < 1200,
"col-4": this.$q.screen.width >= 1200,
};
},
}, },
created() {}, },
mounted() { created() {},
if(this.$route.query.OrderDate){ mounted() {
let obj = decodeURIComponent(this.$route.query.OrderDate) this.checkParamsHandler()
let OrderDate = JSON.parse(obj) this.initCountry();
this.CarObj = OrderDate.CarObj,//车型 this.initGuestHandler();
this.AirportObj = OrderDate.AirportObj,//机场 },
this.calculationAmount = OrderDate.calculationAmount,//日期 methods: {
this.chosenObj = OrderDate.calculationNum,//数量 checkParamsHandler() {
this.sumPrice = OrderDate.sumPrice,//总金额 try {
this.details = OrderDate.details//产品详情 if (this.$route.params && this.$route.params.id) {
this.onCarObj = OrderDate.onCarObj//上车范围 let key = this.$route.params.id;
this.unCarObj = OrderDate.unCarObj//下车范围 let pickuporderCars = localStorage.getItem("pickuporderCars");
let OrderDate = pickuporderCars ? JSON.parse(pickuporderCars) : null;
if (OrderDate) {
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
}
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;
}
}
}
} catch (error) {
console.log(error);
} }
this.parameters.ProductId = this.details.Id if (this.orderKey == "") {
this.parameters.OrderDate = this.calculationAmount.startDate setTimeout(() => {
if(this.details.CarType!=3){
this.parameters.AirportId = this.AirportObj.Id }, 3000);
this.parameters.FlightTime = this.calculationAmount.startDate
} }
this.parameters.CarId = this.CarObj.Id return this.orderKey != "";
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: {
submit(){ submit(){
let flag = false let flag = false
this.$refs.mail.validate() this.$refs.mail.validate()
this.$refs.SurName.validate() this.$refs.SurName.validate()
this.$refs.Name.validate() this.$refs.Name.validate()
this.$refs.ContactWay.validate() this.$refs.ContactWay.validate()
this.$refs.Mobile.validate() this.$refs.Mobile.validate()
this.$refs.OrderDate.validate() this.$refs.OrderDate.validate()
this.$refs.ManNum.validate() this.$refs.ManNum.validate()
if(this.details.CarType!=3){
this.$refs.AirportTerminal.validate() if(this.details.CarType!=3){
this.$refs.AirLine.validate() this.$refs.AirportTerminal.validate()
this.$refs.FlightNumber.validate() this.$refs.AirLine.validate()
this.$refs.FlightTime.validate() this.$refs.FlightNumber.validate()
if(this.details.CarType!=1){ this.$refs.FlightTime.validate()
this.$refs.GetonAddress.validate() if(this.details.CarType!=1){
flag = !this.$refs.SurName.hasError&& !this.$refs.Name.hasError&& !this.$refs.ContactWay.hasError
&& !this.$refs.Mobile.hasError&& !this.$refs.OrderDate.hasError&& !this.$refs.ManNum.hasError
&& !this.$refs.AirportTerminal.hasError&& !this.$refs.AirLine.hasError&& !this.$refs.FlightNumber.hasError
&& !this.$refs.FlightTime.hasError&& !this.$refs.GetonAddress.hasError&& !this.$refs.mail.hasError
}else{
this.$refs.GetoffAddress.validate()
flag = !this.$refs.SurName.hasError&& !this.$refs.Name.hasError&& !this.$refs.ContactWay.hasError
&& !this.$refs.Mobile.hasError&& !this.$refs.OrderDate.hasError&& !this.$refs.ManNum.hasError
&& !this.$refs.AirportTerminal.hasError&& !this.$refs.AirLine.hasError&& !this.$refs.FlightNumber.hasError
&& !this.$refs.FlightTime.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError
}
}else{
this.$refs.GetonAddress.validate() this.$refs.GetonAddress.validate()
flag = !this.$refs.SurName.hasError&& !this.$refs.Name.hasError&& !this.$refs.ContactWay.hasError
&& !this.$refs.Mobile.hasError&& !this.$refs.OrderDate.hasError&& !this.$refs.ManNum.hasError
&& !this.$refs.AirportTerminal.hasError&& !this.$refs.AirLine.hasError&& !this.$refs.FlightNumber.hasError
&& !this.$refs.FlightTime.hasError&& !this.$refs.GetonAddress.hasError&& !this.$refs.mail.hasError
}else{
this.$refs.GetoffAddress.validate() this.$refs.GetoffAddress.validate()
flag = !this.$refs.SurName.hasError&& !this.$refs.Name.hasError&& !this.$refs.ContactWay.hasError flag = !this.$refs.SurName.hasError&& !this.$refs.Name.hasError&& !this.$refs.ContactWay.hasError
&& !this.$refs.Mobile.hasError&& !this.$refs.OrderDate.hasError&& !this.$refs.ManNum.hasError && !this.$refs.Mobile.hasError&& !this.$refs.OrderDate.hasError&& !this.$refs.ManNum.hasError
&& !this.$refs.GetonAddress.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError && !this.$refs.AirportTerminal.hasError&& !this.$refs.AirLine.hasError&& !this.$refs.FlightNumber.hasError
&& !this.$refs.FlightTime.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError
} }
if(!flag) return }else{
this.SetCarOrder() this.$refs.GetonAddress.validate()
}, this.$refs.GetoffAddress.validate()
SetCarOrder(){ flag = !this.$refs.SurName.hasError&& !this.$refs.Name.hasError&& !this.$refs.ContactWay.hasError
this.loading = true && !this.$refs.Mobile.hasError&& !this.$refs.OrderDate.hasError&& !this.$refs.ManNum.hasError
this.apipost( && !this.$refs.GetonAddress.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError
"CarSingle_post_SetTYCarOrder", }
this.parameters, if(!flag) return this.goScrollToForm('baseUserInfoTitle')
(r) => { this.SetCarOrder()
// this.$refs.myform.resetValidation() },
if (r.data.resultCode == 1) { goScrollToForm(formName){
this.step = 2 let temp=this.$refs[formName]
let ErpOrderId = r.data.data.Id let formObj = temp instanceof Array ? temp[0] : temp
this.AddOrderInfo(ErpOrderId) window.scrollTo(0,formObj.offsetTop)
}else{ },
this.$q.notify({ SetCarOrder(){
type: "negative", this.loading = true
message: r.data.message, this.apipost(
position: "top", "CarSingle_post_SetTYCarOrder",
timeout: 2000, this.parameters,
}); (r) => {
this.loading = false // this.$refs.myform.resetValidation()
} if (r.data.resultCode == 1) {
}) this.step = 2
}, let ErpOrderId = r.data.data.Id
AddOrderInfo(ErpOrderId){ this.AddOrderInfo(ErpOrderId)
this.apipost( }else{
"AddOrderInfo_post", this.$q.notify({
{ type: "negative",
SurName: this.parameters.SurName, message: r.data.message,
Name: this.parameters.Name, position: "top",
ContactNumber: this.parameters.Mobile,// 联系电话 timeout: 2000,
Mailbox: this.userInfo.mail,//邮箱 });
GoodsId: this.parameters.ProductId,//商品id
GoodsName: this.details.Name,//商品名称
GoodsPic: this.details.imgCover[0],//商品图片
GoodsType: this.parameters.OrderType,//商品类型（见枚举）
OrderMake: this.parameters.OrderDate,//订单摘要（例如出行时间）
TotalPrice: this.parameters.Money,//总价格
PreferentialPrice: 0,// 优惠总金额
ErpOrderId: ErpOrderId,//erp订单id
Country: this.userInfo.country,//国家id
PlatformTax: 0,//平台税金默认0
Income: 0,//已收默认0
Refund: 0,//退款金额默认0
OrderSource: this.parameters.pType
},
(r) => {
if (r.data.resultCode == 1) {
this.step = 3
}else{
this.$q.notify({
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000,
});
}
this.loading = false this.loading = false
}) }
}, })
// 航班起飞抵达时间 },
getTime(type){ AddOrderInfo(ErpOrderId){
// 1航班时间 2预约时间 let GoodsType = null
this.onoffbus = type //13接机 14送机 12包车
if(type==1){ if(this.parameters.OrderType==1){
this.parameters.FlightTime = this.calculationAmount.startDate+' '+this.flightTime GoodsType = 13
this.$refs.qDateProxy1.hide() }else if(this.parameters.OrderType==2){
}else if(type==2){ GoodsType = 14
this.parameters.OrderDate = this.calculationAmount.startDate+' '+this.getBusTime }else if(this.parameters.OrderType==3){
this.$refs.qDateProxy2.hide() GoodsType = 12
} }
this.apipost(
}, "AddOrderInfo_post",
optionsFn(cd) { {
return ( SurName: this.parameters.SurName,
cd >= Name: this.parameters.Name,
date.formatDate(date.addToDate(new Date(), { days: 0 }), "YYYY/MM/DD") ContactNumber: this.parameters.Mobile,// 联系电话
); Mailbox: this.userInfo.mail,//邮箱
}, GoodsId: this.parameters.ProductId,//商品id
// 地图上选址 GoodsName: this.details.Name,//商品名称
getAddress(type){ GoodsPic: this.details.imgCover[0],//商品图片
if(type==1){ GoodsType: GoodsType,//商品类型（见枚举）
this.AddressObj = this.onCarObj OrderMake: this.parameters.OrderDate,//订单摘要（例如出行时间）
}else{ TotalPrice: this.parameters.Money,//总价格
this.AddressObj = this.unCarObj PreferentialPrice: 0,// 优惠总金额
} ErpOrderId: ErpOrderId,//erp订单id
this.isShowDialog = true Country: this.userInfo.country,//国家id
}, PlatformTax: 0,//平台税金默认0
// 计算人数 Income: 0,//已收默认0
getNum(){ Refund: 0,//退款金额默认0
this.TotalPeople = this.parameters.ManNum+this.parameters.ChildNum+this.parameters.BabyNum OrderSource: this.parameters.pType
}, },
// 音频 (r) => {
slideHandler(e) { if (r.data.resultCode == 1) {
this.options.currentPage = e.currentPage; this.step = 3
if ( this.$q.notify({
e.currentPage != 0 && color: "green-4",
this.$refs.video && textColor: "white",
this.$refs.video.isPlaying icon: "cloud_done",
) { message: "訂單提交成功",
this.$refs.video.pause(); position:'center',
} });
}, }else{
playHandler(e) {}, this.$q.notify({
pauseHandler(e) {}, type: "negative",
timeChangeHandler(e) { message: r.data.message,
//console.log(e) position: "top",
}, timeout: 2000,
// });
seekedChangeHandler(e) { }
//console.log(e) this.loading = false
}, })
initGuestHandler() { },
// 航班起飞抵达时间
}, getTime(type){
// 初始化国家 // 1航班时间 2预约时间
initCountry() { this.onoffbus = type
this.apipost("GetCountryInfo_post", {}, (r) => { if(type==1){
this.parameters.FlightTime = this.calculationAmount.startDate+' '+this.flightTime
this.$refs.qDateProxy1.hide()
}else if(type==2){
this.parameters.OrderDate = this.calculationAmount.startDate+' '+this.getBusTime
this.$refs.qDateProxy2.hide()
}
},
optionsFn(cd) {
return (
cd >=
date.formatDate(date.addToDate(new Date(), { days: 0 }), "YYYY/MM/DD")
);
},
// 地图上选址
getAddress(type){
if(type==1){
this.AddressObj = this.onCarObj
}else{
this.AddressObj = this.unCarObj
}
this.isShowDialog = true
},
// 计算人数
getNum(){
this.TotalPeople = this.parameters.ManNum+this.parameters.ChildNum+this.parameters.BabyNum
},
// 音频
slideHandler(e) {
this.options.currentPage = e.currentPage;
if (
e.currentPage != 0 &&
this.$refs.video &&
this.$refs.video.isPlaying
) {
this.$refs.video.pause();
}
},
playHandler(e) {},
pauseHandler(e) {},
timeChangeHandler(e) {
//console.log(e)
},
//
seekedChangeHandler(e) {
//console.log(e)
},
initGuestHandler() {
},
// 初始化国家
initCountry() {
this.apipost("GetCountryInfo_post", {}, (r) => {
if (r.data.resultCode == 1) {
this.countrys = r.data.data.countList; this.countrys = r.data.data.countList;
this.userInfo.country = this.countrys[0].ID; this.userInfo.country = this.countrys[0].ID;
...@@ -801,61 +874,61 @@ ...@@ -801,61 +874,61 @@
let temp = this.countrys.find((y) => y.ID == x.ID); let temp = this.countrys.find((y) => y.ID == x.ID);
x.EnName = `${temp.EnName}(${x.PhoneCode})`; x.EnName = `${temp.EnName}(${x.PhoneCode})`;
}); });
}); }
}, });
changeCountry(id) {
this.userInfo.areaCode = this.areaCodes.find((x) => x.ID == id).PhoneCode;
},
}, },
}; changeCountry(id) {
</script> this.userInfo.areaCode = this.areaCodes.find((x) => x.ID == id).PhoneCode;
},
<style> },
.order-preview .q-stepper__content { };
display: none !important; </script>
}
.order-preview .q-toggle__track { <style>
height: 0.7em; .order-preview .q-stepper__content {
border-radius: 0.35em; display: none !important;
opacity: 0.38; }
width: 50px; .order-preview .q-toggle__track {
} height: 0.7em;
.order-preview .q-toggle__thumb { border-radius: 0.35em;
top: 0.42em; opacity: 0.38;
left: 0.45em; width: 50px;
width: 0.5em; }
height: 0.5em; .order-preview .q-toggle__thumb {
transition: left 0.22s ease-in-out; top: 0.42em;
user-select: none; left: 0.45em;
z-index: 0; width: 0.5em;
} height: 0.5em;
.order-preview .q-toggle__inner--truthy .q-toggle__thumb { transition: left 0.22s ease-in-out;
left: 0.94em; user-select: none;
} z-index: 0;
.order-preview .q-toggle__inner { }
width: 1.9em; .order-preview .q-toggle__inner--truthy .q-toggle__thumb {
} left: 0.94em;
.order-preview .q-toggle__label { }
margin-top: 12px; .order-preview .q-toggle__inner {
} width: 1.9em;
.guest-item:hover{ }
background: rgba(241,65,108,.04) !important; .order-preview .q-toggle__label {
} margin-top: 12px;
.text-h6Detail { }
text-align: center; .guest-item:hover{
font-size: 18px; background: rgba(241,65,108,.04) !important;
color: #333; }
font-weight: 700; .text-h6Detail {
position: relative; text-align: center;
width:100%; font-size: 18px;
height:50px; color: #333;
} font-weight: 700;
.text-h6Detail i { position: relative;
position: absolute; width:100%;
right:20px; height:50px;
top:10px; }
cursor: pointer; .text-h6Detail i {
font-size:23px; position: absolute;
} right:20px;
</style> top:10px;
cursor: pointer;
\ No newline at end of file font-size:23px;
}
</style>
src/pages/detailsCar.vue
View file @ 7cbd3931
<template> <template>
<div style="min-height: 80vh"> <div style="min-height: 80vh">
<div <div
style=" style="
position: fixed; position: fixed;
...@@ -22,7 +23,7 @@ ...@@ -22,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
...@@ -172,7 +173,7 @@ ...@@ -172,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>
...@@ -326,7 +327,7 @@ ...@@ -326,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
...@@ -597,10 +598,12 @@ ...@@ -597,10 +598,12 @@
</div> </div>
</template> </template>
</div> </div>
<!-- <auth></auth> -->
</div> </div>
</template> </template>
<script> <script>
import auth from "src/components/common/auth.vue";
import { slider, slideritem } from "vue-concise-slider"; import { slider, slideritem } from "vue-concise-slider";
import calendar from "../components/trip/calendar.vue"; import calendar from "../components/trip/calendar.vue";
import OrderPreview from "src/components/car/orderPreview.vue"; import OrderPreview from "src/components/car/orderPreview.vue";
...@@ -729,7 +732,8 @@ export default { ...@@ -729,7 +732,8 @@ export default {
smaple, smaple,
Trip, Trip,
block, block,
componentsMap componentsMap,
auth,
}, },
watch: { watch: {
days: { days: {
......
src/pages/usercenter/setUserInfo.vue
View file @ 7cbd3931
...@@ -326,9 +326,6 @@ export default { ...@@ -326,9 +326,6 @@ export default {
console.log('this.$refs[item]', this, item, this.$refs[item]) console.log('this.$refs[item]', this, item, this.$refs[item])
this.$refs[item].validate(); this.$refs[item].validate();
}); });
// this.$refs.Surname.validate();
// this.$refs.Name.validate();
// this.$refs.BirthDate.validate();
verifyArr.forEach((item) => { verifyArr.forEach((item) => {
console.log('item', item) console.log('item', item)
if (this.$refs[item].hasError) { if (this.$refs[item].hasError) {
......
src/pages/usercenter/setUsersList.vue
View file @ 7cbd3931
...@@ -5,7 +5,25 @@ ...@@ -5,7 +5,25 @@
margin: 10px; margin: 10px;
} }
.content { .content {
max-width: 940px; width: 900px;
}
.title {
margin-top: 20px;
margin-bottom: 10px;
}
.card {
margin: 10px;
background: #ffffff;
border: 1px solid #eeeeee;
border-radius: 8px;
}
.card-title {
height: 37px;
height: 37px;
padding: 0 20px;
line-height: 37px;
background: #f5f5f5;
border-radius: 8px 8px 0px 0px;
} }
.tips { .tips {
height: 42px; height: 42px;
...@@ -17,149 +35,401 @@ ...@@ -17,149 +35,401 @@
::v-deep .q-field__control { ::v-deep .q-field__control {
height: 40px; height: 40px;
} }
::v-deep .q-field--auto-height .q-field__control {
min-height: 40px;
}
::v-deep .q-field__marginal {
height: 40px;
}
.title { .title {
margin-top: 20px; margin-top: 20px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.phone {
margin-left: 100px;
}
.name {
width: 300px;
}
.user-name {
width: 120px;
}
.pay-info {
width: 120px;
}
.order-info {
width: 120px;
}
.order-action {
width: 120px;
}
.nav-item {
width: 100px;
margin: 0 10px;
text-align: center;
}
.border-bottom {
width: 20px;
height: 4px;
border-radius: 2px;
background-color: $primary;
margin: -8px auto 0 auto;
}
</style> </style>
<template> <template>
<div class="content q-ma-lg bg-white q-pa-lg"> <div class="content q-ma-lg bg-white">
<div class="tips">
出行人<span class="text-grey-6"
>共計 3人，最多新增20人(含本人)</span
>
</div>
<div> <div>
<div> <div class="card" v-for="item in pageData" :key="item.id">
<div class="row"> <div class="flex card-title justify-between">
<div class="col"> <div class="flex">
<div class="title">姓</div> <span>订单号</span>
<q-input <span class="phone">联系客服</span>
class="form-item"
v-model="form.firstName"
outlined
placeholder="姓"
ref="firstName"
:rules="[(val) => val !== '' || '请输入姓氏']"
></q-input>
</div>
<div class="col">
<div class="title">名</div>
<q-input
ref="lastName"
class="form-item"
placeholder="名"
v-model="form.lastName"
outlined
:rules="[(val) => val !== '' || '请输入名字']"
></q-input>
</div> </div>
<span>
<span>编辑</span>
<span>删除</span>
</span>
</div> </div>
<div class="row"> <div class="flex q-py-sm">
<div class="col"> <div class="row">
<div class="title">姓氏（需與旅遊證件一致）</div> <div class="col-12">中國內地身份證：510181********0920</div>
<q-input <div class="col-12">中國內地身份證：510181********0920</div>
class="form-item"
v-model="form.firstName"
outlined
placeholder="姓氏（需與旅遊證件一致）"
ref="firstName"
:rules="[(val) => val !== '' || '请输入姓氏']"
></q-input>
</div>
<div class="col">
<div class="title">名字（需與旅遊證件一致）</div>
<q-input
ref="lastName"
class="form-item"
placeholder="名字（需與旅遊證件一致）"
v-model="form.lastName"
outlined
:rules="[(val) => val !== '' || '请输入名字']"
></q-input>
</div> </div>
</div> </div>
<div class="row">
<div class="col">
<div class="title">居住國家/地區</div>
<q-select filled v-model="model" :options="options" label="Filled" />
</div>
<div class="col">
<div class="title">稱謂</div>
<q-select filled v-model="model" :options="options" label="Filled" />
</div>
</div>
<div class="row">
<div class="col">
<div class="title">國家/地區代碼</div>
<q-select filled v-model="model" :options="options" label="Filled" />
</div>
<div class="col">
<div class="title">電話（首次需驗證）</div>
<q-input
ref="lastName"
class="form-item"
placeholder="名字（需與旅遊證件一致）"
v-model="form.lastName"
outlined
:rules="[(val) => val !== '' || '请输入名字']"
></q-input>
</div>
</div>
<div class="row">
<div class="col">
<div class="title">出生日期</div><q-date
v-model="date"
minimal
/>
</div>
<div class="col">
<div class="title">電子郵件（接收订单确认邮件）</div>
<q-input
ref="lastName"
class="form-item"
placeholder="名字（需與旅遊證件一致）"
v-model="form.lastName"
outlined
:rules="[(val) => val !== '' || '请输入名字']"
></q-input>
</div>
</div>
<div>
<q-btn color="primary" unelevated label="保存" @click="submit" />
</div>
</div> </div>
</div> </div>
<q-btn
color="primary"
unelevated
outline
@click="isShowDialog = true"
label="添加出行人"
></q-btn>
<q-dialog content-style="width: 900px" v-model="isShowDialog">
<div class="bg-white dialog-box" style="width: 800px; padding: 20px">
<div>添加邮寄地址</div>
<form @submit.prevent.stop="submit" class="q-gutter-md">
<div>
<div class="row">
<div class="col">
<div class="title">姓</div>
<q-input
class="form-item"
v-model="form.Surname"
outlined
placeholder="姓"
ref="Surname"
:rules="[(val) => !!val || '请输入姓氏']"
></q-input>
</div>
<div class="col">
<div class="title">名</div>
<q-input
ref="Name"
class="form-item"
placeholder="名"
v-model="form.Name"
outlined
:rules="[(val) => !!val || '请输入名字']"
></q-input>
</div>
</div>
<div class="row">
<div class="col">
<div class="title">姓氏（需與旅遊證件一致）</div>
<q-input
class="form-item"
v-model="form.EnName"
outlined
placeholder="姓氏（需與旅遊證件一致）"
ref="EnName"
:rules="[(val) => !!val || '请输入姓氏（需與旅遊證件一致）']"
></q-input>
</div>
<div class="col">
<div class="title">名字（需與旅遊證件一致）</div>
<q-input
ref="EnSurname"
class="form-item"
placeholder="名字（需與旅遊證件一致）"
v-model="form.EnSurname"
outlined
:rules="[(val) => !!val || '请输入名字（需與旅遊證件一致）']"
></q-input>
</div>
</div>
<div class="row">
<div class="col">
<div class="title">國家/地區代碼</div>
<q-select
ref="PhoneCountry"
square
outlined
option-value="ID"
option-label="PhoneCode"
class="form-item"
v-model="form.PhoneCountry"
:options="phoneCountList"
placeholder="Filled"
:rules="[(val) => Boolean(val) || '请选择國家/地區代碼']"
/>
</div>
<div class="col">
<div class="title">電話（首次需驗證）</div>
<q-input
ref="Moblie"
class="form-item"
placeholder="電話（首次需驗證）"
v-model="form.Moblie"
outlined
:rules="[(val) => !!val || '请输入電話（首次需驗證）']"
></q-input>
</div>
</div>
<div
v-for="(item, index) in form.CardList"
:key="item.id"
class="row"
>
<div class="col">
<div class="title">证件类型</div>
<q-select
ref="card"
square
outlined
option-value="ID"
option-label="Name"
class="form-item"
v-model="item.Type"
:options="cardList"
placeholder="Filled"
:rules="[(val) => Boolean(val) || '请选择國家/地區代碼']"
/>
</div>
<div class="col">
<div class="flex justify-between items-center">
<div class="title">证件号码</div>
<div v-if="index > 0" @click="deleteCardItem(item)">删除</div>
</div>
<q-input
class="form-item"
placeholder="電話（首次需驗證）"
v-model="item.CardNo"
outlined
:rules="[(val) => !!val || '请输入電話（首次需驗證）']"
></q-input>
</div>
</div>
<q-btn
color="primary"
@click="addCard"
unelevated
outline
label="新增证件"
/>
<div>
<q-btn color="primary" type="submit" unelevated label="保存" />
</div>
</div>
</form>
</div>
</q-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
isShowDialog: false,
selectedKey: "全部",
form: { form: {
lastName: "", Surname: "",
firstName: "", Name: "",
EnName: "",
EnSurname: "",
Moblie: "",
CardList: [],
}, },
model: '', model: "",
date: '', date: "",
options: [] options: [],
cardList: [],
phoneCountList: [],
count: 0,
pageData: [],
}; };
}, },
mounted() {
this.id = 0;
this.addCard();
this.getUsersList();
this.getCountryInfo();
this.getCardTypeList();
},
methods: { methods: {
getCardTypeList() {
this.apipost(
"b2c_post_GetTripCardEnumList",
{},
(res) => {
if (res.data.resultCode == 1) {
this.cardList = res.data.data;
} else {
// this.$notify(res.data.message);
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
null
);
},
getCountryInfo() {
this.apipost(
"GetCountryInfo_post",
{},
(res) => {
if (res.data.resultCode == 1) {
const { phoneCountList, countList } = res.data.data;
this.countList = countList;
this.phoneCountList = phoneCountList;
} else {
// this.$notify(res.data.message);
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
null
);
},
changeCouponType(item) {
this.selectedKey = item;
},
addCard() {
this.id++;
this.form.CardList.push({
id: this.id,
});
},
deleteCardItem(card) {
const index = this.form.CardList.findIndex(item => item.id === card.id)
this.form.CardList.splice(index, 1)
},
submit() { submit() {
const verifyArr = ['fastName', 'lastName']; this.formHasError = false;
const verifyArr = [
"Surname",
"Name",
"EnName",
"EnSurname",
"Moblie",
];
verifyArr.forEach((item) => { verifyArr.forEach((item) => {
console.log("this.$refs[item]", this, item, this.$refs[item]);
this.$refs[item].validate(); this.$refs[item].validate();
}); });
verifyArr.forEach((item) => { verifyArr.forEach((item) => {
if (item.$refs[item].hasError) { console.log("item", item);
if (this.$refs[item].hasError) {
console.log("item", item);
this.formHasError = true; this.formHasError = true;
} }
}); });
if ((this.formHasError = true)) { console.log("this.formHasError", this.formHasError, this.form);
if (this.formHasError) {
return; return;
} }
this.submitUserInfo();
},
getUsersList() {
this.apipost(
"b2c_post_GetTripGuestPageList",
{pageIndex: 1, pageSize: 20},
(res) => {
if (res.data.resultCode == 1) {
const { count, pageData } = res.data.data;
this.count = count;
this.pageData = pageData;
} else {
// this.$notify(res.data.message);
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
null
);
},
deleteUser() {
this.apipost(
"b2c_post_DelTripGuestInfo",
{
Id: this.userInfo?.id,
},
(res) => {
if (res.data.resultCode == 1) {
this.$q.notify({
type: "positive",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
this.getUsersList();
} else {
// this.$notify(res.data.message);
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
null
);
},
submitUserInfo() {
let params = { ...this.form };
params.PhoneCountry = params.PhoneCountry.ID;
params.CardList.forEach(item => {
item.Type = item.Type.Id
})
this.apipost(
"b2c_post_SetTripGuestInfo",
params,
(res) => {
if (res.data.resultCode == 1) {
this.$q.notify({
type: "positive",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
} else {
// this.$notify(res.data.message);
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
null
);
}, },
}, },
}; };
......
src/router/routes.js
View file @ 7cbd3931
...@@ -33,7 +33,7 @@ const routes = [{ ...@@ -33,7 +33,7 @@ const routes = [{
component: () => component: () =>
import ('pages/detailsCar.vue') import ('pages/detailsCar.vue')
}, { // 包车，接机下单 }, { // 包车，接机下单
path: '/PickuporderForm', path: '/PickuporderForm/:id',
component: () => component: () =>
import ('pages/Pickuporder/orderForm.vue') import ('pages/Pickuporder/orderForm.vue')
}, { // 酒店 }, { // 酒店
......
yarn.lock
View file @ 7cbd3931
...@@ -3395,6 +3395,11 @@ dashdash@^1.12.0: ...@@ -3395,6 +3395,11 @@ dashdash@^1.12.0:
dependencies: dependencies:
assert-plus "^1.0.0" assert-plus "^1.0.0"
dayjs@^1.11.7:
version "1.11.7"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
de-indent@^1.0.2: de-indent@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz" resolved "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz"
...@@ -3618,6 +3623,13 @@ dom-serializer@^1.0.1: ...@@ -3618,6 +3623,13 @@ dom-serializer@^1.0.1:
domhandler "^4.2.0" domhandler "^4.2.0"
entities "^2.0.0" entities "^2.0.0"
dom7@^2.1.3:
version "2.1.5"
resolved "https://registry.yarnpkg.com/dom7/-/dom7-2.1.5.tgz#a79411017800b31d8400070cdaebbfc92c1f6377"
integrity sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==
dependencies:
ssr-window "^2.0.0"
domain-browser@^1.1.1: domain-browser@^1.1.1:
version "1.2.0" version "1.2.0"
resolved "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz" resolved "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz"
...@@ -8583,6 +8595,16 @@ sshpk@^1.7.0: ...@@ -8583,6 +8595,16 @@ sshpk@^1.7.0:
safer-buffer "^2.0.2" safer-buffer "^2.0.2"
tweetnacl "~0.14.0" tweetnacl "~0.14.0"
ssr-window@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-1.0.1.tgz#30752a6a4666e7767f0b7e6aa6fc2fdbd0d9b369"
integrity sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==
ssr-window@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-2.0.0.tgz#98c301aef99523317f8d69618f0010791096efc4"
integrity sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==
ssri@^6.0.1: ssri@^6.0.1:
version "6.0.2" version "6.0.2"
resolved "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz" resolved "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz"
...@@ -8894,6 +8916,19 @@ svgo@^1.0.0: ...@@ -8894,6 +8916,19 @@ svgo@^1.0.0:
unquote "~1.1.1" unquote "~1.1.1"
util.promisify "~1.0.0" util.promisify "~1.0.0"
swiper@3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/swiper/-/swiper-3.0.4.tgz#6a9810d33431bb05dbfa4276a8338e20968e3e12"
integrity sha512-t/EPKnUHHtH1A3Owj904EO8kWy6QVLeuVT2p1/P/TAzuvY5AI/37265o8f2OrVCK/qoafJ8mT52ymOGb6M0BbA==
swiper@^4.0.7:
version "4.5.1"
resolved "https://registry.yarnpkg.com/swiper/-/swiper-4.5.1.tgz#ed43998e780ceb478610079c8d23fd425eca636f"
integrity sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==
dependencies:
dom7 "^2.1.3"
ssr-window "^1.0.1"
table@5.4.6: table@5.4.6:
version "5.4.6" version "5.4.6"
resolved "https://registry.npmmirror.com/table/-/table-5.4.6.tgz" resolved "https://registry.npmmirror.com/table/-/table-5.4.6.tgz"
...@@ -9481,6 +9516,14 @@ vm-browserify@^1.0.1: ...@@ -9481,6 +9516,14 @@ vm-browserify@^1.0.1:
resolved "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz" resolved "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
vue-awesome-swiper@^3.0.4:
version "3.1.3"
resolved "https://registry.yarnpkg.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz#05500b501ffb3fec9bf7eb9985bcf4ae8360ed9e"
integrity sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==
dependencies:
object-assign "^4.1.1"
swiper "^4.0.7"
vue-concise-slider@^4.2.5: vue-concise-slider@^4.2.5:
version "4.2.5" version "4.2.5"
resolved "https://registry.yarnpkg.com/vue-concise-slider/-/vue-concise-slider-4.2.5.tgz#4ff799e91b8148041ede12d1d3d994fdd5f8e354" resolved "https://registry.yarnpkg.com/vue-concise-slider/-/vue-concise-slider-4.2.5.tgz#4ff799e91b8148041ede12d1d3d994fdd5f8e354"
...@@ -9584,6 +9627,11 @@ vue@^2.6.10: ...@@ -9584,6 +9627,11 @@ vue@^2.6.10:
"@vue/compiler-sfc" "2.7.14" "@vue/compiler-sfc" "2.7.14"
csstype "^3.1.0" csstype "^3.1.0"
vuelidate@^0.7.7:
version "0.7.7"
resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.7.tgz#5df3930a63ddecf56fde7bdacea9dbaf0c9bf899"
integrity sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==
vuex@3.4.0: vuex@3.4.0:
version "3.4.0" version "3.4.0"
resolved "https://registry.npmmirror.com/vuex/-/vuex-3.4.0.tgz" resolved "https://registry.npmmirror.com/vuex/-/vuex-3.4.0.tgz"
......
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