Merge branch 'main' into yxl

2026-06-09 21:42:58 +08:00
parent d15765973a b4ff618477
commit d42128be8b
105 changed files with 7574 additions and 8515 deletions
--- a/utilsRc/request.js
+++ b/utilsRc/request.js
@@ -99,7 +99,7 @@ const request = config => {
 					if (res.confirm) {
 						getApp().globalData.isShowModel = false
 						store.dispatch('LogOut').then(res => {
-							uni.reLaunch({ url: '/pages/login/login-one' })
+							uni.reLaunch({ url: '/packageA/pages/login/wx-login' })
 						})
 					} else if(res.cancel) {
 						getApp().globalData.isShowModel = false