Skip to content

M
million
Commit f53c40bd authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 8f964182 60ca5550
Show whitespace changes
Inline Side-by-side
Showing with 1361 additions and 1033 deletions
package.json
View file @ f53c40bd
...@@ -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"
......
src/boot/message.js 0 → 100644
View file @ f53c40bd
import { Notify, QSpinnerIos } from 'quasar'
const message = {
warn: (msg) => {
Notify.create({
message: msg,
color: 'warning',
textColor: 'dark',
position: 'top',
icon: 'announcement'
})
},
error: (msg) => {
Notify.create({
message: msg,
type: 'negative',
position: 'top'
})
},
success: (msg) => {
Notify.create({
message: msg,
color: 'positive',
position: 'top',
textColor: 'white',
icon: 'check'
})
}
}
export default message
\ No newline at end of file
src/boot/user.js
View file @ f53c40bd
...@@ -18,7 +18,7 @@ const user = { ...@@ -18,7 +18,7 @@ const user = {
if (u) { if (u) {
localStorage.setItem('b2bUser', JSON.stringify(u)) localStorage.setItem('b2bUser', JSON.stringify(u))
} else { } else {
localStorage.setItem('b2bUser', JSON.stringify(u)) //localStorage.removeItem('b2bUser')
} }
}, },
loginOut() { loginOut() {
......
src/boot/utils.js
View file @ f53c40bd
...@@ -2,17 +2,17 @@ import Vue from 'vue' ...@@ -2,17 +2,17 @@ import Vue from 'vue'
import axios from 'axios' import axios from 'axios'
import md5 from 'js-md5' import md5 from 'js-md5'
// import {eventBus} from './eventBus' // import {eventBus} from './eventBus'
// import VueCoreVideoPlayer from 'vue-core-video-players' import VueCoreVideoPlayer from 'vue-core-video-players'
import 'viewerjs/dist/viewer.css' import 'viewerjs/dist/viewer.css'
import Vuelidate from 'vuelidate'
import user from './user' import user from './user'
import message from './message'
import VueViewer from 'v-viewer' import VueViewer from 'v-viewer'
// import VueCoreVideoPlayer from 'vue-core-video-player' // import VueCoreVideoPlayer from 'vue-core-video-player'
Vue.prototype.$EventBus = new Vue() Vue.prototype.$EventBus = new Vue()
// Vue.use(VueCoreVideoPlayer) Vue.use(VueCoreVideoPlayer)
Vue.use(VueViewer) Vue.use(VueViewer)
Vue.prototype.$md5 = md5; Vue.prototype.$md5 = md5;
Vue.use(Vuelidate) Vue.prototype.$message = message
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function() {
let domainUrl = ''; let domainUrl = '';
......
src/components/car/orderPreview.vue
View file @ f53c40bd
...@@ -13,44 +13,32 @@ ...@@ -13,44 +13,32 @@
<template v-if="dataList.CarType!=3"> <template v-if="dataList.CarType!=3">
<div class="text-grey-6 f12 q-my-md">選擇機場</div> <div class="text-grey-6 f12 q-my-md">選擇機場</div>
<div class="row wrap"> <div class="row wrap">
<q-btn @click="handleSelect(item,1)" <div v-for="(x,i) in dataList.AirportList" :key="i">
:color="selectedAirportObj&&item.Id === selectedAirportObj.Id?'primary':'grey-5'" <q-chip size="14px" clickable @click="handleSelect(x,1)"
unelevated :text-color="selectedAirportObj&&selectedAirportObj.Id==x.Id?'white':'dark'"
class="car-tag mr" :color="selectedAirportObj&&selectedAirportObj.Id==x.Id?'primary':'grey-3'" square>{{ x.AirportName }}</q-chip>
v-for="item in AirportList" </div>
:key="item.Id"
>
{{ item.AirportName }}
</q-btn>
</div> </div>
</template> </template>
<div class="row"> <div class="row no-wrap">
<div v-if="dataList.CarType!=1"> <div v-if="dataList.CarType!=1" :class="{'col':dataList.PlaceList.length>2}">
<div class="text-grey-6 f12 q-my-md">選擇上車範圍</div> <div class="text-grey-6 f12 q-my-md">選擇上車範圍</div>
<div class="row wrap"> <div class="row wrap">
<q-btn @click="handleSelect(item,3)" <div v-for="(x,i) in dataList.PlaceList" :key="i">
:color="onCarObj&&item.Id === onCarObj.Id?'primary':'grey-5'" <q-chip size="14px" clickable @click="handleSelect(x,3)"
unelevated :text-color="onCarObj&&onCarObj.Id==x.Id?'white':'dark'"
class="car-tag mr" :color="onCarObj&&onCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.Name }}({{ x.Range }}m)</q-chip>
v-for="item in PlaceList"
:key="item.Id"
>
{{ item.Name }}({{ item.Range }}m)
</q-btn>
</div> </div>
</div> </div>
<div v-if="dataList.CarType!=2"> </div>
<div v-if="dataList.CarType!=2" :class="{'col':dataList.PlaceList.length>2,'q-ml-md':dataList.CarType!=1}">
<div class="text-grey-6 f12 q-my-md">選擇下車範圍</div> <div class="text-grey-6 f12 q-my-md">選擇下車範圍</div>
<div class="row wrap"> <div class="row wrap">
<q-btn @click="handleSelect(item,4)" <div v-for="(x,i) in dataList.PlaceList" :key="i">
:color="unCarObj&&item.Id === unCarObj.Id?'primary':'grey-5'" <q-chip size="14px" clickable @click="handleSelect(x,4)"
unelevated :text-color="unCarObj&&unCarObj.Id==x.Id?'white':'dark'"
class="car-tag mr" :color="unCarObj&&unCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.Name }}({{ x.Range }}m)</q-chip>
v-for="item in PlaceList" </div>
:key="item.Id"
>
{{ item.Name }}({{ item.Range }}m)
</q-btn>
</div> </div>
</div> </div>
</div> </div>
...@@ -58,15 +46,11 @@ ...@@ -58,15 +46,11 @@
<div class="text-grey-6 f12 q-my-md">選擇車類型</div> <div class="text-grey-6 f12 q-my-md">選擇車類型</div>
<div class="row wrap"> <div class="row wrap">
<q-btn @click="handleSelect(item,2)" <div v-for="(x,i) in dataList.CarTypeList" :key="i">
:color="selectedCarObj&&item.Id === selectedCarObj.Id?'primary':'grey-5'" <q-chip size="14px" clickable @click="handleSelect(x,2)"
unelevated :text-color="selectedCarObj&&selectedCarObj.Id==x.Id?'white':'dark'"
class="car-tag mr" :color="selectedCarObj&&selectedCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.CarName }}({{ x.PeopleNum }}人)</q-chip>
v-for="item in CarTypeList" </div>
:key="item.Id"
>
{{ item.CarName }}({{ item.PeopleNum }}人)
</q-btn>
</div> </div>
<div class="text-grey-6 f12 q-my-md">選擇數量</div> <div class="text-grey-6 f12 q-my-md">選擇數量</div>
<div class="row items-end"> <div class="row items-end">
...@@ -151,16 +135,17 @@ ...@@ -151,16 +135,17 @@
</template> </template>
<script> <script>
import { date } from "quasar";
export default { export default {
props: ["dataList","PlaceList","price","CarTypeList","AirportList","configId","Month"], props: ["dataList","price","configId","Month"],
watch: { watch: {
price: { price: {
handler(n, o) { handler(n, o) {
this.p = n; this.p = n;
if(n&&n.startDate){ if(n&&n.startDate){
this.chosenObj.startDate = n.startDate; this.chosenObj.startDate = n.startDate;
// this.selectedCar = this.CarTypeList[0].Id // this.selectedCar = this.dataList.CarTypeList[0].Id
// this.selectedCarObj = this.CarTypeList[0] // this.selectedCarObj = this.dataList.CarTypeList[0]
} }
this.calcMoney() this.calcMoney()
...@@ -168,9 +153,9 @@ export default { ...@@ -168,9 +153,9 @@ export default {
deep: true, deep: true,
immediate: false immediate: false
}, },
CarTypeList: { dataList: {
handler(n, o) { handler(n, o) {
this.CarTypeList = n; this.dataList = n;
}, },
deep: true, deep: true,
...@@ -208,20 +193,8 @@ export default { ...@@ -208,20 +193,8 @@ export default {
orderInfo: this.chosenObj, orderInfo: this.chosenObj,
sumPrice: this.sumPrice, sumPrice: this.sumPrice,
Id: this.dataList.Id, Id: this.dataList.Id,
onCarObj: { onCarId: this.onCarObj?this.onCarObj.Id:'',
Address: this.onCarObj?this.onCarObj.Address:'', unCarId: this.unCarObj?this.unCarObj.Id:'',
Name: this.onCarObj?this.onCarObj.Name:'',
Lat: this.onCarObj?this.onCarObj.Lat:'',
Lng: this.onCarObj?this.onCarObj.Lng:'',
Range: this.onCarObj?this.onCarObj.Range:'',
},
unCarObj: {
Address: this.unCarObj?this.unCarObj.Address:'',
Name: this.unCarObj?this.unCarObj.Name:'',
Lat: this.unCarObj?this.unCarObj.Lat:'',
Lng: this.unCarObj?this.unCarObj.Lng:'',
Range: this.unCarObj?this.unCarObj.Range:''
},
} }
let key = this.$md5(JSON.stringify(order)) let key = this.$md5(JSON.stringify(order))
let pickuporderCars = localStorage.getItem('pickuporderCars') let pickuporderCars = localStorage.getItem('pickuporderCars')
...@@ -233,7 +206,7 @@ export default { ...@@ -233,7 +206,7 @@ export default {
localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars)) localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars))
this.CommonJump('/PickuporderForm/'+key, {}); this.CommonJump('/PickuporderForm/'+key, {});
}, },
// 获取车的详情 // 获取车型的详情
getCarPriceData2() { getCarPriceData2() {
this.priceList = [] this.priceList = []
this.apipost( this.apipost(
...@@ -260,8 +233,10 @@ export default { ...@@ -260,8 +233,10 @@ export default {
isSupportChildren: 1, isSupportChildren: 1,
safeMoney: 0, safeMoney: 0,
} }
if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
arr.push(dataObj) arr.push(dataObj)
} }
}
}) })
const temp= JSON.parse(JSON.stringify(r.data.data)) const temp= JSON.parse(JSON.stringify(r.data.data))
let PriceArr = temp.filter(x=>{ return x.Price>0 }) let PriceArr = temp.filter(x=>{ return x.Price>0 })
......
src/components/searchdata/kkday.vue
View file @ f53c40bd
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</p> </p>
</div> </div>
</div> </div>
<div style="display: flex; justify-content: center"> <div class="row justify-end">
<q-pagination <q-pagination
v-if="PageCount > 1" v-if="PageCount > 1"
v-model="msg.pageIndex" v-model="msg.pageIndex"
...@@ -644,7 +644,7 @@ export default { ...@@ -644,7 +644,7 @@ export default {
var companyId = -1; var companyId = -1;
if (localStorage.groupinfo) { if (localStorage.groupinfo) {
var groupinfo = JSON.parse(localStorage.groupinfo); var groupinfo = JSON.parse(localStorage.groupinfo);
companyId = groupinfo.siteList[0].companyId; companyId = groupinfo.siteList[0]&&groupinfo.siteList[0].companyId?groupinfo.siteList[0].companyId:-1;
} }
if (localStorage.b2bUser) { if (localStorage.b2bUser) {
var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser")); var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser"));
...@@ -661,7 +661,7 @@ export default { ...@@ -661,7 +661,7 @@ export default {
this.$q.loading.hide(); this.$q.loading.hide();
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PageCount = res.data.data.pageData.pageCount; this.PageCount = res.data.data.pageCount;
this.TotalCount = res.data.data.pageData.count; this.TotalCount = res.data.data.pageData.count;
var tempArray = res.data.data.pageData.list; var tempArray = res.data.data.pageData.list;
console.log('getSearch data', tempArray) console.log('getSearch data', tempArray)
......
src/components/trip/block/index.vue
View file @ f53c40bd
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p> <p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p>
<!-- <p>{{item.dateTime}}</p> --> <!-- <p>{{item.dateTime}}</p> -->
</div> </div>
<div class="desc" v-html="item.title"></div> <div class="desc" v-html="item.title!='null'?item.title:''"></div>
</div> </div>
<oneday v-if="item.details && item.details.length==1" :day='item' :isDirect="isDirect"></oneday> <oneday v-if="item.details && item.details.length==1" :day='item' :isDirect="isDirect"></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item' :isDirect="isDirect"></twoday> <twoday v-if="item.details && item.details.length==2" :day='item' :isDirect="isDirect"></twoday>
......
src/components/trip/block/twoday.vue
View file @ f53c40bd
...@@ -53,9 +53,8 @@ ...@@ -53,9 +53,8 @@
></q-img> ></q-img>
</template> </template>
</div> </div>
<div class="row items-end" style="border: 1px solid #ccc; left: 0"> <div class="row items-end col" style="border: 1px solid #ccc; left: 0">
<div class="q-pb-lg"> <div class="down q-pa-lg q-mb-lg" :class="{ col: index == 0 }">
<div class="down q-pa-lg" :class="{ col: index == 0 }">
<div <div
v-if="item.title != ''" v-if="item.title != ''"
class="text-h6 text-bold q-pb-sm" class="text-h6 text-bold q-pb-sm"
...@@ -92,7 +91,6 @@ ...@@ -92,7 +91,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<template v-for="(item, index) in day.details"> <template v-for="(item, index) in day.details">
<div <div
......
src/components/trip/orderPreview.vue
View file @ f53c40bd
<template> <template>
<div class="column full-height"> <div class="column full-height" v-if="p">
<div class="col"> <div class="col">
<div class="text-right" v-if="$q.platform.is.desktop"> <div class="text-right" v-if="$q.platform.is.desktop">
<q-btn <q-btn
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
flat flat
/> />
</div> </div>
<div v-if="p && p.unionCityList"> <div v-if="p && p.unionCityList && p.unionCityList.length>0">
<div class="text-grey-6 f12 q-my-md">出發城市</div> <div class="text-grey-6 f12 q-my-md">出發城市</div>
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div v-for="(x,i) in p.unionCityList" :key="i"> <div v-for="(x,i) in p.unionCityList" :key="i">
...@@ -376,12 +376,11 @@ export default { ...@@ -376,12 +376,11 @@ export default {
watch: { watch: {
price: { price: {
handler(n, o) { handler(n, o) {
console.log(n)
this.p = n?n:{}; this.p = n?n:{};
if (this.p.startDate) { if (this.p.startDate) {
this.chosenObj.startDate = this.p.startDate; this.chosenObj.startDate = this.p.startDate;
this.calcMoney(); this.calcMoney();
if(this.p.unionCityList && this.p.unionCityList.length>0){ if(this.p.unionCityList && this.p.unionCityList.length>0 && this.p.originalB2CPrice==this.p.RealPrice){
this.currentUnionCity = this.p.unionCityList[0] this.currentUnionCity = this.p.unionCityList[0]
} }
} }
......
src/pages/Pickuporder/orderForm.vue
View file @ f53c40bd
...@@ -39,13 +39,14 @@ ...@@ -39,13 +39,14 @@
}" }"
> >
<div class="col"> <div class="col">
<q-form ref="baseUserInfo">
<q-card flat class="q-pa-md"> <q-card flat class="q-pa-md">
<div class="text-subtitle1 text-weight-bolder" ref="baseUserInfoTitle">訂購人資訊</div> <div class="text-subtitle1 text-weight-bolder">訂購人資訊</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="row q-col-gutter-md">
<div :class="filedWidth"> <div :class="filedWidth">
<q-select <q-select
v-model="userInfo.country" v-model="userInfo.Country"
@input="changeCountry" @input="changeCountry"
:options="countrys" :options="countrys"
emit-value emit-value
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
<div :class="filedWidth"> <div :class="filedWidth">
<q-input <q-input
standout standout
v-model="userInfo.mail" v-model="userInfo.Mailbox"
label="郵箱地址" label="郵箱地址"
:rules="[(val) => /^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/.test(val) || '請輸入正確的郵箱地址']" :rules="[(val) => /^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/.test(val) || '請輸入正確的郵箱地址']"
ref="mail" ref="mail"
...@@ -69,8 +70,7 @@ ...@@ -69,8 +70,7 @@
</q-card> </q-card>
<q-card flat class="q-pa-md q-mt-lg" v-if="details"> <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="text-subtitle1 text-weight-bolder q-mb-md">旅客資料</div>
<div class="row"> <div class="row">
<vue-core-video-players <vue-core-video-players
v-if="details.videoStr" v-if="details.videoStr"
...@@ -118,6 +118,12 @@ ...@@ -118,6 +118,12 @@
<span class="q-mr-sm" <span class="q-mr-sm"
>({{CarObj.PeopleNum}}人/辆)</span >({{CarObj.PeopleNum}}人/辆)</span
> >
<template v-if="details.TravelHours>0">
<q-icon name="iconfont icontime" size="20px" class="q-mr-xs q-ml-sm" />
<span class="q-mr-sm">
{{`包車時長：${details.TravelHours} h`}}
</span>
</template>
</div> </div>
</div> </div>
<q-separator color="grey-2" class="q-mt-md" /> <q-separator color="grey-2" class="q-mt-md" />
...@@ -293,6 +299,15 @@ ...@@ -293,6 +299,15 @@
</template> </template>
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy2"> <q-popup-proxy :offset="[0, 0]" ref="qDateProxy2">
<div class="row"> <div class="row">
<!-- <q-date
mask="YYYY-MM-DD"
:title="$t('search_date_begin')"
subtitle="選擇"
v-model="getBusTimeDate"
:options="optionsFn"
@input="getTime(3)"
/>
<div class="q-px-sm"></div> -->
<q-time format24h v-model="getBusTime" mask="HH:mm" <q-time format24h v-model="getBusTime" mask="HH:mm"
@input="getTime(2)"/> @input="getTime(2)"/>
</div> </div>
...@@ -407,7 +422,9 @@ ...@@ -407,7 +422,9 @@
<div class="text-subtitle1 q-my-md text-weight-bold">特殊需求備註：</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-input standout v-model="parameters.Remark" input-style="height:170px;" type="textarea" placeholder="此欄位僅限資料備註。不在商品規範內的個人需求，不保證提供" maxlength="200" counter />
</q-card> </q-card>
</q-form>
</div> </div>
<div class="relative-position" v-if="details" <div class="relative-position" v-if="details"
:class="{ :class="{
'q-ml-lg': !($q.screen.width < 1200 || $q.platform.is.mobile), 'q-ml-lg': !($q.screen.width < 1200 || $q.platform.is.mobile),
...@@ -466,6 +483,10 @@ ...@@ -466,6 +483,10 @@
<div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div> <div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div>
<div class="q-ml-md ellipsis-2-lines">{{AirportObj.Name}}</div> <div class="q-ml-md ellipsis-2-lines">{{AirportObj.Name}}</div>
</div> </div>
<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">{{parameters.FlightTime}}</div>
</div>
<div class="row q-pb-xs no-wrap" v-if="parameters.GetonAddress"> <div class="row q-pb-xs no-wrap" v-if="parameters.GetonAddress">
<div style="width: 80px">上車點：</div> <div style="width: 80px">上車點：</div>
<div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div> <div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div>
...@@ -531,16 +552,16 @@ ...@@ -531,16 +552,16 @@
</div> </div>
<auth></auth> <auth></auth>
</div> </div>
</template> </template>
<script> <script>
import NoneData from "src/components/common/noneData.vue"; import NoneData from "src/components/common/noneData.vue";
import auth from "src/components/common/auth.vue"; import auth from "src/components/common/auth.vue";
import { date } from 'quasar' import { date } from 'quasar'
import { json } from "body-parser"; import { json } from "body-parser";
import coupon from '../../components/common/coupon.vue' import coupon from '../../components/common/coupon.vue'
import componentsMap from "../../components/car/Map.vue"; import componentsMap from "../../components/car/Map.vue";
export default { export default {
components:{ components:{
coupon, coupon,
componentsMap, componentsMap,
...@@ -549,24 +570,16 @@ ...@@ -549,24 +570,16 @@
}, },
data() { data() {
return { return {
order: null, order: null,//订单信息
orderKey: "", orderKey: "",
isRangeClick: true,
isShowDialog: false, isShowDialog: false,
AddressObj: null, AddressObj: null,
onCarObj: null,//上车范围 onCarObj: null,//上车范围
unCarObj: null,//下车范围 unCarObj: null,//下车范围
onCarId: null,//上车范围
unCarId: null,//下车范围
CarObj: null,//车型 CarObj: null,//车型
AirportObj: null,//机场 AirportObj: null,//机场
CarId: null,//车型
AirportId: null,//机场
startDate: null,
calculationNum: null,//数量
sumPrice: null,//总价
details: null,//产品详情 details: null,//产品详情
options: { options: {//音频控件
currentPage: 0, currentPage: 0,
speed: 300, speed: 300,
itemAnimation: true, itemAnimation: true,
...@@ -580,15 +593,11 @@ ...@@ -580,15 +593,11 @@
OrderDate: null,//接收产品相关信息 OrderDate: null,//接收产品相关信息
step: 1, step: 1,
userInfo: { userInfo: {
lastName: "", Country: 0,
firstName: "",
country: 0,
phone: "",
areaCode: "", areaCode: "",
mail: "", Mailbox: "",
}, },
chosenObj: {}, chosenObj: {},
isUpdateUserInfo: false,
countrys: [], countrys: [],
areaCodes: [], areaCodes: [],
loading: false, loading: false,
...@@ -619,13 +628,13 @@ ...@@ -619,13 +628,13 @@
Mobile:'',//电话 Mobile:'',//电话
ProductId: '', ProductId: '',
CarId: '',//产品类型ID CarId: '',//产品类型ID
pType: 1,//类型 1来源B2C OrderSource: 1,//类型 0 来源B2B 1 来源B2C
}, },
flightTime: null,//航班起飞抵达时间 flightTime: null,//航班起飞抵达时间
getBusTime: null,//预约车时间 getBusTime: null,//预约车时间
getBusTimeDate: null,//预约日期
TotalPeople: 0,//总人数 TotalPeople: 0,//总人数
onoffbus: 1,//1 上车 2下车 onoffbus: 1,//1 上车 2下车
ErpOrderId: 0,//erp订单Id
}; };
}, },
computed: { computed: {
...@@ -647,8 +656,9 @@ ...@@ -647,8 +656,9 @@
if(this.checkParamsHandler()){ if(this.checkParamsHandler()){
this.getCarData() this.getCarData()
} }
this.initCountry();
this.initGuestHandler(); this.initGuestHandler();
this.getUserInfoHandler()
}, },
methods: { methods: {
// 获取商品详情 // 获取商品详情
...@@ -658,15 +668,17 @@ ...@@ -658,15 +668,17 @@
"b2c_get_GetCarSingleProductDetail", "b2c_get_GetCarSingleProductDetail",
{ ProductId: this.parameters.ProductId }, { ProductId: this.parameters.ProductId },
(r) => { (r) => {
this.$q.loading.hide();
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.details = r.data.data; this.details = r.data.data;
this.CarObj = this.details.CarTypeList.find((x) => this.OrderDate.CarId == x.Id); this.CarObj = this.details.CarTypeList.find((x) => this.OrderDate.CarId == x.Id);
this.onCarObj = this.details.PlaceList.find((x) => this.OrderDate.onCarId == x.Id)//上车范围
this.unCarObj = this.details.PlaceList.find((x) => this.OrderDate.unCarId == x.Id)//下车范围
if(this.details.CarType!=3){ if(this.details.CarType!=3){
this.AirportObj = this.details.AirportList.find((x) => this.OrderDate.AirportId == x.Id); this.AirportObj = this.details.AirportList.find((x) => this.OrderDate.AirportId == x.Id);
this.parameters.AirportId = this.OrderDate.AirportId this.parameters.AirportId = this.OrderDate.AirportId
this.parameters.FlightTime = this.OrderDate.startDate this.parameters.FlightTime = this.OrderDate.startDate
} }
this.parameters.CarId = this.OrderDate.CarId
this.parameters.OrderType = this.details.CarType this.parameters.OrderType = this.details.CarType
} else { } else {
this.$q.notify({ this.$q.notify({
...@@ -676,7 +688,7 @@ ...@@ -676,7 +688,7 @@
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}); });
} }
this.$q.loading.hide();
}, },
null null
); );
...@@ -685,22 +697,20 @@ ...@@ -685,22 +697,20 @@
try { try {
if (this.$route.params && this.$route.params.id) { if (this.$route.params && this.$route.params.id) {
let key = this.$route.params.id; let key = this.$route.params.id;
console.log(key,'99999')
let pickuporderCars = localStorage.getItem("pickuporderCars"); let pickuporderCars = localStorage.getItem("pickuporderCars");
pickuporderCars = pickuporderCars ? JSON.parse(pickuporderCars) : []; pickuporderCars = pickuporderCars ? JSON.parse(pickuporderCars) : [];
if (pickuporderCars.length > 0) { if (pickuporderCars.length > 0) {
this.order = pickuporderCars.find((x) => x.key == key); this.order = pickuporderCars.find((x) => x.key == key);
if (this.order) { if (this.order) {
this.orderKey = key; this.orderKey = key;
this.chosenObj = this.order.order.orderInfo;
this.OrderDate = this.order.order this.OrderDate = this.order.order
this.chosenObj = this.OrderDate.orderInfo;
this.parameters.ProductId = this.order.order.Id this.parameters.ProductId = this.order.order.Id
this.parameters.OrderDate = this.OrderDate.startDate this.parameters.OrderDate = this.OrderDate.startDate
this.parameters.Unit_Price = OrderDate.originalB2CPrice this.getBusTimeDate = this.OrderDate.startDate
this.parameters.Num = this.OrderDate.chosenObj.Count this.parameters.Unit_Price = this.OrderDate.originalB2CPrice
this.parameters.Num = this.chosenObj.Count
this.parameters.Money = this.OrderDate.sumPrice this.parameters.Money = this.OrderDate.sumPrice
this.onCarObj = this.OrderDate.onCarObj//上车范围
this.unCarObj = this.OrderDate.unCarObj//下车范围
} }
} }
} }
...@@ -714,10 +724,7 @@ ...@@ -714,10 +724,7 @@
} }
return this.orderKey != ""; return this.orderKey != "";
}, },
async submit() {
submit(){
let flag = false
this.$refs.mail.validate() this.$refs.mail.validate()
this.$refs.SurName.validate() this.$refs.SurName.validate()
...@@ -734,32 +741,26 @@ ...@@ -734,32 +741,26 @@
this.$refs.FlightTime.validate() this.$refs.FlightTime.validate()
if(this.details.CarType!=1){ if(this.details.CarType!=1){
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{ }else{
this.$refs.GetoffAddress.validate() 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{ }else{
this.$refs.GetonAddress.validate() this.$refs.GetonAddress.validate()
this.$refs.GetoffAddress.validate() 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.GetonAddress.hasError&& !this.$refs.GetoffAddress.hasError&& !this.$refs.mail.hasError
} }
if(!flag) return this.goScrollToForm('baseUserInfoTitle') let flag = true
console.log(this.parameters,'------') flag = await this.formValidateHandler('baseUserInfo')
if(!flag){
let errorObj = this.$refs.baseUserInfo.getValidationComponents().find(x=>x.innerError)
window.scrollTo(0,errorObj.$el.offsetTop)
}else{
this.SetCarOrder() this.SetCarOrder()
}
}, },
goScrollToForm(formName){ async formValidateHandler(formName){
let temp=this.$refs[formName] let temp=this.$refs[formName]
let formObj = temp instanceof Array ? temp[0] : temp let formObj = temp instanceof Array ? temp[0] : temp
window.scrollTo(0,formObj.offsetTop) return formObj.validate()
}, },
SetCarOrder(){ SetCarOrder(){
this.loading = true this.loading = true
...@@ -773,12 +774,7 @@ ...@@ -773,12 +774,7 @@
let ErpOrderId = r.data.data.Id let ErpOrderId = r.data.data.Id
this.AddOrderInfo(ErpOrderId) this.AddOrderInfo(ErpOrderId)
}else{ }else{
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000,
});
this.loading = false this.loading = false
} }
}) })
...@@ -799,7 +795,7 @@ ...@@ -799,7 +795,7 @@
SurName: this.parameters.SurName, SurName: this.parameters.SurName,
Name: this.parameters.Name, Name: this.parameters.Name,
ContactNumber: this.parameters.Mobile,// 联系电话 ContactNumber: this.parameters.Mobile,// 联系电话
Mailbox: this.userInfo.mail,//邮箱 Mailbox: this.userInfo.Mailbox,//邮箱
GoodsId: this.parameters.ProductId,//商品id GoodsId: this.parameters.ProductId,//商品id
GoodsName: this.details.Name,//商品名称 GoodsName: this.details.Name,//商品名称
GoodsPic: this.details.ImageList[0],//商品图片 GoodsPic: this.details.ImageList[0],//商品图片
...@@ -808,33 +804,40 @@ ...@@ -808,33 +804,40 @@
TotalPrice: this.parameters.Money,//总价格 TotalPrice: this.parameters.Money,//总价格
PreferentialPrice: 0,// 优惠总金额 PreferentialPrice: 0,// 优惠总金额
ErpOrderId: ErpOrderId,//erp订单id ErpOrderId: ErpOrderId,//erp订单id
Country: this.userInfo.country,//国家id Country: this.userInfo.Country,//国家id
PlatformTax: 0,//平台税金默认0 PlatformTax: 0,//平台税金默认0
Income: 0,//已收默认0 Income: 0,//已收默认0
Refund: 0,//退款金额默认0 Refund: 0,//退款金额默认0
OrderSource: this.parameters.pType
}, },
(r) => { (r) => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.step = 3 this.step = 3
this.$q.notify({ this.$message.success("訂單創建成功")
color: "green-4", this.goPayHandler(r.data.data)
textColor: "white",
icon: "cloud_done",
message: "訂單提交成功",
position:'center',
});
}else{ }else{
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000,
});
} }
this.loading = false this.loading = false
}) })
}, },
goPayHandler(pay){
let key = this.$md5(JSON.stringify(pay))
let pays = localStorage.getItem('pays')
pays = pays?JSON.parse(pays):[]
pays.push({
key,
pay
})
localStorage.setItem("pays",JSON.stringify(pays))
let pickuporderCars = localStorage.getItem('pickuporderCars')
pickuporderCars = pickuporderCars?JSON.parse(pickuporderCars):[]
let i = pickuporderCars.findIndex(x=>x.key==this.orderKey)
if(i>=0){
pickuporderCars.splice(i,1)
localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars))
}
this.CommonJump('/pay/'+key, {});
},
// 航班起飞抵达时间 // 航班起飞抵达时间
getTime(type){ getTime(type){
// 1航班时间 2预约时间 // 1航班时间 2预约时间
...@@ -845,6 +848,8 @@ ...@@ -845,6 +848,8 @@
}else if(type==2){ }else if(type==2){
this.parameters.OrderDate = this.OrderDate.startDate+' '+this.getBusTime this.parameters.OrderDate = this.OrderDate.startDate+' '+this.getBusTime
this.$refs.qDateProxy2.hide() this.$refs.qDateProxy2.hide()
}else if(type==3){
this.parameters.OrderDate = this.OrderDate.startDate+' '+this.getBusTime
} }
}, },
...@@ -889,16 +894,33 @@ ...@@ -889,16 +894,33 @@
}, },
initGuestHandler() { initGuestHandler() {
},
// 获取当前用户信息
getUserInfoHandler() {
let u = this.$user.userInfo;
if (u) {
this.apipost("GetCustomerInfo_post", { Id: u.id }, (r) => {
if (r.data.resultCode == 1) {
this.userInfo = r.data.data;
if(r.data.data.Moblie){
this.parameters.Mobile = r.data.data.Moblie
}
} else {
this.$user.userInfo = null;
}
this.initCountry();
});
}
}, },
// 初始化国家 // 初始化国家
initCountry() { initCountry() {
this.apipost("GetCountryInfo_post", {}, (r) => { this.apipost("GetCountryInfo_post", {}, (r) => {
if (r.data.resultCode == 1) { 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;
this.areaCodes = r.data.data.phoneCountList; this.areaCodes = r.data.data.phoneCountList;
this.changeCountry(this.userInfo.country); this.changeCountry(this.userInfo.Country);
this.areaCodes.forEach((x) => { this.areaCodes.forEach((x) => {
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})`;
...@@ -910,20 +932,20 @@ ...@@ -910,20 +932,20 @@
this.userInfo.areaCode = this.areaCodes.find((x) => x.ID == id).PhoneCode; this.userInfo.areaCode = this.areaCodes.find((x) => x.ID == id).PhoneCode;
}, },
}, },
}; };
</script> </script>
<style> <style>
.order-preview .q-stepper__content { .order-preview .q-stepper__content {
display: none !important; display: none !important;
} }
.order-preview .q-toggle__track { .order-preview .q-toggle__track {
height: 0.7em; height: 0.7em;
border-radius: 0.35em; border-radius: 0.35em;
opacity: 0.38; opacity: 0.38;
width: 50px; width: 50px;
} }
.order-preview .q-toggle__thumb { .order-preview .q-toggle__thumb {
top: 0.42em; top: 0.42em;
left: 0.45em; left: 0.45em;
width: 0.5em; width: 0.5em;
...@@ -931,20 +953,20 @@ ...@@ -931,20 +953,20 @@
transition: left 0.22s ease-in-out; transition: left 0.22s ease-in-out;
user-select: none; user-select: none;
z-index: 0; z-index: 0;
} }
.order-preview .q-toggle__inner--truthy .q-toggle__thumb { .order-preview .q-toggle__inner--truthy .q-toggle__thumb {
left: 0.94em; left: 0.94em;
} }
.order-preview .q-toggle__inner { .order-preview .q-toggle__inner {
width: 1.9em; width: 1.9em;
} }
.order-preview .q-toggle__label { .order-preview .q-toggle__label {
margin-top: 12px; margin-top: 12px;
} }
.guest-item:hover{ .guest-item:hover{
background: rgba(241,65,108,.04) !important; background: rgba(241,65,108,.04) !important;
} }
.text-h6Detail { .text-h6Detail {
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
color: #333; color: #333;
...@@ -952,13 +974,12 @@ ...@@ -952,13 +974,12 @@
position: relative; position: relative;
width:100%; width:100%;
height:50px; height:50px;
} }
.text-h6Detail i { .text-h6Detail i {
position: absolute; position: absolute;
right:20px; right:20px;
top:10px; top:10px;
cursor: pointer; cursor: pointer;
font-size:23px; font-size:23px;
} }
</style> </style>
\ No newline at end of file
src/pages/detailsCar.vue
View file @ f53c40bd
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
> >
<div class="col q-mr-lg"> <div class="col q-mr-lg">
<div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div> <div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
<div class="text-grey-7 fz17 ellipsis-2-lines">{{ dataList.Description }}</div> <!-- <div class="text-grey-7 fz17 ellipsis-2-lines">{{ dataList.Description }}</div> -->
<div class="q-mt-md f12 text-grey-6"> <div class="q-mt-md f12 text-grey-6">
<q-icon <q-icon
name="iconfont icondingweixiao" name="iconfont icondingweixiao"
...@@ -142,12 +142,10 @@ ...@@ -142,12 +142,10 @@
label=" 印象自組團" label=" 印象自組團"
/> />
<q-chip <q-chip
v-if="dataList.dayList" v-if="dataList.TravelHours>0" class="transparent q-mr-xl no-padding"
class="transparent q-mr-xl no-padding"
square square
icon="iconfont icontime" icon="iconfont icontime"
:label="` 行程時間 ${dataList.dayList.length} 天`" :label="`包車時長：${dataList.TravelHours} h`" />
/>
<q-chip <q-chip
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
...@@ -282,9 +280,6 @@ ...@@ -282,9 +280,6 @@
:dataList="dataList" :dataList="dataList"
:configId="msg.configId" :configId="msg.configId"
:Month="currentYM.str" :Month="currentYM.str"
:PlaceList="dataList.PlaceList"
:CarTypeList="dataList.CarTypeList"
:AirportList="dataList.AirportList"
:price="currentPrice" :price="currentPrice"
@reset="resetHandler" @reset="resetHandler"
@getPriceList="getPriceList" @getPriceList="getPriceList"
...@@ -316,13 +311,13 @@ ...@@ -316,13 +311,13 @@
:label="`${dataList.FreeCancelDay}天前可免费取消`" :label="`${dataList.FreeCancelDay}天前可免费取消`"
/> />
</div> </div>
<!-- <div class="text-grey f12"> <div class="text-grey f12">
<ul class="q-pl-md no-margin"> <ul class="q-pl-md no-margin">
<li v-for="(x, i) in warnBuy" class="q-mt-md" :key="i"> <li v-for="(x, i) in warnBuy" class="q-mt-md" :key="i">
{{ x }} {{ x }}
</li> </li>
</ul> </ul>
</div> --> </div>
</div> </div>
<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">
...@@ -360,6 +355,12 @@ ...@@ -360,6 +355,12 @@
square square
icon="iconfont iconcancel" icon="iconfont iconcancel"
:label="`${dataList.FreeCancelDay}天前可免费取消`" :label="`${dataList.FreeCancelDay}天前可免费取消`"
/>
<q-chip
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconroundcheck"
label="6個工作日內（不含例休假）確認"
/> />
</div> </div>
<div class="q-mt-lg row" v-if="$q.platform.is.desktop"> <div class="q-mt-lg row" v-if="$q.platform.is.desktop">
...@@ -375,9 +376,6 @@ ...@@ -375,9 +376,6 @@
:dataList="dataList" :dataList="dataList"
:configId="msg.configId" :configId="msg.configId"
:Month="currentYM.str" :Month="currentYM.str"
:PlaceList="dataList.PlaceList"
:CarTypeList="dataList.CarTypeList"
:AirportList="dataList.AirportList"
:price="currentPrice" :price="currentPrice"
@reset="resetHandler" @reset="resetHandler"
@getPriceList="getPriceList" @getPriceList="getPriceList"
...@@ -658,10 +656,10 @@ export default { ...@@ -658,10 +656,10 @@ export default {
loop: true, loop: true,
}, },
warnBuy: [ warnBuy: [
"未满 2 岁幼儿不占位可免费参加（不含座位，餐点，门票，床位），请先于下订时在「备注栏」告知。", "如一輛車位不夠使用，請購買多輛車",
"如需要單人房，請購買單房", "收費公路費、停車費、入園費等請另行繳納",
"不占床2-11(包含)岁幼童可购买儿童价，如需占床請購買成人價", "由於交通擁堵，時長可能會略有變化",
"12歲以上皆視同成人售價", "每增加 30 分鐘，將收取相應的延期費。 （現場支付）",
], ],
showOrderPreview: false, showOrderPreview: false,
videoPosition: 0, videoPosition: 0,
...@@ -942,8 +940,11 @@ export default { ...@@ -942,8 +940,11 @@ export default {
isSupportChildren: 1, isSupportChildren: 1,
safeMoney: 0, safeMoney: 0,
} }
if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
arr.push(dataObj) arr.push(dataObj)
} }
}
}) })
this.priceList = JSON.parse(JSON.stringify(arr)) this.priceList = JSON.parse(JSON.stringify(arr))
} }
......
src/pages/detailsNew.vue
View file @ f53c40bd
...@@ -777,7 +777,13 @@ export default { ...@@ -777,7 +777,13 @@ export default {
changeShowOrderPreviewHandler(){ changeShowOrderPreviewHandler(){
this.showOrderPreview=!this.showOrderPreview this.showOrderPreview=!this.showOrderPreview
if(!this.showOrderPreview){ if(!this.showOrderPreview){
this.currentPrice=null // this.currentPrice=null
if(this.currentPrice){
this.currentPrice.isSupportChildren=null
this.currentPrice.unionCityList=null
this.currentPrice.singleRoomPrice=0
this.currentPrice.originalB2CPrice=0
}
this.changeTripShowHandler() this.changeTripShowHandler()
} }
}, },
...@@ -871,7 +877,13 @@ export default { ...@@ -871,7 +877,13 @@ export default {
//console.log(e) //console.log(e)
}, },
resetHandler() { resetHandler() {
this.currentPrice=null; // this.currentPrice=null;
if(this.currentPrice){
this.currentPrice.isSupportChildren=null
this.currentPrice.unionCityList=null
this.currentPrice.singleRoomPrice=0
this.currentPrice.originalB2CPrice=0
}
if(this.$q.platform.is.mobile) if(this.$q.platform.is.mobile)
this.$refs.calendarMobile.reset() this.$refs.calendarMobile.reset()
else else
...@@ -882,7 +894,7 @@ export default { ...@@ -882,7 +894,7 @@ export default {
this.currentPrice = JSON.parse(JSON.stringify(val.price)); this.currentPrice = JSON.parse(JSON.stringify(val.price));
this.currentPrice.RealPrice = this.currentPrice.RealPrice?this.currentPrice.RealPrice:this.currentPrice.originalB2CPrice this.currentPrice.RealPrice = this.currentPrice.RealPrice?this.currentPrice.RealPrice:this.currentPrice.originalB2CPrice
this.currentPrice.originalB2CPrice = this.currentPrice.RealPrice this.currentPrice.originalB2CPrice = this.currentPrice.RealPrice
if(this.currentPrice.unionCityList && this.currentPrice.unionCityList.length>0){ if(this.currentPrice.unionCityList && this.currentPrice.unionCityList.length>0 && this.dataList.startCityId!=0){
this.currentPrice.unionCityList.splice(0,0,{ this.currentPrice.unionCityList.splice(0,0,{
cityId:this.dataList.startCityId, cityId:this.dataList.startCityId,
cityName:this.dataList.startCityName cityName:this.dataList.startCityName
......
src/pages/line/orderPreview.vue
View file @ f53c40bd
...@@ -50,8 +50,6 @@ ...@@ -50,8 +50,6 @@
standout standout
v-model="userInfo.Name" v-model="userInfo.Name"
label="名字" label="名字"
mask="A"
reverse-fill-mask
ref="name" ref="name"
:rules="[(val) => !!val || '請輸入名字']" :rules="[(val) => !!val || '請輸入名字']"
/> />
...@@ -62,8 +60,6 @@ ...@@ -62,8 +60,6 @@
v-model="userInfo.Surname" v-model="userInfo.Surname"
ref="surname" ref="surname"
label="姓氏" label="姓氏"
mask="A"
reverse-fill-mask
:rules="[(val) => !!val || '請輸入姓氏']" :rules="[(val) => !!val || '請輸入姓氏']"
/> />
</div> </div>
...@@ -171,7 +167,7 @@ ...@@ -171,7 +167,7 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="x.FirstName" v-model="x.SurName"
label="本國姓" label="本國姓"
placeholder="例：張" placeholder="例：張"
:rules="[(val) => !!val || '請輸本國姓']" :rules="[(val) => !!val || '請輸本國姓']"
...@@ -180,7 +176,7 @@ ...@@ -180,7 +176,7 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="x.LastName" v-model="x.Name"
label="本國名" label="本國名"
placeholder="例：三" placeholder="例：三"
:rules="[(val) => !!val || '請輸本國名']" :rules="[(val) => !!val || '請輸本國名']"
...@@ -202,7 +198,7 @@ ...@@ -202,7 +198,7 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="x.PassFirstName" v-model="x.ESurName"
label="護照英文姓" label="護照英文姓"
placeholder="例：ZHANG" placeholder="例：ZHANG"
mask="A" mask="A"
...@@ -213,7 +209,7 @@ ...@@ -213,7 +209,7 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="x.PassLastName" v-model="x.EName"
label="護照英文名" label="護照英文名"
placeholder="例：SAN" placeholder="例：SAN"
mask="A" mask="A"
...@@ -224,7 +220,7 @@ ...@@ -224,7 +220,7 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="x.Passport" v-model="x.PassportNo"
label="護照號" label="護照號"
mask="X" mask="X"
reverse-fill-mask reverse-fill-mask
...@@ -234,7 +230,7 @@ ...@@ -234,7 +230,7 @@
<div :class="filedGuestWidth"> <div :class="filedGuestWidth">
<q-input <q-input
standout standout
v-model="x.PassValidate" v-model="x.PassportExpiry"
label="護照有效期" label="護照有效期"
readonly readonly
:rules="[(val) => !!val || '請選擇護照有效期']" :rules="[(val) => !!val || '請選擇護照有效期']"
...@@ -247,8 +243,28 @@ ...@@ -247,8 +243,28 @@
mask="YYYY-MM-DD" mask="YYYY-MM-DD"
:title="$t('search_date_begin')" :title="$t('search_date_begin')"
subtitle="選擇" subtitle="選擇"
v-model="x.PassValidate" v-model="x.PassportExpiry"
@input="() => $refs.qDateProxy7.hide()" />
</q-popup-proxy>
</q-input>
</div>
<div :class="filedGuestWidth">
<q-input
standout
v-model="x.Birthday"
label="出生日期"
readonly
:rules="[(val) => !!val || '請選擇旅客出生日期']"
>
<template v-slot:append>
<q-icon name="event" class="cursor-pointer"></q-icon>
</template>
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy8">
<q-date
mask="YYYY-MM-DD"
:title="$t('search_date_begin')"
subtitle="選擇"
v-model="x.Birthday"
/> />
</q-popup-proxy> </q-popup-proxy>
</q-input> </q-input>
...@@ -258,7 +274,7 @@ ...@@ -258,7 +274,7 @@
standout standout
v-model="x.MobilePhone" v-model="x.MobilePhone"
label="聯絡電話" label="聯絡電話"
mask="+# #" mask=""
reverse-fill-mask reverse-fill-mask
placeholder="格式：國家區號+號碼，例如：+81 25xxxx" placeholder="格式：國家區號+號碼，例如：+81 25xxxx"
/> />
...@@ -336,7 +352,7 @@ ...@@ -336,7 +352,7 @@
</div> </div>
<div class="row"> <div class="row">
<div style="width: 80px">出發日期：</div> <div style="width: 80px">出發日期：</div>
<div class="q-ml-md">{{ price.startDate }}</div> <div class="q-ml-md">{{ unionCity && unionCity.goFlight? unionCity.goFlight.startDate :price.startDate }}</div>
</div> </div>
</div> </div>
<q-separator color="grey-2" class="q-my-md" /> <q-separator color="grey-2" class="q-my-md" />
...@@ -357,6 +373,30 @@ ...@@ -357,6 +373,30 @@
<div class="col">嬰兒不佔床 x {{ chosenObj.yeCount }}</div> <div class="col">嬰兒不佔床 x {{ chosenObj.yeCount }}</div>
<div>CNY {{ moneyFormat(price.babyPrice, 2) }}</div> <div>CNY {{ moneyFormat(price.babyPrice, 2) }}</div>
</div> </div>
<div v-if="price.safeMoney>0">
<hr
style="border: none; border-top: 1px dashed #eee !important"
class="bg-transparent q-mb-sm"
/>
<div class="row q-mb-sm" v-if="price.safeMoney > 0">
<div class="col">保險費 x {{ price.safeMoney }}/人</div>
<div>CNY {{ moneyFormat(price.safeMoney*(chosenObj.crCount+chosenObj.etCount+chosenObj.yeCount), 2) }}</div>
</div>
</div>
<div v-if="price.visaPrice>0||price.otherPrice>0">
<hr
style="border: none; border-top: 1px dashed #eee !important"
class="bg-transparent q-mb-sm"
/>
<div class="row q-mb-sm" v-if="price.visaPrice > 0">
<div class="col">簽證費 x {{ price.visaPrice }}/人</div>
<div>CNY {{ moneyFormat(price.visaPrice*(chosenObj.crCount+chosenObj.etCount+chosenObj.yeCount), 2) }}</div>
</div>
<div class="row q-mb-sm" v-if="price.otherPrice > 0">
<div class="col">雜費 x {{ price.otherPrice }}/人</div>
<div>CNY {{ moneyFormat(price.otherPrice*(chosenObj.crCount+chosenObj.etCount+chosenObj.yeCount), 2) }}</div>
</div>
</div>
<hr <hr
style="border: none; border-top: 1px dashed #eee !important" style="border: none; border-top: 1px dashed #eee !important"
class="bg-transparent q-mb-sm" class="bg-transparent q-mb-sm"
...@@ -375,6 +415,7 @@ ...@@ -375,6 +415,7 @@
CNY {{ moneyFormat(sumPrice, 2) }} CNY {{ moneyFormat(sumPrice, 2) }}
</div> </div>
</div> </div>
<hr <hr
style="border: none; border-top: 1px dashed #eee !important" style="border: none; border-top: 1px dashed #eee !important"
class="bg-transparent q-mb-sm" class="bg-transparent q-mb-sm"
...@@ -416,6 +457,7 @@ ...@@ -416,6 +457,7 @@
import coupon from "../../components/common/coupon.vue"; import coupon from "../../components/common/coupon.vue";
import NoneData from "src/components/common/noneData.vue"; import NoneData from "src/components/common/noneData.vue";
import auth from "src/components/common/auth.vue"; import auth from "src/components/common/auth.vue";
import {date} from 'quasar'
export default { export default {
components: { components: {
coupon, coupon,
...@@ -464,19 +506,36 @@ export default { ...@@ -464,19 +506,36 @@ export default {
countrys: [], countrys: [],
areaCodes: [], areaCodes: [],
guest: { guest: {
FirstName: "", Id:0,
LastName: "", TCID:0,
Passport: "", OrderId:0,
PassFirstName: "", VisaPlanId:0,
PassLastName: "", SurName: "羅",
Name: "超",
PassportNo: "D56465465",
ESurName: "LUO",
EName: "CHAO",
GuestType: 0, GuestType: 0,
EnableSignRoom: false, EnableSignRoom: false,
PassValidate: "", PassportExpiry: "2035-12-31",
FormatTypeName: "", FormatTypeName: "",
MobilePhone: "", MobilePhone: "17308037817",
RoomType: 0, RoomType: 0,
IsSignRoom: false, IsSignRoom: false,
Sex: 0, Sex: 1,
IdCard:'',
PassportIssued:'',
Purpose: "观光",
IsBed:1,
IsNeedAirticket:2,
IsNeedSafe:1,
IsVisaFree:2,
IssuingAuthority:2,
IsCriminalRecord:2,
IsDepartureRecord:2,
IsHightSchool:2,
IsB2B:1,
Birthday:'1990-12-26'
}, },
guests: [], guests: [],
disableSign: false, disableSign: false,
...@@ -486,7 +545,8 @@ export default { ...@@ -486,7 +545,8 @@ export default {
price: null, price: null,
unionCity: null, unionCity: null,
sumPrice:0, sumPrice:0,
submiting:false submiting:false,
CouponIds:[]
}; };
}, },
computed: { computed: {
...@@ -527,10 +587,164 @@ export default { ...@@ -527,10 +587,164 @@ export default {
} }
} }
if(flag){ if(flag){
this.submitOrderHandler()
//this.submitB2COrderHandler(81192)
return;
}
} }
this.submiting=false
},
submitOrderHandler(){
let msg={
OrderId:0,
TCID:this.order.order.tcid,
CustomerType:4,
GroupType:1,
ContactName:this.userInfo.Surname+this.userInfo.Name,
ContactMobile:this.userInfo.PhoneCountryStr+' '+this.userInfo.Moblie,
CustomerId:0,
DepartureCityId:this.order.order.startCityId,
IsIntermodal:this.unionCity?1:2,
Unit_Price:this.price.originalB2CPrice,
TC_Price:this.price.originalB2CPrice,
ManNum:this.chosenObj.crCount,
ChirdNum:this.chosenObj.etCount,
ChirdNeedBedNum:this.chosenObj.etzcCount,
BabyNum:this.chosenObj.yeCount,
OldPeopleNum: 0,
SingleRoomNum:this.chosenObj.df,
PreferPrice:this.sumPrice,
DiscountMoney:this.discountPrice,
CouponAllotIds: this.CouponIds.join(','),
YSeatNum:this.chosenObj.crCount+this.chosenObj.etCount,
ESeatNum:0,
FSeatNum:0,
Commission:0,//todo 提成
ClientSource:3,
BrandId:0,
TradeWay:0,
PlatformOrder:'',
GuestNum:this.chosenObj.crCount+this.chosenObj.etCount,
IsChildrenTour:this.price.isSupportChildren,
IsBirdDiscount:2,
PredictRoomNum:(parseFloat((this.chosenObj.crCount+this.chosenObj.etzcCount-this.chosenObj.df))/2.0)+this.chosenObj.df,
BigRoomNum:0,
TripleRoomNum:0,
TradeDate:date.formatDate(new Date(),'YYYY-MM-DD'),
CostType:0,
MinOrderPrice:0,
Remarks:this.chosenObj.remark,
VisaNum:this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.yeCount,
SafeNum:this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.yeCount,
AirticketNum:0,
ReturnArriveCityId:this.unionCity && this.unionCity.backFlight?this.unionCity.backFlight.arrivalCityId:this.trip.returnArriveCityId,
IsReturnIntermodal:this.unionCity && this.unionCity.backFlight?1:2,
GoCityTime:this.unionCity && this.unionCity.goFlight ? this.unionCity.goFlight.startDate:'',
BackCityTime:this.unionCity && this.unionCity.backFlight ? this.unionCity.backFlight.startDate:'',
ScenicRefundArr:[],
CommissionSharePeople:0,
CommissionShareMoney:0,
OrderSource:3,
RedEnvelopeMoney: 0
} }
this.apipost("sellorder_post_SetOrderInfoForB2B",msg,
res => {
if(res.data.resultCode==1){
this.uploadGuests(0,res.data.data.OrderId)
}else{
this.$message.error(res.data.message)
this.submiting=false this.submiting=false
}
},
err => {
this.submiting=false
});
},
uploadGuests(i,orderId){
let currentGuest = this.guests[i]
currentGuest.OrderId=orderId
currentGuest.TCID = this.order.order.tcid
this.apipost('sellorder_post_SetTravelGuestInfo_V2',currentGuest,r=>{
console.log(r)
if(i<this.guests.length-1){
this.uploadGuests(i,orderId)
}else{
this.submitB2COrderHandler(orderId)
}
})
},
submitB2COrderHandler(orderId){
let guestInfo = `成人x${this.chosenObj.crCount}; `
if(this.chosenObj.etzcCount>0){
guestInfo += `佔床兒童x${this.chosenObj.etzcCount}; `
}
if(this.chosenObj.etbzcCount>0){
guestInfo += `不佔床兒童x${this.chosenObj.etbzcCount}; `
}
if(this.chosenObj.yeCount>0){
guestInfo += `嬰兒x${this.chosenObj.yeCount}; `
}
if(this.chosenObj.df>0){
guestInfo += `單房x${this.chosenObj.df}; `
}
if(this.chosenObj.visaPrice>0){
guestInfo += `簽證x${this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.yeCount}; `
}
if(this.chosenObj.safeMoney>0){
guestInfo += `旅行保險x${this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.yeCount};`
}
let msg = {
SurName:this.userInfo.Surname,
Name:this.userInfo.Name,
ContactNumber:this.userInfo.PhoneCountryStr+' '+this.userInfo.Moblie,
Mailbox:this.userInfo.Mailbox,
GoodsId:this.order.order.tcid,
GoodsName:this.trip.title,
GoodsPic:this.trip.imgCover[0].Url,
GoodsType:this.price.teamType==0?2:(this.price.teamType==2?1:3),
OrderMake:`${ this.unionCity && this.unionCity.goFlight? this.unionCity.goFlight.startDate :this.price.startDate}從${this.unionCity?this.unionCity.cityName:this.trip.startCityName }出發 ${guestInfo}`,
TotalPrice:this.sumPrice,
PreferentialPrice:this.chosenObj.discountPrice,
ErpOrderId:orderId,
Country:this.userInfo.Country,
PlatformTax:0,
Income:0,
Refund:0
}
this.apipost("AddOrderInfo_post",msg,r=>{
if(r.data.resultCode==1){
this.$message.success("訂單創建成功")
this.goPayHandler(r.data.data)
} else {
this.$message.error(r.data.message)
}
})
},
goPayHandler(pay){
let key = this.$md5(JSON.stringify(pay))
let pays = localStorage.getItem('pays')
pays = pays?JSON.parse(pays):[]
pays.push({
key,
pay
})
localStorage.setItem("pays",JSON.stringify(pays))
let lineCars = localStorage.getItem('lineCars')
lineCars = lineCars?JSON.parse(lineCars):[]
let i = lineCars.findIndex(x=>x.key==this.orderKey)
if(i>=0){
lineCars.splice(i,1)
localStorage.setItem("lineCars",JSON.stringify(lineCars))
}
this.CommonJump('/pay/'+key, {});
},
GUID() {
return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
var r = Math.random()*16|0,
v = c == 'x' ? r : (r&0x3|0x8);
return v.toString(16);
})
}, },
async formValidateHandler(formName){ async formValidateHandler(formName){
let temp=this.$refs[formName] let temp=this.$refs[formName]
...@@ -562,7 +776,7 @@ export default { ...@@ -562,7 +776,7 @@ export default {
} }
if (this.orderKey == "") { if (this.orderKey == "") {
setTimeout(() => { setTimeout(() => {
//location.href=location.origin location.href=location.origin
}, 3000); }, 3000);
} }
return this.orderKey != ""; return this.orderKey != "";
...@@ -583,7 +797,8 @@ export default { ...@@ -583,7 +797,8 @@ export default {
money += this.price.singleRoomPrice * this.chosenObj.df; money += this.price.singleRoomPrice * this.chosenObj.df;
let sumCount = this.chosenObj.crCount + this.chosenObj.etCount let sumCount = this.chosenObj.crCount + this.chosenObj.etCount
//money += this.price.visaPrice * sumCount; money += this.price.visaPrice * sumCount;
money += this.price.safeMoney * sumCount;
money += this.price.otherPrice * sumCount; money += this.price.otherPrice * sumCount;
this.sumPrice = money; this.sumPrice = money;
}, },
...@@ -599,6 +814,8 @@ export default { ...@@ -599,6 +814,8 @@ export default {
if (this.chosenObj.df > 0) { if (this.chosenObj.df > 0) {
obj.EnableSignRoom = true; obj.EnableSignRoom = true;
} }
obj.IsBed=1
obj.IdCard=this.GUID()
this.guests.push(obj); this.guests.push(obj);
} }
for (let i = 0; i < this.chosenObj.etzcCount; i++) { for (let i = 0; i < this.chosenObj.etzcCount; i++) {
...@@ -608,18 +825,24 @@ export default { ...@@ -608,18 +825,24 @@ export default {
if (this.chosenObj.df > 0) { if (this.chosenObj.df > 0) {
obj.EnableSignRoom = true; obj.EnableSignRoom = true;
} }
obj.IsBed=1
obj.IdCard=this.GUID()
this.guests.push(obj); this.guests.push(obj);
} }
for (let i = 0; i < this.chosenObj.etbzcCount; i++) { for (let i = 0; i < this.chosenObj.etbzcCount; i++) {
let obj = JSON.parse(JSON.stringify(this.guest)); let obj = JSON.parse(JSON.stringify(this.guest));
obj.GuestType = 3; obj.GuestType = 3;
obj.FormatTypeName = `儿童不占床 ${i + 1}：`; obj.FormatTypeName = `儿童不占床 ${i + 1}：`;
obj.IsBed=0
obj.IdCard=this.GUID()
this.guests.push(obj); this.guests.push(obj);
} }
for (let i = 0; i < this.chosenObj.yeCount; i++) { for (let i = 0; i < this.chosenObj.yeCount; i++) {
let obj = JSON.parse(JSON.stringify(this.guest)); let obj = JSON.parse(JSON.stringify(this.guest));
obj.GuestType = 4; obj.GuestType = 4;
obj.FormatTypeName = `婴儿 ${i + 1}：`; obj.FormatTypeName = `婴儿 ${i + 1}：`;
obj.IsBed=0
obj.IdCard=this.GUID()
this.guests.push(obj); this.guests.push(obj);
} }
}, },
...@@ -661,6 +884,7 @@ export default { ...@@ -661,6 +884,7 @@ export default {
}); });
} }
}, },
getTripData() { getTripData() {
this.$q.loading.show(); this.$q.loading.show();
let msg = { let msg = {
...@@ -684,7 +908,7 @@ export default { ...@@ -684,7 +908,7 @@ export default {
if(this.order.order.startCityId!=this.trip.startCityId){ if(this.order.order.startCityId!=this.trip.startCityId){
this.unionCity = this.price.unionCityList.find(x=>x.cityId == this.order.order.startCityId) this.unionCity = this.price.unionCityList.find(x=>x.cityId == this.order.order.startCityId)
if(this.unionCity.backFlight && this.unionCity.backFlight.addPrice){ if(this.unionCity.backFlight && this.unionCity.backFlight.addPrice){
this.price.originalB2CPrice+=unionCity.backFlight.addPrice this.price.originalB2CPrice+=this.unionCity.backFlight.addPrice
} }
if(this.unionCity.goFlight && this.unionCity.goFlight.addPrice){ if(this.unionCity.goFlight && this.unionCity.goFlight.addPrice){
this.price.originalB2CPrice+=this.unionCity.goFlight.addPrice this.price.originalB2CPrice+=this.unionCity.goFlight.addPrice
......
src/pages/line/pay.vue 0 → 100644
View file @ f53c40bd
<template>
<div class="content-page order-preview">
<q-stepper
v-model="step"
ref="stepper"
color="primary"
inactive-color="grey-5 "
done-color="primary"
class="bg-transparent"
flat
animated
>
<q-step
:name="1"
title="確認訂單"
icon="settings"
:done="step > 1"
></q-step>
<q-step
:name="2"
title="付款"
icon="iconfont iconPayment-1"
:done="step > 2"
></q-step>
<q-step
:name="3"
title="訂購完成"
icon="iconfont iconicon_finish_R"
:done="step == 3"
></q-step>
</q-stepper>
</div>
</template>
<script>
export default {
data() {
return {
step:2
}
},
}
</script>
<style>
</style>
\ No newline at end of file
src/router/routes.js
View file @ f53c40bd
...@@ -51,91 +51,91 @@ const routes = [{ ...@@ -51,91 +51,91 @@ const routes = [{
}, },
{ {
path: '/account', //用户信息 path: '/account', //用户信息
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/account.vue') import ('pages/usercenter/account.vue')
}, },
{ {
path: '/demandlist', //需求单列表 path: '/demandlist', //需求单列表
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/demandlist.vue') import ('pages/usercenter/demandlist.vue')
}, },
{ {
path: '/demandinfo/:id', //需求单详情 path: '/demandinfo/:id', //需求单详情
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/demandinfo.vue') import ('pages/usercenter/demandinfo.vue')
}, },
{ {
path: '/orderlist', //订单列表 path: '/orderlist', //订单列表
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/orderlist.vue') import ('pages/usercenter/orderlist.vue')
}, },
{ {
path: '/orderinfo/:id', //订单详情 path: '/orderinfo/:id', //订单详情
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/orderinfo.vue') import ('pages/usercenter/orderinfo.vue')
}, },
{ {
path: '/passengerList/:id', //旅客名单 path: '/passengerList/:id', //旅客名单
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/passengerList.vue') import ('pages/usercenter/passengerList.vue')
}, },
{ {
path: '/register', //用户注册 path: '/register', //用户注册
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/register.vue') import ('pages/usercenter/register.vue')
}, },
{ {
path: '/loginInfo', //账户设置 path: '/loginInfo', //账户设置
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/loginInfo.vue') import ('pages/usercenter/loginInfo.vue')
}, },
{ {
path: '/setAddress', //地址管理 path: '/setAddress', //地址管理
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/setAddress.vue') import ('pages/usercenter/setAddress.vue')
}, },
{ {
path: '/setInfo', //账户设置 path: '/setInfo', //账户设置
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/setInfo.vue') import ('pages/usercenter/setInfo.vue')
}, },
{ {
path: '/setUserInfo', //用户信息 path: '/setUserInfo', //用户信息
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/setUserInfo.vue') import ('pages/usercenter/setUserInfo.vue')
}, },
{ {
path: '/coupon', //优惠券 path: '/coupon', //优惠券
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/coupon.vue') import ('pages/usercenter/coupon.vue')
}, },
{ {
path: '/order', //用户订单 path: '/order', //用户订单
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/order.vue') import ('pages/usercenter/order.vue')
}, },
{ {
path: '/setUsersList', //用户订单 path: '/setUsersList', //用户订单
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/setUsersList.vue') import ('pages/usercenter/setUsersList.vue')
}, },
{ {
path: '/payInfo', //支付管理 path: '/payInfo', //支付管理
meta: {isUserCenter: true}, meta: { isUserCenter: true },
component: () => component: () =>
import ('pages/usercenter/payInfo.vue') import ('pages/usercenter/payInfo.vue')
}, },
...@@ -154,6 +154,11 @@ const routes = [{ ...@@ -154,6 +154,11 @@ const routes = [{
component: () => component: () =>
import ('pages/line/orderPreview.vue') import ('pages/line/orderPreview.vue')
}, },
{
path: '/pay/:id?', //自定义页面
component: () =>
import ('pages/line/pay.vue')
},
] ]
}, },
......
yarn.lock
View file @ f53c40bd
...@@ -8916,6 +8916,11 @@ svgo@^1.0.0: ...@@ -8916,6 +8916,11 @@ 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: swiper@^4.0.7:
version "4.5.1" version "4.5.1"
resolved "https://registry.yarnpkg.com/swiper/-/swiper-4.5.1.tgz#ed43998e780ceb478610079c8d23fd425eca636f" resolved "https://registry.yarnpkg.com/swiper/-/swiper-4.5.1.tgz#ed43998e780ceb478610079c8d23fd425eca636f"
...@@ -9622,6 +9627,11 @@ vue@^2.6.10: ...@@ -9622,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