Merge branch 'dev'

src/components/chatRecord.vue

@@ -209,14 +209,12 @@ const HandleGetIm = async (params = {}) => {
     console.log(chatlist.value)
     if(!firstIn.value){
       nextTick(() => {
-        try {
-         // 要放在对响应式数据修改之后
-      let ele = document.querySelector('.phonecont');
-      ele.scrollTop = ele.scrollHeight;
-      } catch (error) {
-       
-      }
-     
+      // 要放在对响应式数据修改之后
+       try {
+        let ele = document.querySelector('.phonecont');
+        ele.scrollTop = ele.scrollHeight;
+       } catch (error) {
+       }
     });
     }
 

src/router/index.js

@@ -91,12 +91,13 @@ router.beforeEach(async(to, from, next) => {
       const menuList= permissionStore.menuList;
       next({ path: menuList[0].children[0].path });
    } else {
-    if(to.path=="/" || to.path=="/admin"){
-      const menuList= permissionStore.menuList;
-      next({ path: menuList[0].children[0].path });
-     }else{
-      next();
-     }
+       if(to.path=="/" || to.path=="/admin"){
+        const menuList= permissionStore.menuList;
+        next({ path: menuList[0].children[0].path });
+       }else{
+        next();
+       }
+
     }
 
   }