From d20d1ac8ed1efb5cc9c8453b843609a4b9a4babc Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 24 一月 2022 10:52:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/components/BackActionBar.vue | 3 -
/dev/null | 58 -----------------------------
pamapi/src/doc/滿意度/客戶填寫滿意度.txt | 9 +++-
PAMapp/components/Client/ClientCard.vue | 29 +++++++++-----
PAMapp/pages/myAppointmentList.vue | 1
PAMapp/assets/icon/style.css | 4 +-
6 files changed, 27 insertions(+), 77 deletions(-)
diff --git a/PAMapp/assets/icon/style.css b/PAMapp/assets/icon/style.css
index bbb23b2..1d5c85e 100644
--- a/PAMapp/assets/icon/style.css
+++ b/PAMapp/assets/icon/style.css
@@ -76,8 +76,8 @@
.icon-circle-right:before {
content: "\e90b";
}
-.icon-down:before, .el-icon-arrow-up:before {
- content: "\e910";
+.icon-close:before {
+ content: "\e90c";
}
.icon-comment:before {
content: "\e90d";
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index f7981a0..29fc5ee 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -74,9 +74,6 @@
case 'accountSetting':
featureLabel = '�犖撣唾�身摰�';
break;
- case 'appointmentAgenda':
- featureLabel = '�撠�赤����';
- break;
case 'consultantAccountSetting':
featureLabel = '���董�����';
break;
diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 294eb5f..e010af8 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -213,6 +213,9 @@
@appointmentStore.Action
getAppointmentDetail!: (appointmentId: number) => Promise<Appointment>;
+ @appointmentStore.Action
+ updateAppointmentDetail!: (id: number) => Appointment;
+
@appointmentStore.Getter
appointmentProgress!: ContactStatus;
@@ -258,7 +261,16 @@
viewAppointmentDetail(): void {
this.getAppointmentDetail(this.client.id).then((_) => {
- this.readAppointment();
+ // setTimeout(() => {
+ // const unread = !this.client.consultantReadTime;
+ // if (unread) {
+ // this.readAppointment();
+ // }
+ // }, 0);
+ const unread = !this.client.consultantReadTime;
+ if (unread) {
+ this.readAppointment();
+ }
this.$router.push(`/appointment/${this.client.id}`);
});
}
@@ -277,7 +289,6 @@
reviewsService.sendSatisfactionToClient(this.client.id).then(res => {
this.isShowInviteReviewDialog = true ;
})
-
}
openDetail() {
@@ -302,14 +313,12 @@
}
private readAppointment(): void {
- const unread = !this.client.consultantReadTime;
- if (unread) {
- appointmentService.recordRead(this.client.id).then((_) => {
- const updatedClient = {...this.client};
- updatedClient.consultantReadTime = new Date().toString();
- this.updateMyAppointmentList(updatedClient);
- });
- };
+ appointmentService.recordRead(this.client.id).then((_) => {
+ const updatedClient = {...this.client};
+ updatedClient.consultantReadTime = new Date().toString();
+ this.updateMyAppointmentList(updatedClient);
+ this.updateAppointmentDetail(this.client.id);
+ });
}
private clearAppointmentIdFromMsg() {
diff --git a/PAMapp/components/Interview/interviewNotification.vue b/PAMapp/components/Interview/interviewNotification.vue
deleted file mode 100644
index 9bb6253..0000000
--- a/PAMapp/components/Interview/interviewNotification.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
- <div class="remind-card">
- <div class="remind-card-header">
- <div class="mdTxt text--black">�撠�赤����</div>
- <div class="smTxt_bold text--primary sub-title cursor--pointer" @click="toAgendaPage">����</div>
- </div>
-
- <div class="remind-container">
- <div class="remind-date mr-10">
- <div class="mb-3 smTxt bgc-primary-red date-year">
- <div class="mb-3 mt-2">2021</div>
- </div>
- <div class="p mt-5">
- <div>12/25</div>
- </div>
- </div>
-
- <div class="remind-content-txt">
- <div class="mb-3">09:00</div>
- <div>蝝赤���</div>
- </div>
-
- </div>
- </div>
-</template>
-
-<script lang="ts">
-import { Vue, Component, Prop, Emit, Action, State, namespace } from 'nuxt-property-decorator';
-
-@Component
-export default class ConsultantAppointmentRemind extends Vue {
-
- toAgendaPage(){
- this.$router.push('/appointmentAgenda')
- }
- //////////////////////////////////////////////////////////////////////
-}
-</script>
-<style lang="scss" scoped>
-.remind-card{
- display: flex;
- flex-direction:column;
- justify-content: center;
- border: 1px solid #CCCCCC;
- height: 131px;
- padding: 10px 20px;
- background-color: #fff;
- .remind-card-header{
- display: flex;
- justify-content: space-between;
- align-items: baseline;
- .sub-title{
- border-bottom: 1px solid $PRIMARY_RED;
- }
- }
-}
-
-</style>
diff --git a/PAMapp/pages/myAppointmentList.vue b/PAMapp/pages/myAppointmentList.vue
index 5045e5f..c013cd9 100644
--- a/PAMapp/pages/myAppointmentList.vue
+++ b/PAMapp/pages/myAppointmentList.vue
@@ -1,7 +1,6 @@
<template>
<div>
<div class="pam-myAppointment-banner"></div>
- <InterviewNotification></InterviewNotification>
<div class="pam-container">
<div class="pam-cus-tabs mb-10">
<div
diff --git "a/pamapi/src/doc/\346\273\277\346\204\217\345\272\246/\345\256\242\346\210\266\345\241\253\345\257\253\346\273\277\346\204\217\345\272\246.txt" "b/pamapi/src/doc/\346\273\277\346\204\217\345\272\246/\345\256\242\346\210\266\345\241\253\345\257\253\346\273\277\346\204\217\345\272\246.txt"
index 67f2e8f..631f860 100644
--- "a/pamapi/src/doc/\346\273\277\346\204\217\345\272\246/\345\256\242\346\210\266\345\241\253\345\257\253\346\273\277\346\204\217\345\272\246.txt"
+++ "b/pamapi/src/doc/\346\273\277\346\204\217\345\272\246/\345\256\242\346\210\266\345\241\253\345\257\253\346\273\277\346\204\217\345\272\246.txt"
@@ -7,10 +7,10 @@
request body:
-[{
+{
"appointmentId": 67,
"score":4
-}]
+}
@@ -28,6 +28,10 @@
憛怠神憭�遛��漲:
+http post :
+
+http://localhost:8080/api/satisfaction/score/all
+
request body:
[{
@@ -39,7 +43,6 @@
response body:
-[ADD]
[{
"id": 3,
--
Gitblit v1.8.0