From bdae23a40c461c2c6b6ee614f661eac731c949c8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 22 十二月 2021 14:12:05 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
PAMapp/store/index.ts | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/PAMapp/store/index.ts b/PAMapp/store/index.ts
index 74ff925..25d55a2 100644
--- a/PAMapp/store/index.ts
+++ b/PAMapp/store/index.ts
@@ -1,15 +1,17 @@
+import { StrictQueryParams } from '~/shared/models/strict-query.model';
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 { getFavoriteFromStorage, setFavoriteToStorage } from '~/shared/storageConsultant';
-import myConsultantService from '~/assets/ts/services/my-consultant.service';
-import appointmentService from '~/assets/ts/services/appointment.service';
+import myConsultantService from '~/shared/services/my-consultant.service';
+import queryConsultantService from '~/shared/services/query-consultant.service';
+import appointmentService from '~/shared/services/appointment.service';
+import reviewsService from '~/shared/services/reviews.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';
+import { Consultant } from '~/shared/models/consultant.model';
+import { AppointmentLog } from '~/shared/models/appointment.model';
+import { ClientInfo } from '~/shared/models/client.model';
+import { AgentOfStrictQuery } from '~/shared/models/strict-query.model';
@Module
export default class Store extends VuexModule {
recommendList: Consultant[] = [];
@@ -57,7 +59,7 @@
@Action
storeRecommendList() {
- recommend().then(data => {
+ queryConsultantService.getRecommendConsultantList().then(data => {
this.context.commit('updateRecommend', data)
})
}
@@ -74,7 +76,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 +96,7 @@
if (!this.isUserLogin) {
setFavoriteToStorage(left);
} else {
- await deleteConsultant(agentNo)
+ await myConsultantService.deleteConsultant(agentNo)
}
this.context.commit('updateConsultantList', left)
@@ -109,7 +111,7 @@
if (!found) {
const newData = [consultantToAdd].concat(this.myConsultantList);
if (this.isUserLogin) {
- await addFavoriteConsultant([consultantToAdd.agentNo])
+ await queryConsultantService.addFavoriteConsultant([consultantToAdd.agentNo])
} else {
setFavoriteToStorage(newData);
}
@@ -134,7 +136,7 @@
@Action
storeMyAppointmentReviewLog() {
- getMyReviewLog().then((data) => {
+ reviewsService.getMyReviewLog().then((data) => {
const dataWithLatestDate = data.map((item) => {
return {
...item,
@@ -154,11 +156,11 @@
}
@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;
});
}
--
Gitblit v1.8.0