From 278a64e02f22d46ec5652d1c3e0906a23daf120c Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 24 一月 2022 09:44:46 +0800
Subject: [PATCH] update: TODO#134657 排序通知清單
---
PAMapp/store/index.ts | 86 ++++++++++++++++++++-----------------------
1 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/PAMapp/store/index.ts b/PAMapp/store/index.ts
index 74ff925..3fe527f 100644
--- a/PAMapp/store/index.ts
+++ b/PAMapp/store/index.ts
@@ -1,25 +1,23 @@
import { Module, VuexModule, Mutation, Action } from 'vuex-module-decorators'
-import { getMyReviewLog } from '~/assets/ts/api/appointment';
-import { recommend, AgentOfStrictQuery, addFavoriteConsultant, deleteConsultant, strictQuery } from '~/assets/ts/api/consultant';
-import { getFavoriteFromStorage, setFavoriteToStorage } from '~/assets/ts/storageConsultant';
+import myConsultantService from '~/shared/services/my-consultant.service';
+import queryConsultantService from '~/shared/services/query-consultant.service';
+import reviewsService from '~/shared/services/reviews.service';
+import { Consultant } from '~/shared/models/consultant.model';
+import { getFavoriteFromStorage, setFavoriteToStorage } from '~/shared/storageConsultant';
+import { AppointmentLog } from '~/shared/models/appointment.model';
+import { AgentOfStrictQuery, StrictQueryParams } from '~/shared/models/strict-query.model';
+import { NotificationList } from '~/shared/models/reviews.model';
-import myConsultantService from '~/assets/ts/services/my-consultant.service';
-import appointmentService from '~/assets/ts/services/appointment.service';
-
-import { Consultant } from '~/assets/ts/models/consultant.model';
-import { AppointmentLog } from '~/assets/ts/models/appointment.model';
-import { ClientInfo } from '~/assets/ts/models/client.model';
@Module
export default class Store extends VuexModule {
recommendList: Consultant[] = [];
strictQueryList: AgentOfStrictQuery[] = [];
myConsultantList: Consultant[] = [];
- myAppointmentList: ClientInfo[] = [];
- myNewAppointmentSum: number = 0;
-
- myAppointmentReviewLogList: AppointmentLog[] = [];
+ reviewLogList: AppointmentLog[] = [];
+ unReviewLogList: AppointmentLog[] = [];
+ notificationList: NotificationList[] = [];
get isUserLogin() {
return this.context.getters['localStorage/isUserLogin'];
@@ -27,7 +25,7 @@
@Mutation
updateRecommend(data: Consultant[]) {
- this.recommendList = data;
+ this.recommendList = data;
}
@Mutation
@@ -41,23 +39,23 @@
}
@Mutation
- updateMyAppointmentList(data: ClientInfo[]) {
- this.myAppointmentList = data;
+ updateReviewLog(data: AppointmentLog[]) {
+ this.reviewLogList = data;
}
@Mutation
- updateMyNewAppointmentSum(newAppointmentSum: number) {
- this.myNewAppointmentSum = newAppointmentSum;
+ updateUnReviewLog(data: AppointmentLog[]) {
+ this.unReviewLogList = data;
}
@Mutation
- updateMyAppointmentReviewLog(data: AppointmentLog[]) {
- this.myAppointmentReviewLogList = data;
+ updateNotification(data: NotificationList[]) {
+ this.notificationList = data;
}
@Action
storeRecommendList() {
- recommend().then(data => {
+ queryConsultantService.getRecommendConsultantList().then(data => {
this.context.commit('updateRecommend', data)
})
}
@@ -74,7 +72,7 @@
if (localData?.length) {
const agentNoList = localData.map(i => i.agentNo)
- await addFavoriteConsultant(agentNoList).then(res => {
+ await queryConsultantService.addFavoriteConsultant(agentNoList).then(res => {
localStorage.removeItem('favoriteConsultant')
})
}
@@ -94,7 +92,7 @@
if (!this.isUserLogin) {
setFavoriteToStorage(left);
} else {
- await deleteConsultant(agentNo)
+ await myConsultantService.deleteConsultant(agentNo)
}
this.context.commit('updateConsultantList', left)
@@ -109,7 +107,7 @@
if (!found) {
const newData = [consultantToAdd].concat(this.myConsultantList);
if (this.isUserLogin) {
- await addFavoriteConsultant([consultantToAdd.agentNo])
+ await queryConsultantService.addFavoriteConsultant([consultantToAdd.agentNo])
} else {
setFavoriteToStorage(newData);
}
@@ -124,17 +122,8 @@
}
@Action
- storeMyAppointmentList(): void {
- appointmentService.getMyAppointmentList().then((data) => {
- const newAppointmentSum = data.filter(item => !item.consultantViewTime || item.consultantViewTime === null).length;
- this.context.commit('updateMyAppointmentList', data);
- this.context.commit('updateMyNewAppointmentSum', newAppointmentSum);
- });
- }
-
- @Action
storeMyAppointmentReviewLog() {
- getMyReviewLog().then((data) => {
+ reviewsService.getMyReviewLog().then((data) => {
const dataWithLatestDate = data.map((item) => {
return {
...item,
@@ -142,24 +131,29 @@
}
});
const sortedData = dataWithLatestDate.sort((a, b) => +b.compareDate - +a.compareDate);
- this.context.commit('updateMyAppointmentReviewLog', sortedData);
+ const reviewLog = sortedData.filter(item => item.score);
+ const unReviewLog = sortedData.filter(item => !item.score);
+ this.context.commit('updateReviewLog', reviewLog);
+ this.context.commit('updateUnReviewLog', unReviewLog);
});
}
@Action
- updateMyAppointment(myAppointment: ClientInfo) {
- const data = this.myAppointmentList.filter(item => item.id !== myAppointment.id);
- data.unshift(myAppointment);
- this.context.commit('updateMyAppointmentList', data)
- }
-
- @Action
- async storeStrictQueryList(strictQueryDto) {
- return await strictQuery(strictQueryDto).then(res=>{
+ async storeStrictQueryList(strictQueryDto: StrictQueryParams) {
+ return await queryConsultantService.strictQuery(strictQueryDto).then(res=>{
this.context.commit('localStorage/storageRecommendConsultant', JSON.stringify(strictQueryDto));
- this.context.commit('updateStrictQueryList', res.data)
- return res.data.length;
+ this.context.commit('updateStrictQueryList', res)
+ return res.length;
});
}
+ @Action
+ storeMyPersonalNotification() {
+ reviewsService.getMyPersonalNotification().then(data => {
+ const sortData = data
+ .sort((preItem, nextItem) => +new Date(nextItem.createdDate) - +new Date(preItem.createdDate))
+ this.context.commit('updateNotification', sortData);
+ })
+ }
+
}
--
Gitblit v1.8.0