Merge branch 'dev/1.0' into custom/common

2026-01-08 15:10:46 +08:00
parent aa2f13f3b2
commit 23c954981b
92 changed files with 1975 additions and 382 deletions
--- a/pages_tool/member/public/js/common.js
+++ b/pages_tool/member/public/js/common.js
@@ -1,8 +1,9 @@
 export default {
    methods: {
        // 跳转至登录页
-		toLogin() {
-			this.$refs.login.open();
+		toLogin(url) {
+            console.log('跳转至登录页', {url, currentRoute: this.$util.getCurrentRoute()});
+			this.$refs.login.open(url ?? this.$util.getCurrentRoute());
 		}
    }
 }