Skip to content

M
million
Commit db1bf4b9 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 1d3453a6
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 189 deletions
src/boot/utils.js
View file @ db1bf4b9
......@@ -101,19 +101,7 @@ Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
}
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
})
} else if (res.data.resultCode == 10005) {
this.$router.go(-1)
} else {
if (res.data.award && res.data.award.mName !== null) {
this.MsgBus.$emit('openRaffleTickets', res.data.award)
}
successCall(res)
}
successCall(res)
}, faildCall)
},
......@@ -248,6 +236,9 @@ Vue.prototype.getUrlKey = function (name, url) {
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ""])[1].replace(/\+/g, '%20')) || null
}
Vue.prototype.GetHtml = function (str) {
return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>')
.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&apos;/g, "'");
if (str && str != "") {
return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>')
.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&apos;/g, "'");
}
return str;
}
src/pages/usercenter/account.vue
View file @ db1bf4b9
......@@ -187,6 +187,9 @@
this.accountMsg.Mobile = jsonData.Mobile;
this.accountMsg.Name = jsonData.Name;
this.accountMsg.Sex = jsonData.Sex;
}else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
},
err => {}
......@@ -225,9 +228,9 @@
position:'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
// var jsonData = JSON.stringify(res.data.data);
// window.localStorage.setItem("b2bUser", jsonData);
}else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
},
err => {}
......@@ -283,6 +286,9 @@
position:'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
}else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
},
err => {}
......
src/pages/usercenter/demandinfo.vue
View file @ db1bf4b9
......@@ -152,6 +152,10 @@
if (res.data.resultCode == 1) {
this.InfoData = res.data.data;
}
else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
},
err => {}
);
......
src/pages/usercenter/demandlist.vue
View file @ db1bf4b9
......@@ -247,6 +247,10 @@
this.DataList = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
},
err => {}
);
......
src/pages/usercenter/orderinfo.vue
View file @ db1bf4b9
......@@ -239,7 +239,6 @@
res => {
this.$q.loading.hide()
if (res.data.resultCode == 1) {
console.log(" res.data.data", res.data.data);
this.InfoData = res.data.data.model;
this.modelPrice = res.data.data.modelPrice;
}
......
src/pages/usercenter/orderlist.vue
View file @ db1bf4b9
......@@ -50,9 +50,11 @@
display: block;
padding: 20px 25px;
}
.order-list{
padding:0;
.order-list {
padding: 0;
}
.order-list li {
margin-bottom: 15px;
font-size: 0;
......@@ -118,18 +120,20 @@
}
}
.text-my{
color:#00afff;
.text-my {
color: #00afff;
}
.order_titleMobile{
margin:20px 0 10px 0;
font-size:25px;
color:#666;
.order_titleMobile {
margin: 20px 0 10px 0;
font-size: 25px;
color: #666;
}
@media only screen and (max-width: 1200px) {
.order_tour {
width: 100%!important;
padding-right:0!important;
width: 100% !important;
padding-right: 0 !important;
}
}
......@@ -140,24 +144,18 @@
<template v-if="!$q.screen.xs">
<div class="order-header">
<div class="order_title">我的訂單</div>
<q-tabs
v-model="tab"
inline-label
class="text-my"
>
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="handleClick(item)" :key="index" />
<q-tabs v-model="tab" inline-label class="text-my">
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="handleClick(item)"
:key="index" />
</q-tabs>
</div>
</template>
<template v-if="$q.screen.xs">
<div>
<div class="order_titleMobile">我的訂單</div>
<q-tabs
v-model="tab"
inline-label
class="text-my"
>
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="handleClick(item)" :key="index" />
<q-tabs v-model="tab" inline-label class="text-my">
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="handleClick(item)"
:key="index" />
</q-tabs>
</div>
</template>
......@@ -216,7 +214,7 @@
props: [],
data() {
return {
tab:'全部',
tab: '全部',
qMsg: {
PageIndex: 1,
PageSize: 10,
......@@ -281,11 +279,15 @@
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
this.$q.loading.hide()
this.$q.loading.hide();
console.log("res",res);
if (res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
} else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
},
null
);
......
src/pages/usercenter/passengerList.vue
View file @ db1bf4b9
......@@ -160,10 +160,12 @@
padding-left: 20px;
list-style-type: disc;
}
.order-buy .q-field--with-bottom{
padding-bottom:0!important;
margin-bottom:20px;
.order-buy .q-field--with-bottom {
padding-bottom: 0 !important;
margin-bottom: 20px;
}
.account_labelName {
margin: 20px 0 10px 0;
font-size: 15px;
......@@ -176,10 +178,12 @@
.order-buy .q-field__control {
min-height: 46px;
}
.otherBeizhu .q-field__control{
min-height:auto;
height:auto;
.otherBeizhu .q-field__control {
min-height: auto;
height: auto;
}
.order-buy .q-field__native {
min-height: 46px;
}
......@@ -251,56 +255,68 @@
background-color: #fffde7;
color: #ff9800;
}
.isShowDiv{
visibility:hidden;
height:0;
padding:0!important;
.isShowDiv {
visibility: hidden;
height: 0;
padding: 0 !important;
}
@media only screen and (max-width: 980px){
@media only screen and (max-width: 980px) {
.order-info {
margin-right: 0;
width: 100%;
margin-right: 0;
width: 100%;
}
.order-right{
display:none;
.order-right {
display: none;
}
}
@media only screen and (max-width: 768px){
.order-buy .tour-desc .tour-cover{
width:100%;
margin:0 0 20px 0;
@media only screen and (max-width: 768px) {
.order-buy .tour-desc .tour-cover {
width: 100%;
margin: 0 0 20px 0;
}
.order-buy .tour_content {
width: 100%;
padding-bottom: 15px;
border-bottom: 1px dashed #ddd;
width: 100%;
padding-bottom: 15px;
border-bottom: 1px dashed #ddd;
}
.order-buy .row .col-6{
width:100%;
.order-buy .row .col-6 {
width: 100%;
}
.order-buy .row .account_labelName{
margin-top:10px;
.order-buy .row .account_labelName {
margin-top: 10px;
}
.order-buy .data-content .q-col-gutter-y-lg{
margin-top:5px;
.order-buy .data-content .q-col-gutter-y-lg {
margin-top: 5px;
}
.order-buy .row .account-group{
padding-top:0!important;
.order-buy .row .account-group {
padding-top: 0 !important;
}
.order-buy .data-content{
padding-top:5px;
.order-buy .data-content {
padding-top: 5px;
}
.isFixed{
.isFixed {
position: fixed;
top:60px;
right:0;
z-index:9999;
top: 60px;
right: 0;
z-index: 9999;
}
}
.order-buy .Order_content .q-gutter-md{
margin-left:0;
.order-buy .Order_content .q-gutter-md {
margin-left: 0;
}
</style>
<template>
<q-page>
......@@ -345,8 +361,8 @@
<!-- 旅客资料开始 -->
<div class="order-info-block" v-if="shape==1">
<div class="buy-title">旅客資料
<q-btn color="amber" @click="getConnect()" id="home-tab" :class="{'isFixed':isFixed}" type="submit" style="float:right;font-size:17px;font-weight:bold;"
label="儲存" />
<q-btn color="amber" @click="getConnect()" id="home-tab" :class="{'isFixed':isFixed}" type="submit"
style="float:right;font-size:17px;font-weight:bold;" label="儲存" />
</div>
<q-form ref="myForm" class="q-gutter-md">
<div class="member-data" v-for="(item,index) in GuestObj.list" :key="index">
......@@ -356,99 +372,107 @@
<i class="iconfont iconarrowdown" v-else @click="getShow(item)"></i>
</div>
<div class="data-content" :class="{'isShowDiv':!item.isShow}">
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">中文姓</div>
<q-input outlined v-model="item.SurName" :rules="[ val => val && val.length > 0 || '请输入中文姓']" class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">中文名</div>
<q-input outlined v-model="item.Name" :rules="[ val => val && val.length > 0 || '请输入中文名']" class="bg-grey-1" />
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">中文姓</div>
<q-input outlined v-model="item.SurName" :rules="[ val => val && val.length > 0 || '请输入中文姓']"
class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">中文名</div>
<q-input outlined v-model="item.Name" :rules="[ val => val && val.length > 0 || '请输入中文名']"
class="bg-grey-1" />
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">護照姓 ( 英文 )</div>
<q-input outlined v-model="item.ESurName" :rules="[ val => val && val.length > 0 || '请输入護照姓']" class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">護照名 ( 英文 )</div>
<q-input outlined v-model="item.EName" :rules="[ val => val && val.length > 0 || '请输入護照名']" class="bg-grey-1" />
</div>
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">護照姓 ( 英文 )</div>
<q-input outlined v-model="item.ESurName" :rules="[ val => val && val.length > 0 || '请输入護照姓']"
class="bg-grey-1" />
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">身分證字號</div>
<q-input outlined v-model="item.IdCard" :rules="[ val => val && val.length > 0 || '请输入身分證字號']" class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">護照名 ( 英文 )</div>
<q-input outlined v-model="item.EName" :rules="[ val => val && val.length > 0 || '请输入護照名']"
class="bg-grey-1" />
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">出生日期</div>
<q-input filled v-model="item.Birthday" mask="date" :rules="[ val => val && val.length > 0 || '请选择出生日期']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy :ref="'qDateProxy'+index" transition-show="scale" transition-hide="scale">
<q-date v-model="item.Birthday" @input="()=> $refs['qDateProxy'+index][0].hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="account-group col-6">
<div class="account_labelName">性別</div>
<q-select filled v-model="item.Sex" :options="sexArray" emit-value map-options>
</q-select>
</div>
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">身分證字號</div>
<q-input outlined v-model="item.IdCard" :rules="[ val => val && val.length > 0 || '请输入身分證字號']"
class="bg-grey-1" />
</div>
<div class="remind-question">
是否服役中、為役男身份或接近役齡？
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">出生日期</div>
<q-input filled v-model="item.Birthday" mask="date"
:rules="[ val => val && val.length > 0 || '请选择出生日期']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy :ref="'qDateProxy'+index" transition-show="scale" transition-hide="scale">
<q-date v-model="item.Birthday" @input="()=> $refs['qDateProxy'+index][0].hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="tip-text">
*服役中包含替代役，役男身份指年滿18歲至服兵役前，接近役齡指年滿16歲至18歲，若為免役者請勾選否。
<div class="account-group col-6">
<div class="account_labelName">性別</div>
<q-select filled v-model="item.Sex" :options="sexArray" emit-value map-options>
</q-select>
</div>
<div>
<div class="q-gutter-sm" style="margin-bottom:15px;">
<q-radio v-model="item.MilitaryServiceType" :val="1" label="否" />
<q-radio v-model="item.MilitaryServiceType" :val="2" label="服役中" />
<q-radio v-model="item.MilitaryServiceType" :val="3" label="役男身份" />
<q-radio v-model="item.MilitaryServiceType" :val="4" label="接近役齡" />
</div>
</div>
<div class="remind-question">
是否服役中、為役男身份或接近役齡？
</div>
<div class="tip-text">
*服役中包含替代役，役男身份指年滿18歲至服兵役前，接近役齡指年滿16歲至18歲，若為免役者請勾選否。
</div>
<div>
<div class="q-gutter-sm" style="margin-bottom:15px;">
<q-radio v-model="item.MilitaryServiceType" :val="1" label="否" />
<q-radio v-model="item.MilitaryServiceType" :val="2" label="服役中" />
<q-radio v-model="item.MilitaryServiceType" :val="3" label="役男身份" />
<q-radio v-model="item.MilitaryServiceType" :val="4" label="接近役齡" />
</div>
<div class="warning-bar2" v-if="item.MilitaryServiceType>1">
<div>請於出團前七天內上傳符合以下規定之護照畫面：</div>
<ol class="dot_list" style="font-size:14px;">
<li v-if="item.MilitaryServiceType==2">若您正在服役，出國必須蓋兩種章： 【持照人出國應經核准】【 年 月 日之前同意出國 字第 號核准】。</li>
<li v-if="item.MilitaryServiceType==3">
若您是役男者，出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)蓋兩種章：【持照人出國應經核准尚未履行兵役義務】【役男出國核准 年 月
日前一次有效 縣 市公所】</li>
<li v-if="item.MilitaryServiceType==4">若您是役齡男子，出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)一種章：【尚未履行兵役義務】。</li>
</ol>
</div>
<div class="warning-bar2" v-if="item.MilitaryServiceType>1">
<div>請於出團前七天內上傳符合以下規定之護照畫面：</div>
<ol class="dot_list" style="font-size:14px;">
<li v-if="item.MilitaryServiceType==2">若您正在服役，出國必須蓋兩種章： 【持照人出國應經核准】【 年 月 日之前同意出國 字第 號核准】。</li>
<li v-if="item.MilitaryServiceType==3">
若您是役男者，出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)蓋兩種章：【持照人出國應經核准尚未履行兵役義務】【役男出國核准 年 月
日前一次有效 縣 市公所】</li>
<li v-if="item.MilitaryServiceType==4">若您是役齡男子，出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)一種章：【尚未履行兵役義務】。</li>
</ol>
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">護照號碼</div>
<q-input outlined v-model="item.PassportNo" :rules="[ val => val && val.length > 0 || '请填写護照號碼']"
class="bg-grey-1" />
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-6">
<div class="account_labelName">護照號碼</div>
<q-input outlined v-model="item.PassportNo" :rules="[ val => val && val.length > 0 || '请填写護照號碼']" class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">護照效期截止日期</div>
<q-input filled v-model="item.PassportExpiry" mask="date" :rules="[ val => val && val.length > 0 || '请选择護照效期截止日期']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy :ref="'huzhao'+index" transition-show="scale" transition-hide="scale">
<q-date v-model="item.PassportExpiry" @input="()=>$refs['huzhao'+index][0].hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="account-group col-6">
<div class="account_labelName">護照效期截止日期</div>
<q-input filled v-model="item.PassportExpiry" mask="date"
:rules="[ val => val && val.length > 0 || '请选择護照效期截止日期']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy :ref="'huzhao'+index" transition-show="scale" transition-hide="scale">
<q-date v-model="item.PassportExpiry" @input="()=>$refs['huzhao'+index][0].hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-12 otherBeizhu">
<div class="account_labelName">其他備註</div>
<q-input filled type="textarea" class="col" v-model="item.Remarks" />
</div>
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-12 otherBeizhu">
<div class="account_labelName">其他備註</div>
<q-input filled type="textarea" class="col" v-model="item.Remarks" />
</div>
</div>
</div>
</div>
</q-form>
......@@ -566,7 +590,8 @@
<q-radio v-model="shape" :val="3" label="收據開立" />
</div>
</div>
<q-btn color="white" text-color="black" style="width:100%;height:40px;margin-top:10px;display:none;" label="回訂單明細" />
<q-btn color="white" text-color="black" style="width:100%;height:40px;margin-top:10px;display:none;"
label="回訂單明細" />
<q-btn color="primary" style="width:100%;height:40px;margin-top:15px;" label="前往付款" />
</div>
</div>
......@@ -633,9 +658,9 @@
}
],
GuestObj: {}, //旅客信息
scrollTop:0,
tabOffsetTop:0,
isFixed:false
scrollTop: 0,
tabOffsetTop: 0,
isFixed: false
};
},
created() {
......@@ -650,16 +675,17 @@
window.addEventListener('scroll', this.handleScroll)
},
methods: {
handleScroll(){
this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || document.scrollingElement.scrollTop || 0
if(this.scrollTop>this.tabOffsetTop){
this.isFixed=true;
}else{
this.isFixed=false;
handleScroll() {
this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || document
.scrollingElement.scrollTop || 0
if (this.scrollTop > this.tabOffsetTop) {
this.isFixed = true;
} else {
this.isFixed = false;
}
},
getShow(item){
item.isShow=!item.isShow;
getShow(item) {
item.isShow = !item.isShow;
this.$forceUpdate();
},
GetGuestObj() {
......@@ -719,7 +745,7 @@
newArray.push(obj);
});
}
if(tempObj.list.length < tempObj.GuestNum){
if (tempObj.list.length < tempObj.GuestNum) {
for (var i = tempObj.list.length; i < tempObj.GuestNum; i++) {
newArray.push(this.GetGuestObj());
}
......@@ -729,21 +755,21 @@
}
}
this.GuestObj = tempObj;
this.GuestObj.list.forEach(x=>{
x.isShow=true;
this.GuestObj.list.forEach(x => {
x.isShow = true;
})
} else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
}
});
},
getConnect(){
getConnect() {
this.$refs.myForm.validate().then(success => {
if (success) {
this.SavePassenger();
}
else {
// oh no, user has filled in
// at least one invalid value
}
})
},
//保存旅客信息
......@@ -763,11 +789,14 @@
type: 'negative',
message: res.data.message,
position: 'top',
color:'secondary',
color: 'secondary',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
this.getTravelGuest();
}else{
} else if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
localStorage.removeItem("b2bUser");
this.CommonJump('/login', {})
} else {
this.$q.notify({
type: 'negative',
message: res.data.message,
......
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