Merge remote-tracking branch 'origin/main'

@@ -65,12 +65,19 @@ export struct MineSettingComponent {
 
 
               }.padding({ left: '27lpx' })
               }.padding({ left: '27lpx' })
               .onClick(() => {
               .onClick(() => {
+
                 // 在Home页面中
                 // 在Home页面中
                 let paramsInfo: object = {
                 let paramsInfo: object = {
                   pageId: 123,
                   pageId: 123,
                   pageType:'AccountAndSecurityLayout'
                   pageType:'AccountAndSecurityLayout'
                 };
                 };
                 RouteManager.jumpNewPage("pages/SettingPasswordPage") // 调用跳转方法，跳转新页面
                 RouteManager.jumpNewPage("pages/SettingPasswordPage") // 调用跳转方法，跳转新页面
+
+                console.log(subIndex + "")
+                if (subIndex == 4) {
+                  // RouteManager.jumpNewPage("pages/SettingPage") // 调用跳转方法，跳转新页面
+                }
+
               })
               })
               .height('117lpx')
               .height('117lpx')
             }, subItem => subItem)
             }, subItem => subItem)

@@ -68,12 +68,16 @@ export default struct MinePageMoreFunctionUI{
             if (index == 3) {
             if (index == 3) {
               RouteManager.jumpNewPage("pages/SettingPage")
               RouteManager.jumpNewPage("pages/SettingPage")
             } else  {
             } else  {
+
               // 在Home页面中
               // 在Home页面中
               let paramsInfo: object = {
               let paramsInfo: object = {
                 pageId: 123,
                 pageId: 123,
                 pageType:'mainSetting'
                 pageType:'mainSetting'
               };
               };
               RouteManager.jumpNewPage("pages/PrivacySettingPage",paramsInfo)
               RouteManager.jumpNewPage("pages/PrivacySettingPage",paramsInfo)
+
+              // RouteManager.jumpNewPage("pages/PrivacySettingPage")
+
             }
             }
           })
           })
           .height('117lpx')
           .height('117lpx')