debug

杨泽宇
1 parent 34615b13
Showing 3 changed files with 11 additions and 8 deletions
src/pinia/modules/login.ts
src/views/dashboard/index.vue
src/views/property/index.vue
@@ -7,9 +7,11 @@ interface LoginUser {
   id?: number,
   userName: string,
   organizationType?: number | null,
-  organizationName: string,
-  organizationLogo: string,
+  organizationName?: string,
+  organizationLogo?: string,
   oId?: number,
+  oName?: string,
+  oLogo?: string,
   userId?: number,
   oType?: number
 }
@@ -59,9 +61,9 @@ const actions = {
     this.organizationId = obj.organizationId? obj.organizationId: obj.oId
     this.id = obj.id? obj.id: obj.userId
     this.userName = obj.userName
-    this.organizationName = obj.organizationName
+    this.organizationName = obj.organizationName? obj.organizationName: obj.oName
     this.organizationType = obj.organizationType? obj.organizationType: obj.oType
-    this.organizationLogo = obj.organizationLogo
+    this.organizationLogo = obj.organizationLogo? obj.organizationLogo: obj.oLogo
   },
   removeToken(msg: string | null) {
     logout()
@@ -17,10 +17,11 @@ console.log(router.getRoutes());
 <template>
   <div class="dashboard-container">
     <div class="dashboard-logo"></div>
-    <h1>欢迎访问 -- {{ title }}</h1>
+    <h1>欢迎访问 -- {{ store.family.loginStore().organizationName? store.family.loginStore().organizationName: title }}</h1>
     <!-- {{ store.family }}
-    {{ store.family.menuStore() }}
-    {{ store.family.menuStore().menuList }} -->
+    {{ store.family.menuStore() }} -->
+    <!-- {{ store.family.loginStore().organizationName }}
+    {{ store.family.loginStore().oName }} -->
   </div>
 </template>
  
@@ -99,7 +99,7 @@ const handleProxy = (obj) =&gt; {
       getMenu().then(() => {
         console.log("got menu data");
         setTimeout(() => {
-          // location.href = '/'
+          location.href = '/'
           console.log("跳");
         }, 2000);
       });