debug proxy

杨泽宇
1 parent f26c363c
Showing 4 changed files with 42 additions and 23 deletions
src/layout/header.vue
src/pinia/modules/login.ts
src/views/dashboard/index.vue
src/views/property/index.vue
@@ -28,11 +28,13 @@ const handleLogout = () =&gt; {
     confirmButtonText: "确认",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(() => {
-    store.family.loginStore().removeToken();
-  }).catch(error => {
-    console.log(error)
   })
+    .then(() => {
+      store.family.loginStore().removeToken();
+    })
+    .catch((error) => {
+      console.log(error);
+    });
 };
 let asyncData = reactive({
   userInfo: "",
@@ -40,9 +42,10 @@ let asyncData = reactive({
 });
 onMounted(() => {
   asyncData.userInfo = store.family.loginStore().userName;
+  asyncData.organizationLogo = store.family.loginStore().organizationLogo;
   asyncData.isCollapse = computed(() => {
-    return store.family.appStore().isCollapse
-  })
+    return store.family.appStore().isCollapse;
+  });
 });
 </script>
  
@@ -55,7 +58,11 @@ onMounted(() =&gt; {
     >
       <router-link to="/">
         <el-image
-          :src="globalProperties.$cnliveLogo"
+          :src="
+            asyncData.organizationLogo
+              ? asyncData.organizationLogo
+              : globalProperties.$cnliveLogo
+          "
           fit="contain"
           style="height: 40px"
         ></el-image>
@@ -72,7 +79,9 @@ onMounted(() =&gt; {
     <div class="right-buttons">
       <el-button type="text"><router-link to="/">首页</router-link></el-button>
       <el-button type="text"
-        >当前用户：<b>{{ asyncData.userInfo? asyncData.userInfo: '超级管理员' }}</b></el-button
+        >当前用户：<b>{{
+          asyncData.userInfo ? asyncData.userInfo : "超级管理员"
+        }}</b></el-button
       >
       <el-button type="text" @click="handleLogout">退出</el-button>
     </div>
@@ -57,7 +57,7 @@ const getters = {
 }
 const actions = {
   setUserInfo(obj: LoginUser) {
-    this.token = obj.token
+    this.token = obj.token? obj.token: this.token
     this.organizationId = obj.organizationId? obj.organizationId: obj.oId
     this.id = obj.id? obj.id: obj.userId
     this.userName = obj.userName
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, onMounted, reactive } from "vue";
 import { propertyList } from "@/api/property";
 import router from "@/router";
 import * as store from "@/pinia/index";
 const title = ref(import.meta.env.VITE_APP_TITLE).value;
+let asyncData = reactive({
+  organizationLogo: "",
+  organizationName: "",
+});
 propertyList()
   .then((res) => {
     console.log(res);
@@ -11,17 +15,26 @@ propertyList()
   .catch((error) => {
     console.log(error);
   });
-console.log(router.getRoutes());
+onMounted(() => {
+  asyncData.organizationLogo = store.family.loginStore().organizationLogo;
+  asyncData.organizationName = store.family.loginStore().organizationName;
+});
 </script>
  
 <template>
   <div class="dashboard-container">
-    <div class="dashboard-logo"></div>
-    <h1>欢迎访问 -- {{ store.family.loginStore().organizationName? store.family.loginStore().organizationName: title }}</h1>
-    <!-- {{ store.family }}
-    {{ store.family.menuStore() }} -->
-    <!-- {{ store.family.loginStore().organizationName }}
-    {{ store.family.loginStore().oName }} -->
+    <img
+      :src="
+        asyncData.organizationLogo
+          ? asyncData.organizationLogo
+          : '@/assets/logo.png'
+      "
+      height="200"
+    />
+    <h1>
+      欢迎访问 --
+      {{ asyncData.organizationName ? asyncData.organizationName : title }}
+    </h1>
   </div>
 </template>
  
@@ -93,15 +93,12 @@ const handleStatus = async (obj) =&gt; {
 const handleProxy = (obj) => {
   userProxy({ oId: obj.id }).then((res) => {
     if (res?.data) {
-      console.log("代理成功的回调");
-      console.log(res.data);
+      store.family.loginStore().setUserInfo(res?.data?.data);
       globalProperties.$message.success("代理成功");
       getMenu().then(() => {
-        console.log("got menu data");
         setTimeout(() => {
-          location.href = '/'
-          console.log("跳");
-        }, 2000);
+          location.href = "/";
+        }, 500);
       });
     } else {
       globalProperties.$message.error("代理失败");