Compare commits

..

No commits in common. "master" and "dev" have entirely different histories.
master ... dev

2 changed files with 14 additions and 13 deletions

View File

@ -209,12 +209,14 @@ 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) {
}
});
}

View File

@ -91,13 +91,12 @@ 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();
}
}
}