fix:bug[17349] UI还原问题-【uat】进入重置密码页，鸿蒙显示设置密码，android显示重置密码

 import { ContentDTO } from 'wdBean/Index'
 import { ContentDTO } from 'wdBean/Index'
 import { StringUtils, UserDataLocal } from 'wdKit/Index'
 import { StringUtils, UserDataLocal } from 'wdKit/Index'
-import { ProcessUtils } from 'wdRouter/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { CommentLikeOperationRequestItem } from '../../../viewmodel/CommentLikeOperationRequestItem'
 import { CommentLikeOperationRequestItem } from '../../../viewmodel/CommentLikeOperationRequestItem'
 import { CommentListItem } from '../../../viewmodel/CommentListItem'
 import { CommentListItem } from '../../../viewmodel/CommentListItem'
 import measure from '@ohos.measure'
 import measure from '@ohos.measure'
-import { TrackingContent, TrackConstants, TrackParamConvert } from 'wdTracking/Index'
 
 
 @Component
 @Component
 export struct ChildCommentComponent {
 export struct ChildCommentComponent {
@@ -16,8 +14,6 @@ export struct ChildCommentComponent {
   @State isExpandParent: boolean = false;
   @State isExpandParent: boolean = false;
   @State isOverLines: boolean = false
   @State isOverLines: boolean = false
   @State isOverLinesParent: boolean = false
   @State isOverLinesParent: boolean = false
-  testText:string = "1，因为读书的人\n是低着头向上看的人\n身处一隅，却能放眼世界\n2，因为读书的人\n总是比不读书的人\n活得有趣一点\n3，因为读书的人\n即使平凡，绝不平庸"
-  @Link fromPage:number
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -196,15 +192,6 @@ export struct ChildCommentComponent {
 
 
         }.height('69lpx')
         }.height('69lpx')
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
-        .onClick(() => {
-          let content = getParams(this.data)
-          if(this.fromPage === 0 ){
-            TrackingContent.common(TrackConstants.EventType.Click,TrackConstants.PageName.Main_Personal,TrackConstants.PageName.Main_Personal,TrackParamConvert.program(content))
-          }else{
-            TrackingContent.common(TrackConstants.EventType.Click,TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,TrackParamConvert.program(content))
-          }
-          ProcessUtils.processPage(content)
-        })
       }
       }
       .margin({ top: '19lpx', bottom: '31lpx', left: '31lpx', right: '31lpx' })
       .margin({ top: '19lpx', bottom: '31lpx', left: '31lpx', right: '31lpx' })
       .padding({ left: '23lpx' })
       .padding({ left: '23lpx' })

@@ -10,6 +10,7 @@ import { OtherUserCommentLikeStatusRequestItem } from '../../../viewmodel/OtherU
 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 import { ContentDTO } from 'wdBean/Index';
 import { ContentDTO } from 'wdBean/Index';
 import { TrackingContent, TrackConstants, TrackParamConvert } from 'wdTracking/Index';
 import { TrackingContent, TrackConstants, TrackParamConvert } from 'wdTracking/Index';
+import { ProcessUtils } from 'wdRouter/Index';
 
 
 const TAG = "HomePageBottomCommentComponent"
 const TAG = "HomePageBottomCommentComponent"
 
 
@@ -85,10 +86,15 @@ export struct HomePageBottomCommentComponent {
           ChildCommentComponent({
           ChildCommentComponent({
             data: item,
             data: item,
             levelHead: UserDataLocal.getUserLevelHeaderUrl(),
             levelHead: UserDataLocal.getUserLevelHeaderUrl(),
-            isLastItem: index === this.data_comment.totalCount() - 1,
-            fromPage:0
+            isLastItem: index === this.data_comment.totalCount() - 1
           })
           })
-        }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
+        }
+        .onClick(()=>{
+          let content = getParams(item)
+          TrackingContent.common(TrackConstants.EventType.Click,TrackConstants.PageName.Main_Personal,TrackConstants.PageName.Main_Personal,TrackParamConvert.program(content))
+          ProcessUtils.processPage(content)
+        })
+        .onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
           if (isVisible) {
           if (isVisible) {
             let contentDTO = getParams(item)
             let contentDTO = getParams(item)
             TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.Main_Personal,TrackConstants.PageName.Main_Personal, TrackParamConvert.program(contentDTO))
             TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.Main_Personal,TrackConstants.PageName.Main_Personal, TrackParamConvert.program(contentDTO))

