林旭祥 пре 6 месеци
родитељ
комит
ad7d8a0e58

+ 3 - 2
src/components/Header/index.vue

@@ -10,8 +10,9 @@
       <img src="@/assets/images/ranking/ranking.png" />
     </div>
     <div class="logo" :class="{ logo2: logoClass == 'logo2' }" v-else>
-      <img v-if="userInfo?.avatar_url" :src="userInfo.avatar_url" />
-      <img v-else src="@/assets/images/common/logo.png" />
+      <!-- <img v-if="userInfo?.avatar_url" :src="userInfo.avatar_url" />
+      <img v-else src="@/assets/images/common/logo.png" /> -->
+      <img v-if="!userInfo?.avatar_url" src="@/assets/images/common/logo.png" />
       <div class="title" v-if="parameter.project"><i></i><span>{{ dic.project[parameter.project] || "" }}</span></div>
     </div>
   </div>

+ 14 - 0
src/router/permission.ts

@@ -11,6 +11,14 @@ router.beforeEach(async (to, from, next) => {
   let token = localStorage.getItem('token');
   if (token) {
     //已登录
+    // let myInfo:any = localStorage.getItem("userInfo");
+    // let userInfo = JSON.parse(myInfo);
+    // let dom = document.querySelectorAll('link');
+    // for (let i = 0; i < dom.length; i++) {
+    //   if (dom[i].rel === 'icon') {
+    //     dom[i].href = userInfo?.logo_url || ''
+    //   }
+    // }
     if (to.path === '/login') {
       next({ path: '/' });
     } else if (to.path === '/login/qrcode') {
@@ -20,6 +28,12 @@ router.beforeEach(async (to, from, next) => {
     }
   } else {
     //未登录
+    let dom = document.querySelectorAll('link');
+    for (let i = 0; i < dom.length; i++) {
+      if (dom[i].rel === 'icon') {
+        dom[i].href = ''
+      }
+    }
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单,直接进入
       next();

+ 11 - 0
src/utils/index.ts

@@ -210,6 +210,17 @@ let utils = {
       document.exitFullscreen();
     }
     document.body.requestFullscreen();
+  },
+
+  // 设置收藏夹图标
+  setFavicon: (url?:any) => {
+    console.log("111",url)
+    let dom = document.querySelectorAll('link');
+    for (let i = 0; i < dom.length; i++) {
+      if (dom[i].rel === 'icon') {
+        dom[i].href = url || ''
+      }
+    }
   }
 };
 export default utils;

+ 4 - 5
src/views/gesture/index.vue

@@ -235,16 +235,15 @@ const getTips = () => {
  * 获取个人信息
 */
 const getUserInfo = () => {
-  let userInfo = localStorage.getItem("userInfo") || '';
-  if (userInfo) {
-    return false;
-  }
   let params = {};
   proxy?.$http.common.getUserInfo(params).then((res: any) => {
     //保存信息
     if (res.data.length) {
-      let info = JSON.stringify(res.data[0]);
+      let myData = res.data[0];
+      let info = JSON.stringify(myData);
       localStorage.setItem("userInfo", info);
+      //修改收藏夹图标
+      proxy?.$utils.setFavicon(myData?.logo_url);
       key.value = key.value + 1//更新头部LOGO
     }
   });

+ 7 - 3
src/views/login/index.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script setup name="Login" lang="ts">
+import useAppStore from '@/store/modules/app';
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 
@@ -59,7 +60,6 @@ const getLogin = () => {
       //保存token
       let token = res.access_token;
       localStorage.setItem("token", token);
-      //跳转
       router.push({ path: '/' });
       getUserInfo();
     }
@@ -77,8 +77,12 @@ const getUserInfo = () => {
   proxy?.$http.common.getUserInfo(params).then((res: any) => {
     //保存信息
     if (res.data.length) {
-      let info = JSON.stringify(res.data[0]);
+      let myData = res.data[0];
+      let info: any = JSON.stringify(myData);
       localStorage.setItem("userInfo", info);
+      //修改收藏夹图标
+      proxy?.$utils.setFavicon(myData?.logo_url);
+      //跳转
     }
   });
 };
@@ -133,7 +137,7 @@ onMounted(() => {
         margin-bottom: 2rem;
         display: flex;
         justify-content: center;
-        
+
         .login-input {
           width: 52.6%;
           height: 2.9rem;