合并解决冲突

This commit is contained in:
yujicun
2023-08-02 15:36:46 +08:00
9 changed files with 69 additions and 30 deletions

View File

@@ -53,7 +53,6 @@
}else{
apiLogin.boeLogin(token).then(rs=>{
if(rs.status==200){
//setToken(rs.result.access_token);
//加载用户信息
this.$store.dispatch("InitData").then(res => {
//console.log(res)