From 8b822da7e688aa31e4600f9ea17a0e85f9985c06 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 16 十一月 2021 10:20:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/pages/index.vue | 49 ++++++++++++-------------------------------------
1 files changed, 12 insertions(+), 37 deletions(-)
diff --git a/PAMapp/pages/index.vue b/PAMapp/pages/index.vue
index 7a5053b..62a9392 100644
--- a/PAMapp/pages/index.vue
+++ b/PAMapp/pages/index.vue
@@ -1,8 +1,5 @@
<template>
<div>
- <el-button @click="login('user')">摰Ｘ��</el-button>
- <el-button @click="login('admin')">憿批��</el-button>
- <el-button @click="remove">��</el-button>
<Ui-Carousel></Ui-Carousel>
<div class="page-container">
<h5 class="mdTxt mb-30">����憿批��</h5>
@@ -45,7 +42,7 @@
<script lang="ts">
import { Vue, Component, State, Action } from 'nuxt-property-decorator';
import { getFavoriteFromStorage, setFavoriteToStorage } from '~/assets/ts/storageConsultant';
-import { addFavoriteConsultant, Consultants } from '~/assets/ts/api/consultant';
+import { addFavoriteConsultant, Consultants, deleteConsultant } from '~/assets/ts/api/consultant';
import { login, getFavoriteConsultant } from '~/assets/ts/api/consultant';
import { isLogin } from '~/assets/ts/auth';
@@ -65,7 +62,9 @@
if (isLogin()) {
this.addFavoriteFromStorageToApi();
- getFavoriteConsultant().then((response) => this.consultantList = response.data);
+ getFavoriteConsultant().then((response) => {
+ this.consultantList = response.data.filter(item => item.contactStatus !== 'contacted')
+ });
} else {
this.consultantList = getFavoriteFromStorage();
}
@@ -84,41 +83,17 @@
}
removeAgent(agentNo: string) {
- const findIndex = this.consultantList.findIndex((item, i) => {
- return item.agentNo === agentNo;
- })
- this.consultantList.splice(findIndex, 1);
+
if (!isLogin()) {
+ const findIndex = this.consultantList.findIndex((item, i) => {
+ return item.agentNo === agentNo;
+ })
+ this.consultantList.splice(findIndex, 1);
setFavoriteToStorage(this.consultantList)
+ } else {
+ deleteConsultant(agentNo).then(res => this.$router.go(0))
}
}
-
- // TODO: ��TP隤����� ���蝙�
- login(account: string) {
- const user = {
- username: account,
- password: account
- }
- login(user).then((res) => {
- localStorage.setItem('id_token', res.data.id_token);
-
- if (account === 'admin') {
- this.$router.push('/myAppointmentList/appointmentList');
- } else {
- this.$router.go(0);
- }
-
- })
-
-
- }
-
- // TODO: ��TP隤����� ���蝙�
- remove() {
- localStorage.removeItem('id_token');
- this.$router.go(0)
- }
-
}
</script>
@@ -166,7 +141,7 @@
background-image: url('~/assets/images/recommendConsultant/banner_mob.svg');
}
- @media (min-width: 576px) and (max-width: 1023px) {
+ @media (min-width: 576px) and (max-width: 768px) {
.quickFilter.el-button--default {
background-image: url('~/assets/images/quickFilter/banner_web.svg');
}
--
Gitblit v1.8.0