菜单页面需等用户接口获取之后再调用

lihua
Showing 1 changed file with 6 additions and 6 deletions
src/store/modules/user.ts
--- a/src/store/modules/user.ts
View file @d3b04ac
+++ b/src/store/modules/user.ts
View file @d3b04ac
@@ -54,17 +54,13 @@ const useUserStore = defineStore(
              currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : '';
              localStorage.setItem('currentTenantGuid', currentTenantGuid.value);
              let currentTenant = res.data.tenantInfoList?.[0];
-              getCurrentUserInfo({tenantGuid: currentTenantGuid.value}).then((res: any) => {
+              return getCurrentUserInfo({tenantGuid: currentTenantGuid.value}).then((res: any) => {
                console.log(res, 'getCurrentUserInfo');
                if (res.code == '00000') {
                  userName.value = res.data.staffName;
                  localStorage.setItem('userName', res.data?.staffName);
                  localStorage.setItem('userData', JSON.stringify(res.data));
-                } else {
+                  return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
-                  ElMessage.error(res.msg)
-                }
-              })
-              return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => {
                    if (info.code == '00000') {
                      localStorage.setItem('userInfoData', JSON.stringify(info.data));
                      userInfoData.value = info.data;
@@ -73,6 +69,10 @@ const useUserStore = defineStore(
                    }
                  })
                } else {
+                  ElMessage.error(res.msg)
+                }
+              })
+            } else {
              isLogin.value = false;
             // ElMessage.error(res.msg);//授权码被重复使用，不抛出异常。
            }