From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/pages/questionnaire/_agentNo.vue | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index 6593094..120c844 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -24,8 +24,12 @@
<div class="ques-header__input-block">
<span>Email嚗�</span>
<input class="ques-header__input"
+ :class="{ 'is-invalid': !emailValid}"
placeholder="隢撓�"
v-model="myRequest.email">
+ </div>
+ <div class="error mt-5 mb-5" style="margin-left:65px">
+ <span v-show="!emailValid">Email�撘�炊</span>
</div>
</div>
</div>
@@ -115,9 +119,23 @@
</PopUpFrame>
<PopUpFrame :isOpen.sync="sendReserve" @update:isOpen="closeReservePopUp">
- <div class="text--middle mt-30 sendReserve-txt">�������</div>
- <div class="text--middle sendReserve-txt">�����“�������蝯∴��</div>
+ <div class="mdTxt mt-30 sendReserve-txt">�������</div>
+ <div class="mdTxt sendReserve-txt mb-30">�����“�������蝯∴��</div>
+ <!-- TODO: �銝脫 api, ���像�皛踵�漲 -->
+ <!-- <div class="pam-app-review mb-10">
+ <div class="mdTxt mb-10">撠
+ <span class="mdTxt text--primary text--bold ">������</span>
+ 撟喳��擃����
+ </div>
+ <div class="mdTxt">�蝯虫�嗾憿��嚗�</div>
+ </div>
+ <el-rate v-model="score" class="pam-satisfaction-rate fix-chrome-click--issue"></el-rate> -->
<div class="text--center mdTxt">
+ <!-- <el-button @click="closeReservePopUp">����</el-button>
+ <el-button type="primary"
+ @click="closeReservePopUp">
+ �
+ </el-button> -->
<el-button type="primary"
@click="closeReservePopUp">
������
@@ -166,6 +184,8 @@
@roleStorage.State
recommendConsultantItem!:string;
+
+ score ="" ;
genderOptions=[
{
@@ -353,10 +373,9 @@
private getLatestReserved(agentNo) {
const agentInfo = this.myConsultantList.filter(item => item.agentNo === agentNo);
-
const appointmentInfo = agentInfo.length > 0 && agentInfo[0].appointments
? agentInfo[0].appointments!
- .filter((appointment) => appointment.communicateStatus !== 'contacted')
+ .filter((appointment) => appointment.communicateStatus === 'reserved')
.map((reversedAppointment) => (
{ ...reversedAppointment,
sortDate: new Date(reversedAppointment.appointmentDate)
@@ -456,6 +475,11 @@
: true;
}
+ get emailValid() {
+ const rule = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
+ return this.myRequest.email ? rule.test(this.myRequest.email) : true;
+ }
+
get userInfo(): RegisterInfo {
const initUserInfo = JSON.parse(localStorage.getItem('userInfo')!);
return initUserInfo;
@@ -463,7 +487,7 @@
get isDisabledSubmitBtn(): boolean {
return _.includes(this.myRequest.contactType,ContactType.PHONE)
- ? !this.isHopeContactTimeDone()
+ ? !this.isHopeContactTimeDone() || !this.emailValid
: !this.phoneValid;
}
@@ -479,7 +503,6 @@
display: flex;
justify-content: center;
margin-top: 10px;
- margin-bottom: 26px;
}
//drawer��摨���見撘�
@@ -604,6 +627,16 @@
margin: 0px 20px;
}
+.pam-app-review{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+.pam-satisfaction-rate{
+ margin-bottom: 45px;
+}
@include desktop{
.ques-header{
@@ -631,5 +664,6 @@
}
}
+
</style>
--
Gitblit v1.8.0