Merge branch 'dev'

2023-11-09 17:26:17 +08:00
parent 372eaba087 93ae44c789
commit 5dc42ab6b6
37 changed files with 3995 additions and 179 deletions
@@ -105,23 +105,25 @@ router.beforeEach(async(to, from, next) => {
 // afterEach Router
 router.afterEach((to) => {
  const store = useUserStore();
-
-  // 修改网页标题
-  if (to.name !== 'login') {
-    document.title = `${to.meta.title} - ${store.sysConfig.sys_app_name}`;
-  } else {
-    document.title = store.sysConfig.sys_app_name;
-  }
-
-  // Vincent 2023004 修复加载水印的bug 
-  if (store.userInfo != undefined){
-    if ( store.userInfo.name != undefined ) {
-      Watermark.set(store.userInfo.name)
+   // Vincent 2023004 修复加载水印的bug 
+   if (store.userInfo != undefined){
+    if ( store.userInfo.nick_name != undefined ) {
+      Watermark.set(store.userInfo.nick_name)
    } else {
      Watermark.out() // 清除水印
    }
  } else{
    Watermark.out() // 清除水印
  }
+
+  // 修改网页标题
+  if (to.name !== 'login') {
+    document.title = `${to.meta.title} - ${store.sysConfig.sys_app_name}`;
+  } else {
+    document.title = store.sysConfig.sys_app_name;
+    Watermark.out()
+  }
+  
+ 
 });
 export default router;