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 ++++++-----
PAMapp/pages/myConsultantList/consultantList.vue | 1 +
PAMapp/pages/recommendConsultant/index.vue | 3 ---
PAMapp/components/Consultant/ConsultantList.vue | 9 ++++++++-
PAMapp/pages/myConsultantList/contactedList.vue | 1 +
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantList.vue b/PAMapp/components/Consultant/ConsultantList.vue
index a8791f8..1e7bd7c 100644
--- a/PAMapp/components/Consultant/ConsultantList.vue
+++ b/PAMapp/components/Consultant/ConsultantList.vue
@@ -10,7 +10,7 @@
</template>
<template v-if="isUserLogin && agentList.length === 0">
<div class="emptyRowStyle">
- <div class="smTxt txt">����撌脰蝯⊿“���</div>
+ <div class="smTxt txt">{{ noDataPlaceholder }}</div>
</div>
</template>
<template v-if="!isUserLogin">
@@ -32,6 +32,7 @@
@Component
export default class ConsultantList extends Vue {
@Prop() agents!: Consultant[];
+ @Prop() title! : string;
@roleStorage.Getter isUserLogin!:boolean;
get agentList(){
@@ -40,6 +41,12 @@
)
}
+ get noDataPlaceholder(): string {
+ return this.title === 'contactedList'
+ ? '����撌脰蝯⊿“���'
+ : '����撌脤憿批��';
+ }
+
}
</script>
diff --git a/PAMapp/pages/myConsultantList/consultantList.vue b/PAMapp/pages/myConsultantList/consultantList.vue
index 356baeb..0ea42af 100644
--- a/PAMapp/pages/myConsultantList/consultantList.vue
+++ b/PAMapp/pages/myConsultantList/consultantList.vue
@@ -2,6 +2,7 @@
<div>
<ConsultantList
:agents="pageList"
+ :title="'consultantList'"
></ConsultantList>
<UiPagination
diff --git a/PAMapp/pages/myConsultantList/contactedList.vue b/PAMapp/pages/myConsultantList/contactedList.vue
index a9d3d72..af53d84 100644
--- a/PAMapp/pages/myConsultantList/contactedList.vue
+++ b/PAMapp/pages/myConsultantList/contactedList.vue
@@ -2,6 +2,7 @@
<div>
<ConsultantList
:agents="pageList"
+ :title="'contactedList'"
></ConsultantList>
<UiPagination
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();
}
diff --git a/PAMapp/pages/recommendConsultant/index.vue b/PAMapp/pages/recommendConsultant/index.vue
index 32fee8b..f4135c6 100644
--- a/PAMapp/pages/recommendConsultant/index.vue
+++ b/PAMapp/pages/recommendConsultant/index.vue
@@ -96,7 +96,6 @@
} from 'nuxt-property-decorator';
import * as _ from 'lodash';
import { Seniority } from '~/assets/ts/models/enum/seniority';
- import { setRequestQuestionToStorage } from '~/assets/ts/storageRequests';
const localStorage = namespace('localStorage');
@@ -242,8 +241,6 @@
}
async makePair() {
await this.storeStrictQueryList(this.strictQueryDto).then(dataLength => {
- const questions = this.strictQueryDto.requirements.length ? this.strictQueryDto.requirements : [];
- setRequestQuestionToStorage(questions);
if (dataLength === 0) {
this.isVisiblePopUp = true;
return;
--
Gitblit v1.8.0