From 896998b2391077d84a1891f8df5f1c08f5956a26 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 01 十二月 2021 11:24:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/pages/questionnaire/_agentNo.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index 94298a4..08b426d 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -51,7 +51,7 @@
<span v-show="!phoneValid">����Ⅳ�撘�炊</span>
</div>
</div>
- <div class="mt-30" v-if="phoneValid">
+ <div class="mt-30" v-if="myRequest.phone && phoneValid">
<div class="datepicker">
<span class="mdTxt">�����蝯∠�靘踵���</span>
<PhoneContactTimePicker
@@ -249,7 +249,7 @@
selectWeekOptions: [],
selectTimesOptions: [],
}],
- agentNo: this.$route.params.agentNo,
+ agentNo: '',
};
showDrawer= false;
@@ -258,13 +258,23 @@
mounted() {
const storageMyRequest = getRequestsFromStorage();
if (storageMyRequest) {
- this.myRequest = storageMyRequest;
+ this.myRequest = {
+ ...storageMyRequest,
+ hopeContactTime: storageMyRequest.hopeContactTime?.length
+ ? storageMyRequest.hopeContactTime
+ : [{
+ selectWeekOptions: [],
+ selectTimesOptions: [],
+ }],
+ };
}
}
get phoneValid(): boolean {
const rule = /^09[0-9]{8}$/;
- return this.myRequest.phone ? rule.test(this.myRequest.phone) && _.isEqual(this.myRequest.phone.length,10) : true;
+ return this.myRequest.phone
+ ? rule.test(this.myRequest.phone) && _.isEqual(this.myRequest.phone.length,10)
+ : true;
}
get userInfo(): RegisterInfo {
@@ -279,22 +289,24 @@
}
private isHopeContactTimeDone():boolean{
- return this.myRequest.hopeContactTime[0].selectWeekOptions.length >0 && this.myRequest.hopeContactTime[0].selectTimesOptions.length >0;
+ return this.myRequest.hopeContactTime[0]?.selectWeekOptions.length >0 && this.myRequest.hopeContactTime[0]?.selectTimesOptions.length >0;
}
sentDemand() {
- addFavoriteConsultant([this.myRequest.agentNo]).then(res => this.sentAppointmentDemand());
+ addFavoriteConsultant([this.$route.params.agentNo]).then(res => this.sentAppointmentDemand());
}
private sentAppointmentDemand() {
const data: AppointmentParams = {
...this.myRequest,
requirement: _.map(this.myRequest.requirement,o=>o).toString(),
- hopeContactTime:this.phoneValid ? this.getHopeContactTime() :'',
+ hopeContactTime: this.myRequest.phone && this.phoneValid ? this.getHopeContactTime() :'',
+ agentNo: this.$route.params.agentNo
};
appointmentDemand(data).then(res => {
this.sendReserve = true;
+ this.myRequest.hopeContactTime = [];
setRequestsToStorage(this.myRequest);
});
}
--
Gitblit v1.8.0