From 3bad0a8e67efc5a1878bc20964b390e279e0dfd2 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 20 十二月 2021 11:41:51 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
PAMapp/pages/questionnaire/_agentNo.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index c9a622f..9b8b5c1 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -115,8 +115,8 @@
</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="text--middle mt-30 sendReserve-txt">�������</div>
+ <div class="text--middle sendReserve-txt">�����“�������蝯∴��</div>
<div class="text--center mdTxt">
<el-button type="primary"
@click="closeReservePopUp">
@@ -154,6 +154,7 @@
@State('myConsultantList') myConsultantList!: Consultant[];
@Action storeConsultantList!: () => Promise<number>;
@roleStorage.Getter isUserLogin!:boolean;
+ @roleStorage.State recommendConsultantItem!:string;
genderOptions=[
{
@@ -300,7 +301,7 @@
private setMyRequest(): void {
const storageMyRequest = getRequestsFromStorage();
- const storageMyQuestion = getRequestQuestionFromStorage();
+ const storageMyRequirement = this.recommendConsultantItem ? JSON.parse(this.recommendConsultantItem).requirements:[];
if (storageMyRequest) {
this.myRequest = {
@@ -314,10 +315,10 @@
};
}
- if (storageMyQuestion) {
+ if (storageMyRequirement) {
this.myRequest = {
...this.myRequest,
- requirement: storageMyQuestion
+ requirement: storageMyRequirement
}
removeRequestQuestionFromStorage();
}
--
Gitblit v1.8.0