Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

张红振
2 parents ce2d1aa8 9cd3a043
Showing 2 changed files with 9 additions and 8 deletions
src/api/request.ts
src/layout/menu.vue
@@ -8,6 +8,7 @@ let url: any = import.meta.env
 let instance = axios.create({
   baseURL: url.VITE_BASE_URL,
   withCredentials: true,
+  // timeout: 10
   timeout: 10000
 })
  
@@ -6,20 +6,20 @@
 import { ref, computed, onMounted, reactive } from "vue";
 import * as store from "@/pinia/index";
 import styles from "@/style/global.module.scss";
-import MenuIcon from './icon.vue'
+import MenuIcon from "./icon.vue";
 // TIP 获取scss样式变量
 let styleData = computed(() => {
   return styles;
 });
 let asyncData = reactive({
   menuData: [],
-  isCollapse: null
-})
+  isCollapse: null,
+});
 onMounted(() => {
-  asyncData.menuData = store.family.loginStore().menuList
+  asyncData.menuData = store.family.loginStore().menuList;
   asyncData.isCollapse = computed(() => {
-    return store.family.appStore().isCollapse
-  })
+    return store.family.appStore().isCollapse;
+  });
 });
 </script>
  
@@ -34,10 +34,10 @@ onMounted(() =&gt; {
       :router="true"
       :collapse-transition="false"
       :collapse="asyncData.isCollapse"
-    > 
+    >
       <el-menu-item index="/">
+        <MenuIcon :keyId="-1"></MenuIcon>
         <template #title>
-          <MenuIcon :keyId="-1"></MenuIcon>
           <span>首页</span>
         </template>
       </el-menu-item>