From b0afc5a6426e2322315a5e16ad8428d965b50dfe Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 08 二月 2022 14:06:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/pages/login/index.vue | 12 +++++-------
PAMapp/store/localStorage.ts | 6 ++++++
PAMapp/pages/appointment/_appointmentId/index.vue | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index ce81ede..3a76624 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -64,11 +64,11 @@
<el-button @click="sendMsg" style="margin-left: 0px">�蝝赤</el-button>
</div>
- </section>
-
<div class="client-detail-action btn-center" v-if="showWhenAppointmentHasCreate">
<el-button @click="sendMsg">���赤�</el-button>
</div>
+ </section>
+
<template v-if="showWhenAppointmentHasClosed">
<AppointmentClosedInfo :appointmentDetail="appointmentDetail" />
diff --git a/PAMapp/pages/login/index.vue b/PAMapp/pages/login/index.vue
index 64a188b..7ae3d1e 100644
--- a/PAMapp/pages/login/index.vue
+++ b/PAMapp/pages/login/index.vue
@@ -355,6 +355,9 @@
@roleStorage.Mutation
storageRole!: (role:string) => void;
+ @roleStorage.Mutation
+ storageUserInfo!: (userInfo: RegisterInfo) => void;
+
@Ref('contract') readonly contract!: any;
connectDevice: 'MOBILE' | 'EMAIL' = 'MOBILE';
@@ -452,7 +455,7 @@
this.storageRole(Role.USER);
this.phoneSuccessConfirmVisable = true;
this.autoRedirect();
- this.storagePhoneOrEmail(this.setRegisterInfo());
+ this.storageUserInfo(this.setRegisterInfo());
}).catch(error => {
this.checkHttpErrorStatus(error);
});
@@ -476,7 +479,7 @@
loginService.register(registerInfo).then(res => {
this.storageIdToken(res.id_token);
this.storageRole(Role.USER);
- this.storagePhoneOrEmail(registerInfo);
+ this.storageUserInfo(this.setRegisterInfo());
this.autoRedirect();
this.registerSuccessConfirmVisable = true;
}).catch(() => {
@@ -632,11 +635,6 @@
messageBoxService.showErrorMessage('',error);
break;
}
- }
-
- private storagePhoneOrEmail(registerInfo:RegisterInfo):void{
- const info = {...registerInfo, time: new Date()}
- localStorage.setItem('userInfo',JSON.stringify(info));
}
private removeOtpTime() {
diff --git a/PAMapp/store/localStorage.ts b/PAMapp/store/localStorage.ts
index 38e442d..df5f31f 100644
--- a/PAMapp/store/localStorage.ts
+++ b/PAMapp/store/localStorage.ts
@@ -2,6 +2,7 @@
import { ContactType } from '~/shared/models/enum/ContactType';
import { Role } from '~/shared/models/enum/Role';
import { Selected } from '~/shared/models/quick-filter.model';
+import { RegisterInfo } from '~/shared/models/registerInfo';
import { StrictQueryParams } from '~/shared/models/strict-query.model';
@Module
export default class LocalStorage extends VuexModule {
@@ -55,6 +56,11 @@
return this.notContactAppointmentIdFromMsg;
}
+ @Mutation storageUserInfo(userInfo: RegisterInfo): void {
+ localStorage.setItem('userInfo', JSON.stringify(userInfo));
+ this.userInfo = localStorage.getItem('userInfo');
+ }
+
@Mutation storageIdToken(token: string): void {
localStorage.setItem('id_token', token);
this.id_token = localStorage.getItem('id_token') ;
--
Gitblit v1.8.0