From dbceec6eccb29cd62825fedfa55b8f9b14c3811c Mon Sep 17 00:00:00 2001
From: 18300102974 <tony.lin@origtek.cn>
Date: Thu, 2 Feb 2023 17:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8D=B2=E5=8F=96=E7=99=BB=E9=8C=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B6=E4=BF=A1=E6=81=AF=E9=A1=AF=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontEnd/components/NavBar.vue              | 10 ++++------
 FrontEnd/components/mobileUserInfoPopup.vue |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/FrontEnd/components/NavBar.vue b/FrontEnd/components/NavBar.vue
index 44f0e80..a76c7e8 100644
--- a/FrontEnd/components/NavBar.vue
+++ b/FrontEnd/components/NavBar.vue
@@ -861,15 +861,13 @@ export default {
           if(response && response.data && response.data.DATA && response.data.DATA.rel){
             let data = response.data.DATA.rel
             if(data){
-              if (!this.$auth.$storage.getUniversal("userPicture")) {
+              if(data.MemberPicture){
                 this.userPicture = data.MemberPicture;
                 this.$auth.$storage.setUniversal("userPicture", data.MemberPicture);
-              } else {
-                this.userPicture = this.$auth.$storage.getUniversal("userPicture");
               }
-              this.$auth.$storage.setUniversal(
-                "userLastName", data.LastName
-              );
+              if(data.LastName){
+                this.$auth.$storage.setUniversal("userLastName", data.LastName);
+              }
             }
           }
         })
diff --git a/FrontEnd/components/mobileUserInfoPopup.vue b/FrontEnd/components/mobileUserInfoPopup.vue
index 3c9d56b..f0deab2 100644
--- a/FrontEnd/components/mobileUserInfoPopup.vue
+++ b/FrontEnd/components/mobileUserInfoPopup.vue
@@ -81,7 +81,7 @@ export default {
       this.$emit("popup", false);
     },
     logout() {
-      this.$auth.$storage.removeUniversal("jwt");
+      this.$auth.$storage.removeUniversal("authtoken");
       this.$auth.$storage.removeUniversal("userPicture");
       this.$auth.$storage.removeUniversal("userLastName");
       this.$auth.$storage.removeUniversal("userBeforePath");