From 391d7db141245798c64aa8acb0f143ab4152aa79 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 10 十一月 2021 10:47:46 +0800
Subject: [PATCH] TODO#130015/130016 [推薦保險顧問/我的顧問清單] api 串接
---
PAMapp/pages/quickFilter/index.vue | 6
PAMapp/store/index.ts | 16 +++
PAMapp/assets/ts/auth.ts | 3
PAMapp/pages/myConsultantList.vue | 21 ++--
PAMapp/pages/myConsultantList/contactedList.vue | 8 +-
PAMapp/components/Consultant/ConsultantCard.vue | 12 +-
PAMapp/plugins/api/home.ts | 13 ---
PAMapp/components/Consultant/ConsultantSwiper.vue | 6
PAMapp/pages/index.vue | 55 +++++++++----
PAMapp/pages/myConsultantList/consultantList.vue | 16 +--
PAMapp/assets/ts/api/consultant.ts | 48 ++++++++++++
PAMapp/components/Ui/UiPagination.vue | 10 +-
PAMapp/components/Consultant/ConsultantList.vue | 19 ++--
13 files changed, 154 insertions(+), 79 deletions(-)
diff --git a/PAMapp/assets/ts/api/consultant.ts b/PAMapp/assets/ts/api/consultant.ts
new file mode 100644
index 0000000..b5711ac
--- /dev/null
+++ b/PAMapp/assets/ts/api/consultant.ts
@@ -0,0 +1,48 @@
+import axios from 'axios';
+import { AxiosRequestConfig, AxiosError, AxiosResponse } from 'axios'
+
+export const service = axios.create({
+ baseURL: 'http://localhost:8080/api',
+ headers: {
+ Authorization: 'Bearer ' + localStorage.getItem('id_token')
+ }
+})
+
+service.interceptors.request.use(function (config: AxiosRequestConfig) {
+ return config;
+}, function (error: AxiosError) {
+ return Promise.reject(error);
+});
+
+service.interceptors.response.use(function (response: AxiosResponse) {
+ return response;
+}, function (error: AxiosError) {
+ return Promise.reject(error);
+});
+
+// 憿批恥��(TODO: OTP隤����� ���蝙�)
+export function login(user: any) {
+ return service.post('/authenticate', user)
+}
+
+// ��靽憿批��
+export function recommend() {
+ return service.get('/consultant/recommend')
+}
+
+// ���“���
+export function getFavoriteConsultant() {
+ return service.get('/consultant/favorite');
+}
+
+export interface Consultants {
+ agentNo: number,
+ name: string,
+ img: string,
+ new: boolean,
+ avgScore: number,
+ expertise: string[],
+ updateTime: Date,
+ seniority: string,
+ contactStatus?: string;
+}
\ No newline at end of file
diff --git a/PAMapp/assets/ts/auth.ts b/PAMapp/assets/ts/auth.ts
new file mode 100644
index 0000000..fa81eeb
--- /dev/null
+++ b/PAMapp/assets/ts/auth.ts
@@ -0,0 +1,3 @@
+export function isLogin() {
+ return !!localStorage.getItem('id_token')
+}
\ No newline at end of file
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 4202531..baa10d8 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -9,11 +9,11 @@
:size="50"
:src="agentInfo.img"
class="cursor--pointer"
- @click.native="$router.push('/agentInfo')"
+ @click.native="$router.push(`/agentInfo`)"
></el-avatar>
<div class="satisfaction">
<i class="icon-star pam-icon icon--yellow satisfaction"></i>
- <span>{{agentInfo.satisfaction}}</span>
+ <span>{{agentInfo.avgScore }}</span>
</div>
</el-col>
<el-col :xs="10" :sm="15">
@@ -21,9 +21,9 @@
<div class="professionals">
<span
class="professionalsTxt"
- v-for="(professional, index) in agentInfo.professionals"
+ v-for="(expertise, index) in agentInfo.expertise"
:key="index"
- >#{{professional}}</span>
+ >#{{expertise}}</span>
</div>
<div
class="delete"
@@ -65,12 +65,12 @@
<script lang="ts">
import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Consultants } from '~/assets/ts/api/consultant';
import { isMobileDevice } from '~/assets/ts/device';
@Component
export default class ConsultantCard extends Vue {
- @Prop() agentInfo!: Agents;
+ @Prop() agentInfo!: Consultants;
isVisibleDialog = false;
width: string = '';
diff --git a/PAMapp/components/Consultant/ConsultantList.vue b/PAMapp/components/Consultant/ConsultantList.vue
index 440d75b..a4077c6 100644
--- a/PAMapp/components/Consultant/ConsultantList.vue
+++ b/PAMapp/components/Consultant/ConsultantList.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <template v-if="agents.length > 0 && noLogin">
+ <template v-if="agents.length > 0">
<ConsultantCard
v-for="(agent, index) in agents"
:key="index"
@@ -8,15 +8,15 @@
@removeAgent="removeAgent"
></ConsultantCard>
</template>
- <template v-else-if="agents.length === 0">
+ <template v-else-if="!isLogin && agents.length === 0">
<div class="emptyRowStyle">
- <div class="smTxt txt">����撌脤憿批��</div>
+ <div class="mdTxt login" @click="$router.push('/login')">��</div>
+ <div class="smTxt txt">���憭歇�憿批��</div>
</div>
</template>
<template v-else>
<div class="emptyRowStyle">
- <div class="mdTxt login" @click="$router.push('/login')">��</div>
- <div class="smTxt txt">���憭歇�憿批��</div>
+ <div class="smTxt txt">����撌脤憿批��</div>
</div>
</template>
</div>
@@ -24,13 +24,16 @@
<script lang="ts">
import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Consultants } from '~/assets/ts/api/consultant';
+import { isLogin } from '~/assets/ts/auth';
@Component
export default class ConsultantList extends Vue {
- @Prop() agents!: Agents[];
+ @Prop() agents!: Consultants[];
- noLogin = true;
+ get isLogin() {
+ return isLogin();
+ }
@Emit('removeAgent') removeAgent(agentId: number) {
return agentId;
diff --git a/PAMapp/components/Consultant/ConsultantSwiper.vue b/PAMapp/components/Consultant/ConsultantSwiper.vue
index 29fa092..44d95ed 100644
--- a/PAMapp/components/Consultant/ConsultantSwiper.vue
+++ b/PAMapp/components/Consultant/ConsultantSwiper.vue
@@ -14,7 +14,7 @@
<div class="name">{{agentInfo.name}}</div>
<div>
<i class="icon-star pam-icon icon--yellow"></i>
- <span class="satisfaction">{{agentInfo.satisfaction}}</span>
+ <span class="satisfaction">{{agentInfo.avgScore}}</span>
</div>
</div>
</swiper-slide>
@@ -28,11 +28,11 @@
<script lang="ts">
import { Vue, Component, Prop } from 'vue-property-decorator';
import { SwiperOptions } from 'swiper';
-import { Agents } from '~/plugins/api/home'
+import { Consultants } from '~/assets/ts/api/consultant'
@Component
export default class UiSwiper extends Vue {
- @Prop() agents!: Agents[];
+ @Prop() agents!: Consultants[];
swiperOptions: SwiperOptions = {
loop: true,
diff --git a/PAMapp/components/Ui/UiPagination.vue b/PAMapp/components/Ui/UiPagination.vue
index 0229097..d157b14 100644
--- a/PAMapp/components/Ui/UiPagination.vue
+++ b/PAMapp/components/Ui/UiPagination.vue
@@ -12,20 +12,20 @@
<script lang="ts">
import { Vue, Component, Prop, Emit, Watch } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Consultants } from '~/assets/ts/api/consultant';
@Component
export default class UiPagination extends Vue {
- @Prop() totalList!: Agents[];
+ @Prop() totalList!: Consultants[];
pageSize = 5;
currentPage = 1;
- pageList: Agents[] = [];
+ pageList: Consultants[] = [];
mounted() {
this.handleCurrentChange(this.currentPage);
}
- @Emit('changePage') chagnePage(): Agents[] {
+ @Emit('changePage') chagnePage(): Consultants[] {
return this.pageList
}
@@ -41,7 +41,7 @@
}
}
- @Watch('totalList') watchtotalList(newValue: Agents[]) {
+ @Watch('totalList') watchtotalList(newValue: Consultants[]) {
if (newValue) {
this.handleCurrentChange(this.currentPage);
}
diff --git a/PAMapp/pages/index.vue b/PAMapp/pages/index.vue
index 04c469e..041596f 100644
--- a/PAMapp/pages/index.vue
+++ b/PAMapp/pages/index.vue
@@ -1,5 +1,7 @@
<template>
<div>
+ <el-button @click="login">��</el-button>
+ <el-button @click="remove">��</el-button>
<Ui-Carousel></Ui-Carousel>
<div class="page-container">
<h5 class="mdTxt mb-30">����憿批��</h5>
@@ -31,36 +33,36 @@
<h5 class="mdTxt">��靽憿批��</h5>
<img class="absulate img" src="~/assets/images/index_recommend.svg" alt="">
</div>
- <ConsultantSwiper :agents="agents"></ConsultantSwiper>
+ <ConsultantSwiper :agents="recommendList"></ConsultantSwiper>
</div>
</div>
</template>
<script lang="ts">
-import { Vue, Component } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
-import { Context } from '@nuxt/types/app';
+import { Vue, Component, State, Action } from 'nuxt-property-decorator';
+import { Consultants } from '~/assets/ts/api/consultant';
+import { login, recommend, getFavoriteConsultant } from '~/assets/ts/api/consultant';
+import { isLogin } from '~/assets/ts/auth';
@Component({
layout: 'home'
})
export default class MainComponent extends Vue {
- agents: Agents[] = [];
- consultantList: Agents[] = [];
+ consultantList: Consultants[] = [];
+ agents: Consultants[] = [];
+ @State('recommendList') recommendList!: Consultants[];
+ @Action storeRecommendList!: any;
- async asyncData(context: Context) {
- let agents: Agents[] = [];
- let consultantList: Agents[] = [];
- await context.$service.home.recommendConsultantList().then((result: Agents[]) => {
- agents = result;
- })
+ mounted() {
- consultantList = agents.filter(item => item.contactStatus !== 'contacted');
-
- return {
- agents,
- consultantList
+ if (!this.recommendList) {
+ this.storeRecommendList();
}
+
+ if (isLogin()) {
+ getFavoriteConsultant().then((response) => this.consultantList = response.data);
+ }
+
}
routerPush(path: string) {
@@ -73,6 +75,25 @@
})
this.consultantList.splice(findIndex, 1)
}
+
+ // TODO: ��TP隤����� ���蝙�
+ login() {
+ const user = {
+ username: "user",
+ password: "user"
+ }
+ login(user).then((res) => {
+ localStorage.setItem('id_token', res.data.id_token);
+ this.$router.go(0);
+ })
+ }
+
+ // TODO: ��TP隤����� ���蝙�
+ remove() {
+ localStorage.clear();
+ this.$router.go(0)
+ }
+
}
</script>
diff --git a/PAMapp/pages/myConsultantList.vue b/PAMapp/pages/myConsultantList.vue
index d85e127..fc6c428 100644
--- a/PAMapp/pages/myConsultantList.vue
+++ b/PAMapp/pages/myConsultantList.vue
@@ -29,14 +29,15 @@
import { Context } from '@nuxt/types';
import { Vue, Component, Watch } from 'vue-property-decorator';
import { Route } from 'vue-router/types/router.d'
-import { Agents } from '~/plugins/api/home';
+import { Consultants, getFavoriteConsultant } from '~/assets/ts/api/consultant';
+import { isLogin } from '~/assets/ts/auth';
@Component
export default class myConsultantList extends Vue {
activeTabName = 'consultantList';
- agents: Agents[] = [];
- contactedList: Agents[] = [];
- consultantList: Agents[] = [];
+ agents: Consultants[] = [];
+ contactedList: Consultants[] = [];
+ consultantList: Consultants[] = [];
tabClick(path: string) {
this.activeTabName = path;
@@ -44,13 +45,13 @@
}
async asyncData(context: Context) {
- let agents: Agents[] = [];
- let contactedList: Agents[] = [];
- let consultantList: Agents[] = [];
+ let agents: Consultants[] = [];
+ let contactedList: Consultants[] = [];
+ let consultantList: Consultants[] = [];
- await context.$service.home.recommendConsultantList().then((result: Agents[]) => {
- agents = result;
- })
+ if (isLogin()) {
+ await getFavoriteConsultant().then((response) => agents = response.data);
+ }
contactedList = agents.filter(item => item.contactStatus === 'contacted');
consultantList = agents.filter(item => item.contactStatus !== 'contacted');
diff --git a/PAMapp/pages/myConsultantList/consultantList.vue b/PAMapp/pages/myConsultantList/consultantList.vue
index c46c2f8..ba32b8c 100644
--- a/PAMapp/pages/myConsultantList/consultantList.vue
+++ b/PAMapp/pages/myConsultantList/consultantList.vue
@@ -13,24 +13,22 @@
</template>
<script lang="ts">
-import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Vue, Component, Prop, Emit, Getter } from 'nuxt-property-decorator';
+import { Consultants } from '~/assets/ts/api/consultant';
@Component
export default class ConsultantPage extends Vue {
- @Prop() consultantList!: Agents[];
- pageList: Agents[] = [];
+ @Prop() consultantList!: Consultants[];
+ @Getter isLogin!: boolean;
+ pageList: Consultants[] = [];
- @Emit('remove') remove(agentNo: number) {
+ @Emit('remove') removeAgent(agentNo: number) {
return agentNo;
}
- changePage(pageList: Agents[]) {
+ changePage(pageList: Consultants[]) {
this.pageList = pageList;
}
- removeAgent(agentNo: number) {
- this.remove(agentNo);
- }
}
</script>
\ No newline at end of file
diff --git a/PAMapp/pages/myConsultantList/contactedList.vue b/PAMapp/pages/myConsultantList/contactedList.vue
index b317884..8c6d525 100644
--- a/PAMapp/pages/myConsultantList/contactedList.vue
+++ b/PAMapp/pages/myConsultantList/contactedList.vue
@@ -13,14 +13,14 @@
<script lang="ts">
import { Vue, Component, Prop } from 'nuxt-property-decorator' ;
-import { Agents } from '~/plugins/api/home';
+import { Consultants } from '~/assets/ts/api/consultant';
@Component
export default class ContactedList extends Vue {
- @Prop() contactedList!: Agents[];
- pageList: Agents[] = [];
+ @Prop() contactedList!: Consultants[];
+ pageList: Consultants[] = [];
- changePage(pageList: Agents[]) {
+ changePage(pageList: Consultants[]) {
this.pageList = pageList;
}
}
diff --git a/PAMapp/pages/quickFilter/index.vue b/PAMapp/pages/quickFilter/index.vue
index db81125..72b49a3 100644
--- a/PAMapp/pages/quickFilter/index.vue
+++ b/PAMapp/pages/quickFilter/index.vue
@@ -79,7 +79,7 @@
<script lang="ts">
import { Context } from '@nuxt/types';
import { Vue, Component } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Consultants } from '~/assets/ts/api/consultant';
import { isMobileDevice } from '~/assets/ts/device';
import QuickFilterDrawer from '~/components/QuickFilter/QuickFilterSelector.vue';
@@ -123,9 +123,9 @@
];
async asyncData(context: Context) {
- let consultantList: Agents[] = [];
+ let consultantList: Consultants[] = [];
- await context.$service.home.recommendConsultantList().then((result: Agents[]) => {
+ await context.$service.home.recommendConsultantList().then((result: Consultants[]) => {
consultantList = result;
})
diff --git a/PAMapp/plugins/api/home.ts b/PAMapp/plugins/api/home.ts
index 2e98ab2..8e48b54 100644
--- a/PAMapp/plugins/api/home.ts
+++ b/PAMapp/plugins/api/home.ts
@@ -152,15 +152,4 @@
return CommonService.prototype.withDebugData(debugData, '')
}
-})
-
-export interface Agents {
- agentNo: number,
- name: string,
- img: string,
- new: boolean,
- satisfaction: number,
- professionals: string[],
- contactStatus: string,
- updateTime: Date
- }
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/PAMapp/store/index.ts b/PAMapp/store/index.ts
index 986f688..d175d60 100644
--- a/PAMapp/store/index.ts
+++ b/PAMapp/store/index.ts
@@ -1,6 +1,18 @@
-import { Module, VuexModule } from 'vuex-module-decorators'
-
+import { Module, VuexModule, Mutation, Action } from 'vuex-module-decorators'
+import { Consultants } from '~/assets/ts/api/consultant';
+import { recommend } from '~/assets/ts/api/consultant'
@Module
export default class Store extends VuexModule {
+ recommendList: Consultants[] | null = null;
+
+ @Mutation updateRecommend(data: Consultants[]) {
+ this.recommendList = data;
+ }
+
+ @Action storeRecommendList() {
+ recommend().then(res => {
+ this.context.commit('updateRecommend', res.data)
+ })
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0