@@ -10,6 +10,7 @@ import { EmptyComponent } from '../../view/EmptyComponent';
 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 import { ContentDTO } from 'wdBean/Index';
 import { ContentDTO } from 'wdBean/Index';
 import { TrackingContent, TrackConstants, TrackParamConvert } from 'wdTracking/Index';
 import { TrackingContent, TrackConstants, TrackParamConvert } from 'wdTracking/Index';
+import { ProcessUtils } from 'wdRouter/Index';
 
 
 const TAG = "HomePageBottomComponent"
 const TAG = "HomePageBottomComponent"
 /**
 /**
@@ -87,9 +88,13 @@ export struct OtherHomePageBottomCommentComponent {
             data: item,
             data: item,
             levelHead: this.levelHead,
             levelHead: this.levelHead,
             isLastItem: index === this.data_comment.totalCount() - 1,
             isLastItem: index === this.data_comment.totalCount() - 1,
-            fromPage:1
           })
           })
-        }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
+        }
+        .onClick(()=>{
+          let content = getParams(item)
+          TrackingContent.common(TrackConstants.EventType.Click,TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,TrackParamConvert.program(content))
+          ProcessUtils.processPage(content)
+        }).onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
           if (isVisible) {
           if (isVisible) {
             let contentDTO = getParams(item)
             let contentDTO = getParams(item)
             TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal, TrackParamConvert.program(contentDTO))
             TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal, TrackParamConvert.program(contentDTO))

@@ -4,10 +4,7 @@ import { LoginViewModel } from './LoginViewModel'
 import router from '@ohos.router'
 import router from '@ohos.router'
 import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import { SettingPasswordParams } from './SettingPasswordPage'
 import { SettingPasswordParams } from './SettingPasswordPage'
-import { Router } from '@ohos.arkui.UIContext'
-import { CustomToast, EmitterEventId, EmitterUtils, NetworkUtil, SPHelper, StringUtils, ToastUtils } from 'wdKit/Index'
-import { SpConstants } from 'wdConstant/Index'
-import { emitter } from '@kit.BasicServicesKit'
+import { CustomToast, NetworkUtil,StringUtils } from 'wdKit/Index'
 
 
 
 
 const TAG = 'ForgetPasswordPage'
 const TAG = 'ForgetPasswordPage'
@@ -24,6 +21,7 @@ struct ForgetPasswordPage {
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
   @State params:Record<string, number> =  router.getParams() as Record<string, number>;//登录 密码登录 填写手机号 点击忘记密码 带过来手机号
   @State params:Record<string, number> =  router.getParams() as Record<string, number>;//登录 密码登录 填写手机号 点击忘记密码 带过来手机号
   @State pageTitle:string = '找回密码';
   @State pageTitle:string = '找回密码';
+  @State isForgetPassword: number = 0  //是否是登录页忘记密码过来的，标题不一样
   @State codeStateSuccess:boolean=false
   @State codeStateSuccess:boolean=false
   onCodeSend() {
   onCodeSend() {
     if (this.isCodeSend) {
     if (this.isCodeSend) {
@@ -31,10 +29,6 @@ struct ForgetPasswordPage {
     }
     }
   }
   }
 
 
-
-
-
-
   @State toastText:string = ""
   @State toastText:string = ""
   dialogToast: CustomDialogController = new CustomDialogController({
   dialogToast: CustomDialogController = new CustomDialogController({
     builder: CustomToast({
     builder: CustomToast({
@@ -87,6 +81,7 @@ struct ForgetPasswordPage {
     let phone = ""
     let phone = ""
     if(this.params){
     if(this.params){
       phone = this.params['phone']+ ""
       phone = this.params['phone']+ ""
+      this.isForgetPassword = this.params['isForgetPassword']
     }
     }
     if(StringUtils.isNotEmpty(phone) && phone.indexOf("****") === -1){
     if(StringUtils.isNotEmpty(phone) && phone.indexOf("****") === -1){
       this.phoneContent = phone
       this.phoneContent = phone
@@ -157,7 +152,8 @@ struct ForgetPasswordPage {
           pageID:'1',
           pageID:'1',
           phoneContent:this.phoneContent,
           phoneContent:this.phoneContent,
           codeContent:this.codeContent,
           codeContent:this.codeContent,
-          pageType:1
+          pageType:1,
+          isForgetPassword:this.isForgetPassword
         }
         }
         WDRouterRule.jumpWithPage(WDRouterPage.settingPasswordPage, params)
         WDRouterRule.jumpWithPage(WDRouterPage.settingPasswordPage, params)
       }).catch((message: string)=>{
       }).catch((message: string)=>{
@@ -171,7 +167,8 @@ struct ForgetPasswordPage {
         pageID:'1',
         pageID:'1',
         phoneContent:this.phoneContent,
         phoneContent:this.phoneContent,
         codeContent:this.codeContent,
         codeContent:this.codeContent,
-        pageType:0
+        pageType:0,
+        isForgetPassword:this.isForgetPassword
       }
       }
       WDRouterRule.jumpWithReplacePage(WDRouterPage.settingPasswordPage, params)
       WDRouterRule.jumpWithReplacePage(WDRouterPage.settingPasswordPage, params)
 
 

@@ -177,10 +177,11 @@ struct LoginPage {
               .onClick(() => {
               .onClick(() => {
                 TrackingButton.click("loginPageForgotPassword",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
                 TrackingButton.click("loginPageForgotPassword",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
                 if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){
                 if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){
-                  let pageType = { 'phone': Number(this.accountContent) } as Record<string, number>;
+                  let pageType = { 'phone': Number(this.accountContent),'isForgetPassword':1 } as Record<string, number>;
                   WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                   WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                 }else{
                 }else{
-                  WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage)
+                  let pageType = {'isForgetPassword':1 } as Record<string, number>;
+                  WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage,pageType)
                 }
                 }
               })
               })
           }
           }

@@ -18,6 +18,7 @@ export interface  SettingPasswordParams {
   codeContent?: string;
   codeContent?: string;
   tempToken?:string;
   tempToken?:string;
   pageType?:number;  //0、登录->忘记密码 1、设置->重置密码
   pageType?:number;  //0、登录->忘记密码 1、设置->重置密码
+  isForgetPassword?:number
 }
 }
 
 
 export default class AccoutPageDataModel {
 export default class AccoutPageDataModel {
@@ -107,6 +108,17 @@ export struct SettingPasswordPage {
     let params:SettingPasswordParams =  router.getParams() as SettingPasswordParams;
     let params:SettingPasswordParams =  router.getParams() as SettingPasswordParams;
     this.pageId = parseInt(params.pageID);
     this.pageId = parseInt(params.pageID);
     this.getPageListData(this.pageId)
     this.getPageListData(this.pageId)
+    if(params){
+      if(params.isForgetPassword === 1){
+        this.listData.forEach((item) => {
+          if (item.compType === 0) {
+            item.compTitle = "重置密码"
+          }
+        })
+      }
+    }
+
+
 
 
     this.phoneContent = params.phoneContent!;
     this.phoneContent = params.phoneContent!;
     this.codeContent = params.codeContent!;
     this.codeContent = params.codeContent!;
@@ -151,8 +163,6 @@ export struct SettingPasswordPage {
               this.getTitleCell(item, HorizontalAlign.Start)
               this.getTitleCell(item, HorizontalAlign.Start)
             } else if (item.compType == 1) {
             } else if (item.compType == 1) {
               this.getPasswordCell(item)
               this.getPasswordCell(item)
-            } else if (item.compType == 2) {
-              this.getCodeCell(item)
             } else if (item.compType == 3) {
             } else if (item.compType == 3) {
               if (index == this.listData.length - 1) {
               if (index == this.listData.length - 1) {
                 this.getDescCell(item, HorizontalAlign.Center)
                 this.getDescCell(item, HorizontalAlign.Center)
@@ -161,18 +171,12 @@ export struct SettingPasswordPage {
               }
               }
             } else if (item.compType == 4) {
             } else if (item.compType == 4) {
               this.getButtonCell(item)
               this.getButtonCell(item)
-            } else if (item.compType == 5) {
-              this.getLogoCell(item)
-            } else if (item.compType == 7) {
-              this.getPhoneCell(item)
-            } else {
-              Text('' + item.compType)
             }
             }
           }
           }
         })
         })
       }
       }
     }.width('100%')
     }.width('100%')
-    .padding('30lpx')
+    .padding({ left:"31lpx",right:"31lpx",top:"131lpx" })
     .height('100%')
     .height('100%')
   }
   }