From 91dcc20d9ab86195f0bec6449641cb10b49bc76b Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 20 Dec 2021 10:07:52 +0800
Subject: [PATCH] meun

---
 src/app/shared/components/captcha/dun.helper.ts  |  2 +-
 src/app/shared/services/business/user.service.ts | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/components/captcha/dun.helper.ts b/src/app/shared/components/captcha/dun.helper.ts
index 4e3cb70b..9f3bea06 100644
--- a/src/app/shared/components/captcha/dun.helper.ts
+++ b/src/app/shared/components/captcha/dun.helper.ts
@@ -12,7 +12,7 @@ export class DunHelper {
   userInfo;
 
   constructor(private overlay: Overlay) {
-    this.userInfo = JSON.parse(localStorage.getItem('user') || '');
+    this.userInfo = JSON.parse(localStorage.getItem('user') || '{}');
   }
 
   /**
diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts
index f578d559..e7935c01 100644
--- a/src/app/shared/services/business/user.service.ts
+++ b/src/app/shared/services/business/user.service.ts
@@ -125,7 +125,7 @@ export class EAUserService extends BaseService {
 
   async doAfterLogin() {
     await this.loadUserInfo();
-    // await this.loadUserMenus();
+    await this.loadUserMenus();
     await this.loadUserRoles();
   }
 
@@ -143,9 +143,14 @@ export class EAUserService extends BaseService {
    * 加载用户菜单
    */
   async loadUserMenus() {
-    return this.asyncRequest(this.$api_get_user_menus, { appId: sysConf.appId }).then(res => {
-      this.cacheSrv.set(cacheConf.menu, res);
-    });
+    // return this.asyncRequest(this.$api_get_user_menus, { appId: sysConf.appId }).then(res => {
+    //   this.cacheSrv.set(cacheConf.menu, res);
+    // });
+    this.request('assets/mocks/menu-data.json').pipe(
+      map((res: any) => {
+        this.cacheSrv.set(cacheConf.menu, res.menu);
+      })
+    );
   }
 
   /**