mager: 合并11.2版本

This commit is contained in:
TsMask
2024-11-23 10:57:55 +08:00
parent 63d7d11350
commit 2fb3467fb5
237 changed files with 206505 additions and 11666 deletions

View File

@@ -133,18 +133,12 @@ const useUserStore = defineStore('user', {
}
// 水印文字信息=用户昵称 手机号
let waterMarkContent = this.userName;
if (this.phonenumber) {
waterMarkContent = `${this.userName} ${this.phonenumber}`;
}
// let waterMarkContent = this.userName;
// if (this.phonenumber) {
// waterMarkContent = `${this.userName} ${this.phonenumber}`;
// }
// useLayoutStore().changeWaterMark(waterMarkContent);
useLayoutStore().changeWaterMark('');
// 学生布局用不一样的
if (this.roles.includes('student')) {
useLayoutStore().changeConf('layout', 'side');
useLayoutStore().changeConf('menuTheme', 'dark');
useLayoutStore().changeConf('tabRender', false);
}
}
// 网络错误时退出登录状态
if (res.code === 0) {