From c0da44cffc55d5b2cf018b3dc4e4486dd29a5666 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期一, 03 一月 2022 08:34:00 +0800
Subject: [PATCH] fixed: merge error
---
PAMapp/pages/agentInfo/_agentNo.vue | 26 +++++++++++---------------
PAMapp/components/Ui/UiAvatar.vue | 2 +-
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/PAMapp/components/Ui/UiAvatar.vue b/PAMapp/components/Ui/UiAvatar.vue
index 22bd458..2cd6eb3 100644
--- a/PAMapp/components/Ui/UiAvatar.vue
+++ b/PAMapp/components/Ui/UiAvatar.vue
@@ -15,7 +15,7 @@
size!: number;
@Prop()
- fileName!: string;
+ agentNo!: string;
get imgSrc() {
return process.env.BASE_URL + '/consultant/avatar/' + this.agentNo;
diff --git a/PAMapp/pages/agentInfo/_agentNo.vue b/PAMapp/pages/agentInfo/_agentNo.vue
index 05f879a..1fb711e 100644
--- a/PAMapp/pages/agentInfo/_agentNo.vue
+++ b/PAMapp/pages/agentInfo/_agentNo.vue
@@ -116,7 +116,7 @@
<div class="consultant-edit-btn">
<UiField icon="flag" label="皞�◢�">
<div class="text--orange bold pr-10 "
- v-for="(communicationStyle, index) in displayCommunicationStyleList"
+ v-for="(communicationStyle, index) in displayCommunicationStyleList"
:key="index">
#{{ communicationStyle }}</div>
</UiField>
@@ -224,28 +224,22 @@
fieldInfoTitle = '';
fieldInfoDesc = '';
hideReviews = hideReviews ;
+
//////////////////////////////////////////////////////////////////////
-
- get agentName(): string {
- return `${this.agentInfo.name}(${this.agentInfo.role})`;
- }
-
- get displayCommunicationStyleList(): string[] {
- return this.agentInfo.communicationStyle.split('��').filter((item) => item);
- }
async asyncData(context: Context) {
const agentNo = context.route.params.agentNo;
return {
agentInfo: await myConsultantService.getConsultantDetail(agentNo).then((res) => res)
}
-
}
-
-
+
+ //////////////////////////////////////////////////////////////////////
+
alertAddSuccess(): void {
this.isAlertAddSuccess = true;
}
+
alertFieldInfo(field: string): void {
this.isAlertFieldInfo = true;
switch(field) {
@@ -260,12 +254,14 @@
}
}
-//////////////////////////////////////////////////////////////////////
-
get agentName(): string {
return `${this.agentInfo.name}(${this.agentInfo.role})`;
}
-
+
+ get displayCommunicationStyleList(): string[] {
+ return this.agentInfo.communicationStyle.split('��').filter((item) => item);
+ }
+
}
</script>
--
Gitblit v1.8.0