Skip to content

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

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

# Conflicts:
#	src/pages/ScenicSpotTicket/details.vue
parents cbd1d523 c24a09f0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 412 additions and 440 deletions
package.json
View file @ af6deef2
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
"vuelidate": "^0.7.7" "vuelidate": "^0.7.7"
}, },
"devDependencies": { "devDependencies": {
"@quasar/app": "^1.0.0" "@quasar/app": "^1.0.0",
"webpack-dev-server": "^4.12.0"
}, },
"engines": { "engines": {
"node": ">= 10.18.1", "node": ">= 10.18.1",
......
src/components/base-switch.vue
View file @ af6deef2
...@@ -55,6 +55,7 @@ export default { ...@@ -55,6 +55,7 @@ export default {
}, },
watch: { watch: {
value: function() { value: function() {
console.log('switch change', this.value)
this.inputSelect = this.value this.inputSelect = this.value
} }
}, },
......
src/components/car/orderPreview.vue
View file @ af6deef2
...@@ -151,10 +151,11 @@ export default { ...@@ -151,10 +151,11 @@ export default {
this.p = n; this.p = n;
if(n&&n.startDate){ if(n&&n.startDate){
this.chosenObj.startDate = n.startDate; this.chosenObj.startDate = n.startDate;
console.log(this.chosenObj.startDate,this.dataAll,'===')
let arr = this.dataAll.filter(x=> x.Date==this.chosenObj.startDate) let arr = this.dataAll.filter(x=> x.Date==this.chosenObj.startDate)
this.TicketIds = arr[0].Price.map(x=> {return x.TicketId}) if(arr.length>0){
// this.selectedCar = this.dataList.CarTypeList[0].Id this.TicketIds = arr[0].Price.map(x=> {return x.TicketId})
// this.selectedCarObj = this.dataList.CarTypeList[0] }
} }
this.calcMoney() this.calcMoney()
...@@ -170,6 +171,14 @@ export default { ...@@ -170,6 +171,14 @@ export default {
deep: true, deep: true,
immediate: true immediate: true
}, },
Month:{
handler(n, o) {
this.selectedCarObj = this.dataList.CarTypeList[0]
// this.getCarPriceData2()
},
deep: true,
immediate: true
}
}, },
data() { data() {
return { return {
...@@ -189,7 +198,7 @@ export default { ...@@ -189,7 +198,7 @@ export default {
if(this.p.startDate){ if(this.p.startDate){
this.chosenObj.startDate = this.p.startDate; this.chosenObj.startDate = this.p.startDate;
this.calcMoney() this.calcMoney()
this.getCarPriceData2() // this.getCarPriceData2()
} }
this.getCarPriceData() this.getCarPriceData()
}, },
...@@ -312,13 +321,11 @@ export default { ...@@ -312,13 +321,11 @@ export default {
remark: "", remark: "",
}; };
}, },
resetHandler(type) { resetHandler() {
if(type&&type!=1){ this.selectedCarObj = null
this.selectedCarObj = null this.selectedAirportObj = null
this.selectedAirportObj = null this.onCarObj = null
this.onCarObj = null this.unCarObj = null
this.unCarObj = null
}
setTimeout(()=>{ setTimeout(()=>{
this.p = {}; this.p = {};
this.initModel() this.initModel()
......
src/components/navs/city-category.vue
View file @ af6deef2
<<<<<<< HEAD
=======
>>>>>>> c020ad40be0c4ddc009c7e515bf5c6c1ac25638c
<style scoped> <style scoped>
.header-box { .header-box {
max-width: 1200px; max-width: 1200px;
...@@ -107,6 +103,9 @@ ...@@ -107,6 +103,9 @@
.address-btn { .address-btn {
margin: 0 10px 0 44px; margin: 0 10px 0 44px;
} }
.address-btn:hover {
background: #F5F5F5;
}
.all-type { .all-type {
margin-left: 10px; margin-left: 10px;
} }
...@@ -134,7 +133,8 @@ ...@@ -134,7 +133,8 @@
font-weight: 400; font-weight: 400;
} }
.category-l2:hover { .category-l2:hover {
background-color: #eee; background: #ee4454;
color: #fff;
} }
.category-l2-select { .category-l2-select {
background: #ee4454; background: #ee4454;
...@@ -162,6 +162,10 @@ ...@@ -162,6 +162,10 @@
.category-btn { .category-btn {
width: 100px; width: 100px;
} }
.category-icon {
width: 16px;
height: 16px;
}
</style> </style>
<template> <template>
<div> <div>
...@@ -286,6 +290,7 @@ ...@@ -286,6 +290,7 @@
:key="i" :key="i"
v-for="(x, i) in dataList.CategoryList" v-for="(x, i) in dataList.CategoryList"
> >
<img class="category-icon" :src="require(`../../assets/img/home/${['guanguang','jindian','hotel','car'][i]}.png`)"/>
{{ x.CategoryName }} {{ x.CategoryName }}
</div> </div>
</div> </div>
......
src/components/searchdata/kkday.vue
View file @ af6deef2
...@@ -473,6 +473,7 @@ export default { ...@@ -473,6 +473,7 @@ export default {
// }, // },
chosenSortHandler(x) { chosenSortHandler(x) {
this.msg.orderBy = x.value; this.msg.orderBy = x.value;
this.msg.pageIndex = 1
this.goSearchHandler(); this.goSearchHandler();
}, },
getChoseAddressCity() { getChoseAddressCity() {
......
src/components/trip/calendar.vue
View file @ af6deef2
...@@ -122,10 +122,10 @@ export default { ...@@ -122,10 +122,10 @@ export default {
}, },
methods: { methods: {
init() { init() {
this.createChosenDateHandler(); this.createChosenDateHandler();
let startDate = this.prices.length>0&&this.prices[0].startDate?this.prices[0].startDate:''
let firstMonth = date.formatDate( let firstMonth = date.formatDate(
new Date(this.prices[0].startDate), new Date(startDate),
"YYYY/MM" "YYYY/MM"
); );
console.log(firstMonth) console.log(firstMonth)
...@@ -150,6 +150,8 @@ export default { ...@@ -150,6 +150,8 @@ export default {
}, },
changeShowMonthHandler(i) { changeShowMonthHandler(i) {
this.currentMonth += i; this.currentMonth += i;
let value = this.months[this.currentMonth].value
this.$emit('getQuotationData',value)
this.changeMonthHandler(); this.changeMonthHandler();
}, },
changeMonthHandler() { changeMonthHandler() {
......
src/pages/Pickuporder/orderForm.vue
View file @ af6deef2
...@@ -521,13 +521,6 @@ ...@@ -521,13 +521,6 @@
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"
/> />
<div class="row q-mb-sm items-center">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">
CNY {{ 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"> <div class="row q-mb-sm items-center">
<div class="col">優惠金額</div> <div class="col">優惠金額</div>
<div <div
...@@ -538,10 +531,17 @@ ...@@ -538,10 +531,17 @@
</div> </div>
<div class="text-grey-5" v-else>暫無優惠</div> <div class="text-grey-5" v-else>暫無優惠</div>
</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">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">
CNY {{ moneyFormat(sumPrice, 2) }}
</div>
</div>
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" /> <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center" v-if="chosenObj.Count>0"> <div class="row q-mb-sm items-center" v-if="chosenObj.Count>0">
<div class="col">支付金額</div> <div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(parameters.Money,2) }}</div> <div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(parameters.Money,2) }}</div>
</div> </div>
</div> </div>
<div class="text-right q-mt-md" v-if="step!=3"> <div class="text-right q-mt-md" v-if="step!=3">
......
src/pages/ScenicSpotTicket/details.vue
View file @ af6deef2
This diff is collapsed.
src/pages/ScenicSpotTicket/orderForm.vue
View file @ af6deef2
...@@ -286,13 +286,8 @@ ...@@ -286,13 +286,8 @@
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"
/> />
<div class="row q-mb-sm items-center">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">
CNY {{ 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="parameters.MailingState==2&&parameters.MailingMoney>0"> <div class="row q-mb-sm items-center" v-if="parameters.MailingState==2&&parameters.MailingMoney>0">
<div class="col">邮寄费</div> <div class="col">邮寄费</div>
<div <div
...@@ -311,6 +306,13 @@ ...@@ -311,6 +306,13 @@
</div> </div>
<div class="text-grey-5" v-else>暫無優惠</div> <div class="text-grey-5" v-else>暫無優惠</div>
</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">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">
CNY {{ moneyFormat(sumPrice, 2) }}
</div>
</div>
<div class="row q-mb-sm items-center"> <div class="row q-mb-sm items-center">
<div class="col">支付金額</div> <div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price"> <div class="text-h6 text-weight-bolder text-primary product-price">
......
src/pages/detailsCar.vue
View file @ af6deef2
...@@ -173,11 +173,12 @@ ...@@ -173,11 +173,12 @@
<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>
<!-- :disable="priceList.length>0?false:true" -->
<q-btn <q-btn
color="primary" color="primary"
label="選擇方案" label="選擇方案"
unelevated unelevated
:disable="priceList.length>0?false:true"
@click="goScrollHandler(priceListHeight)" @click="goScrollHandler(priceListHeight)"
:class="{ 'q-mt-md full-width': $q.platform.is.desktop }" :class="{ 'q-mt-md full-width': $q.platform.is.desktop }"
/> />
...@@ -260,6 +261,7 @@ ...@@ -260,6 +261,7 @@
class="bg-white q-pa-md" class="bg-white q-pa-md"
:priceList="priceList" :priceList="priceList"
@change="changeChosenDateHandler" @change="changeChosenDateHandler"
@getQuotationData="getCarPriceData2"
ref="calendar" ref="calendar"
></calendar> ></calendar>
</q-popup-proxy> </q-popup-proxy>
...@@ -271,6 +273,7 @@ ...@@ -271,6 +273,7 @@
:price="currentPrice" :price="currentPrice"
@reset="resetHandler" @reset="resetHandler"
@getPriceList="getPriceList" @getPriceList="getPriceList"
ref="orderPreview"
></order-preview> ></order-preview>
</div> </div>
...@@ -278,9 +281,9 @@ ...@@ -278,9 +281,9 @@
<div class="text-h6 q-pt-lg" v-if="$q.platform.is.mobile"> <div class="text-h6 q-pt-lg" v-if="$q.platform.is.mobile">
所選方案詳情 所選方案詳情
</div> </div>
<!-- v-if="priceList && priceList.length > 0" -->
<div <div
class="bg-white rounded-borders q-mt-md" class="bg-white rounded-borders q-mt-md"
v-if="priceList && priceList.length > 0"
> >
<div class="q-pa-md row"> <div class="q-pa-md row">
<div class="col"> <div class="col">
...@@ -309,12 +312,13 @@ ...@@ -309,12 +312,13 @@
</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">
<span class="product-price text-h6 q-mr-md" <span v-if="priceList.length>0&&priceList[0].originalB2CPrice > 0" class="product-price text-h6 q-mr-md"
>CNY >CNY
{{ {{
moneyFormat(priceList[0].originalB2CPrice, 0) moneyFormat(priceList[0].originalB2CPrice, 0)
}}</span }}</span
> >
<span v-else class="col"></span>
<q-btn <q-btn
color="primary" color="primary"
outline outline
...@@ -323,7 +327,7 @@ ...@@ -323,7 +327,7 @@
class="q-px-lg" class="q-px-lg"
/> />
</div> </div>
<div class="text-info q-mt-md text-right"> <div class="text-info q-mt-md text-right" v-if="priceList.length>0">
最早可預訂日期：{{ priceList[0].startDate }} 最早可預訂日期：{{ priceList[0].startDate }}
</div> </div>
</div> </div>
...@@ -356,6 +360,7 @@ ...@@ -356,6 +360,7 @@
<calendar <calendar
:priceList="priceList" :priceList="priceList"
@change="changeChosenDateHandler" @change="changeChosenDateHandler"
@getQuotationData="getCarPriceData2"
ref="calendar" ref="calendar"
></calendar> ></calendar>
</div> </div>
...@@ -367,6 +372,7 @@ ...@@ -367,6 +372,7 @@
:price="currentPrice" :price="currentPrice"
@reset="resetHandler" @reset="resetHandler"
@getPriceList="getPriceList" @getPriceList="getPriceList"
ref="orderPreview"
></order-preview> ></order-preview>
</div> </div>
</div> </div>
...@@ -980,7 +986,12 @@ export default { ...@@ -980,7 +986,12 @@ export default {
); );
}, },
// 获取车的详情 // 获取车的详情
getCarPriceData2() { getCarPriceData2(time) {
// 日历翻页更新报价
if(time){
this.currentYM.str = time
this.$refs.orderPreview.resetHandler()
}
this.priceList = [] this.priceList = []
this.apipost( this.apipost(
"b2c_get_GetCarSingleProductMonthPrice", "b2c_get_GetCarSingleProductMonthPrice",
...@@ -1005,9 +1016,19 @@ export default { ...@@ -1005,9 +1016,19 @@ export default {
if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){ if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
arr.push(dataObj) arr.push(dataObj)
} }
} }
}) })
if(arr.length==0){
let dataObj = {
startDate: this.currentYM.str,
originalB2CPrice: '',
remainNum: 0,
Count: 0,
isSupportChildren: 0,
safeMoney: 0,
}
arr.push(dataObj)
}
this.priceList = JSON.parse(JSON.stringify(arr)) this.priceList = JSON.parse(JSON.stringify(arr))
} }
......
src/pages/usercenter/order.vue
View file @ af6deef2
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</div> </div>
<div> <div>
<div class="text-right"> <div class="text-right">
<span>CNY:</span> <span>CNY </span>
<span class="text-h6 q-ml-sm">{{ moneyFormat(item.totalPrice,2) }}</span> <span class="text-h6 q-ml-sm">{{ moneyFormat(item.totalPrice,2) }}</span>
</div> </div>
<div class="q-mt-md text-right" v-if="item.orderStatus==1"> <div class="q-mt-md text-right" v-if="item.orderStatus==1">
......
src/pages/usercenter/order/carPriceDetail.vue
View file @ af6deef2
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div class="text-grey-9"> <div class="text-grey-9">
<!-- <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj"> <!-- <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
<div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div> <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
<div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div> <div>CNY {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
</div> --> </div> -->
<hr <hr
style="border: none;" style="border: none;"
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<!-- <hr style="border:none;" class="bg-transparent q-mb-sm" /> <!-- <hr style="border:none;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center"> <div class="row q-mb-sm items-center">
<div class="col">支付金額</div> <div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div> <div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(Money,2) }}</div>
</div> --> </div> -->
</div> </div>
......
src/pages/usercenter/setAddress.vue
View file @ af6deef2
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
min-height: 40px; min-height: 40px;
} }
.title { .title {
margin-top: 20px;
margin-bottom: 10px; margin-bottom: 10px;
margin-left: 10px; margin-left: 10px;
} }
...@@ -113,7 +112,7 @@ ...@@ -113,7 +112,7 @@
<div class="f22 bold">{{form.Id ? '编辑': '添加'}}邮寄地址</div> <div class="f22 bold">{{form.Id ? '编辑': '添加'}}邮寄地址</div>
<form @submit.prevent.stop="submit" class="q-gutter-md"> <form @submit.prevent.stop="submit" class="q-gutter-md">
<div> <div>
<div :class="$q.platform.is.desktop ? 'row': 'culmuns'"> <div class="q-mt-xl" :class="$q.platform.is.desktop ? 'row': 'culmuns'">
<div class="col"> <div class="col">
<div class="title">全名</div> <div class="title">全名</div>
<q-input <q-input
...@@ -171,6 +170,7 @@ ...@@ -171,6 +170,7 @@
v-model="form.Mobile" v-model="form.Mobile"
outlined outlined
:rules="[(val) => !!val || '请输入手機號碼']" :rules="[(val) => !!val || '请输入手機號碼']"
mask="#" reverse-fill-mask
> >
<template v-slot:prepend> <template v-slot:prepend>
<div class="text-subtitle2"> <div class="text-subtitle2">
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
placeholder="城市" placeholder="城市"
v-model="form.CityName" v-model="form.CityName"
outlined outlined
:rules="[(val) => !!val || '请输入電話（首次需驗證）']" :rules="[(val) => !!val || '请输入城市']"
></q-input> ></q-input>
</div> </div>
</div> </div>
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
<div class="col"> <div class="col">
<div class="title">郵政編碼</div> <div class="title">郵政編碼</div>
<q-input <q-input
mask="#" reverse-fill-mask
ref="PostalCode" ref="PostalCode"
class="form-item" class="form-item"
placeholder="郵政編碼" placeholder="郵政編碼"
...@@ -214,8 +215,8 @@ ...@@ -214,8 +215,8 @@
></q-input> ></q-input>
</div> </div>
</div> </div>
<div class="flex items-center q-my-sm"> <div class="flex items-center q-mb-lg">
<BaseSwitch v-model="form.IsDefault"></BaseSwitch <BaseSwitch ref="switch" v-model="form.IsDefault" :value="form.IsDefault"></BaseSwitch
><span class="q-ml-sm">保存為默認地址</span></div> ><span class="q-ml-sm">保存為默認地址</span></div>
<div> <div>
<q-btn color="primary" type="submit" unelevated label="保存" /> <q-btn color="primary" type="submit" unelevated label="保存" />
...@@ -353,6 +354,11 @@ export default { ...@@ -353,6 +354,11 @@ export default {
this.form = {...item}; this.form = {...item};
this.form.AreaCode = Number(this.form.AreaCode) this.form.AreaCode = Number(this.form.AreaCode)
this.form.IsDefault = this.form.IsDefault === 1 this.form.IsDefault = this.form.IsDefault === 1
this.$nextTick(() => {
this.$refs.switch.inputSelect = this.form.IsDefault
})
console.log('this.form.IsDefault', this.form.IsDefault)
this.isShowDialog = true; this.isShowDialog = true;
}, },
deleteUser(item) { deleteUser(item) {
......
src/pages/usercenter/setInfo.vue
View file @ af6deef2
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<q-btn color="primary" class="q-mt-sm" @click="removeAccount">删除您的帐户及个人数据</q-btn> <q-btn color="primary" class="q-mt-sm" @click="removeAccount">删除您的帐户及个人数据</q-btn>
</div> </div>
</div> </div>
<q-dialog content-style="width: 900px" v-model="showRemove"> <q-dialog v-model="showRemove">
<removeAccount></removeAccount> <removeAccount></removeAccount>
</q-dialog> </q-dialog>
</div> </div>
...@@ -272,6 +272,10 @@ export default { ...@@ -272,6 +272,10 @@ export default {
this.form, this.form,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.form= {
OldPassword: "",
NewPassword: "",
}
// this.$notify(res.data.message); // this.$notify(res.data.message);
this.$q.notify({ this.$q.notify({
type: "positive", type: "positive",
......
src/pages/usercenter/setUserInfo.vue
View file @ af6deef2
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
Appellation: "", Appellation: "",
EnName: "", EnName: "",
EnSurname: "", EnSurname: "",
Country: "", Country: undefined,
Moblie: "", Moblie: "",
}, },
model: "", model: "",
...@@ -297,6 +297,12 @@ export default { ...@@ -297,6 +297,12 @@ export default {
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.form = res.data.data; this.form = res.data.data;
if(!this.form.Country) {
this.form.Country = undefined
}
if(!this.form.Appellation) {
this.form.Appellation = undefined
}
if (this.phoneCountList.length) { if (this.phoneCountList.length) {
this.changeCountry(this.form.Country); this.changeCountry(this.form.Country);
} }
......
src/pages/usercenter/setUsersList.vue
View file @ af6deef2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
width: 900px; width: 900px;
} }
.title { .title {
margin: 20px 10px 10px 10px; margin: 0 10px 10px 10px;
} }
.card { .card {
margin: 10px; margin: 10px;
...@@ -39,10 +39,8 @@ ...@@ -39,10 +39,8 @@
::v-deep .q-field__marginal { ::v-deep .q-field__marginal {
height: 40px; height: 40px;
} }
.title { ::v-deep .q-field--auto-height .q-field__native {
margin-top: 20px; min-height: 40px;
margin-bottom: 10px;
margin-left: 10px;
} }
.phone { .phone {
margin-left: 100px; margin-left: 100px;
...@@ -77,6 +75,7 @@ ...@@ -77,6 +75,7 @@
.card-info { .card-info {
height: 20px; height: 20px;
padding: 0 4px; padding: 0 4px;
margin: 0 0 20px 0;
background: #dddddd; background: #dddddd;
border-radius: 8px; border-radius: 8px;
} }
...@@ -87,8 +86,8 @@ ...@@ -87,8 +86,8 @@
<div class="card" v-for="item in pageData" :key="item.id"> <div class="card" v-for="item in pageData" :key="item.id">
<div class="flex card-title justify-between"> <div class="flex card-title justify-between">
<div class="flex"> <div class="flex">
<span>{{ item.Name }}</span> <span>{{item.SurName}} {{ item.Name }}</span>
<span v-if="$q.platform.is.desktop" class="phone">手機號：{{ item.Mobile }}</span> <span v-if="$q.platform.is.desktop" class="phone">手機號：+{{ item.AreaCode }} {{ item.Mobile }}</span>
</div> </div>
<span> <span>
<span class="user-edit" @click="editUser(item)">编辑</span> <span class="user-edit" @click="editUser(item)">编辑</span>
...@@ -97,18 +96,18 @@ ...@@ -97,18 +96,18 @@
> >
</span> </span>
</div> </div>
<div class="q-pa-sm"> <div class="q-pa-sm q-ml-sm">
<span class="q-ml-sm" v-if="$q.platform.is.mobile">手機號：{{ item.Mobile }}</span> <span v-if="$q.platform.is.mobile">手機號：{{ item.Mobile }}</span>
<div class="q-pa-sm full-width" <div :class="$q.platform.is.desktop ? 'row': 'culmuns'">
<div class="col-6 q-py-sm"
:class="{ 'border-b': index < item.CardList.length - 1 }" :class="{ 'border-b': index < item.CardList.length - 1 }"
v-for="(el, index) in item.CardList" v-for="(el, index) in item.CardList"
:key="index" :key="index"
> >
<div :class="$q.platform.is.desktop ? 'row': 'culmuns'"> <div>{{ el.TypeName }}:{{ el.CardNo }}</div>
<div class="col-6">{{ el.TypeName }}</div>
<div class="col-6" :class="$q.platform.is.mobile ? 'q-mt-xs': ''">{{ el.CardNo }}</div>
</div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -144,7 +143,7 @@ ...@@ -144,7 +143,7 @@
<form @submit.prevent.stop="submit" class="q-gutter-md"> <form @submit.prevent.stop="submit" class="q-gutter-md">
<div> <div>
<div :class="$q.platform.is.desktop ? 'row': 'culmuns'"> <div :class="$q.platform.is.desktop ? 'row': 'culmuns'">
<div class="col"> <div class="col q-mt-md">
<div class="title">姓</div> <div class="title">姓</div>
<q-input <q-input
class="form-item" class="form-item"
...@@ -167,23 +166,23 @@ ...@@ -167,23 +166,23 @@
</div> </div>
<div :class="$q.platform.is.desktop ? 'row': 'culmuns'"> <div :class="$q.platform.is.desktop ? 'row': 'culmuns'">
<div class="col"> <div class="col">
<div class="title">姓氏（需與旅遊證件一致）</div> <div class="title">姓氏（请输入英文字母）</div>
<q-input <q-input
class="form-item" class="form-item"
v-model="form.EnName" v-model="form.EnName"
outlined outlined
ref="EnName" ref="EnName"
:rules="[(val) => !!val || '请输入姓氏（需與旅遊證件一致）']" :rules="[(val) => !!val || '请输入姓氏（请输入英文字母）']"
></q-input> ></q-input>
</div> </div>
<div class="col"> <div class="col">
<div class="title">名字（需與旅遊證件一致）</div> <div class="title">名字（请输入英文字母）</div>
<q-input <q-input
ref="EnSurName" ref="EnSurName"
class="form-item" class="form-item"
v-model="form.EnSurName" v-model="form.EnSurName"
outlined outlined
:rules="[(val) => !!val || '请输入名字（需與旅遊證件一致）']" :rules="[(val) => !!val || '请输入名字（请输入英文字母）']"
></q-input> ></q-input>
</div> </div>
</div> </div>
......
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