From 544f91e63a01f37e7b79db99609eec99b1afafd9 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 13 十二月 2021 11:07:31 +0800
Subject: [PATCH] fixed: 使用 isUserLogin / isAdminLogin 判斷顧問/客戶是否登入
---
PAMapp/pages/questionnaire/_agentNo.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index d792506..1ed02c8 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -1,5 +1,5 @@
<template>
- <div class="ques-page--reset" v-if="isLogin">
+ <div class="ques-page--reset" v-if="isUserLogin">
<div class="ques-header">
<div class="ques-header__mob-banner"></div>
<div
@@ -136,19 +136,21 @@
</template>
<script lang="ts">
-import { Vue, Component, State, Action, Watch } from 'nuxt-property-decorator';
+import { Vue, Component, State, Action, Watch, namespace } from 'nuxt-property-decorator';
import { addFavoriteConsultant, appointmentDemand, AppointmentParams, AppointmentRequests ,editAppointment,RegisterInfo } from '~/assets/ts/api/consultant';
import { getRequestQuestionFromStorage, getRequestsFromStorage, removeRequestQuestionFromStorage, setRequestsToStorage } from '~/assets/ts/storageRequests';
import _ from 'lodash';
-import { isLogin } from '~/assets/ts/auth';
import { Consultant } from '~/assets/ts/models/consultant.model';
import { ContactType } from '~/assets/ts/models/enum/ContactType';
import { Gender } from '~/assets/ts/models/enum/Gender';
+import { Role } from '~/assets/ts/models/enum/Role';
+ const roleStorage = namespace('localStorage');
@Component
export default class Questionnaire extends Vue {
@State('myConsultantList') myConsultantList!: Consultant[];
@Action storeConsultantList!: () => Promise<number>;
+ @roleStorage.Getter isUserLogin!:boolean;
genderOptions=[
{
@@ -270,19 +272,20 @@
beforeRouteEnter(to: any, from: any, next: any) {
next(vm => {
- if (from.name === 'login' && !isLogin()) {
+ const isUserLogin = vm.$store.getters['localStorage/isUserLogin'];
+ if (from.name === 'login' && !isUserLogin) {
vm.$router.go(-1);
return;
}
- if (!isLogin()) {
+ if (!isUserLogin) {
vm.$router.push('/login');
}
})
}
async fetch() {
- if (isLogin()) {
+ if (this.isUserLogin) {
await this.storeConsultantList();
};
}
@@ -332,10 +335,6 @@
return _.includes(this.myRequest.contactType,ContactType.PHONE)
? !this.isHopeContactTimeDone()
: !this.phoneValid;
- }
-
- get isLogin() {
- return isLogin();
}
private isHopeContactTimeDone():boolean{
@@ -448,7 +447,7 @@
}
@Watch('myConsultantList') onMyConsultantListChange() {
- if (this.isLogin && this.myConsultantList.length > 0) {
+ if (this.isUserLogin && this.myConsultantList.length > 0) {
const editAppointment = this.getLatestReserved(this.$route.params.agentNo);
if (editAppointment.agentNo) {
--
Gitblit v1.8.0