Merge branch 'yt' into dev

2025-08-13 10:52:19 +08:00
parent 5fc1378051 fab8d88faf
commit 2b48faf50d
2 changed files with 2 additions and 2 deletions
--- a/pages/dashboardModule/performanceRanking/performanceRanking.wxss
+++ b/pages/dashboardModule/performanceRanking/performanceRanking.wxss
@ -208,7 +208,7 @@
  line-height: 24.23rpx;
 }
 .text-wrapper_9 {
-  padding: 14.61rpx 0 13.33rpx;
+  padding: 14.61rpx 0 14.61rpx;
  background-color: #ffffff;
  border-radius: 28.13rpx;
  height: 56.25rpx;
--- a/pages/personCenter/resetPwd/resetPwd.js
+++ b/pages/personCenter/resetPwd/resetPwd.js
@ -45,7 +45,7 @@ Page({
          })
          setTimeout(() => {
            wx.reLaunch({
-              url: '/pages/loginModule/pwdLogin/pwdLogin',
+              url: '/pages/welcome/homePage/homePage',
            })
          }, 1000); // 1000ms = 1秒