Merge remote-tracking branch 'origin/main'

@@ -80,7 +80,7 @@ export struct OperRowListView {
   @State needLike: boolean = true
   @State needLike: boolean = true
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   @State styleType: number = -1
   @State styleType: number = -1
-  @State showCommentIcon: boolean = true
+  @State showCommentIcon: boolean = true // 评论图标
   @State bgColor: ResourceColor = Color.White
   @State bgColor: ResourceColor = Color.White
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
@@ -375,6 +375,7 @@ export struct OperRowListView {
     .height(36)
     .height(36)
     .width(48)
     .width(48)
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
+    .visibility(this.contentDetailData.openAudio == 1 ? Visibility.Visible : Visibility.None) // 【图文稿件】语音播报开关 0不播报 1播报
   }
   }
 
 
   /**
   /**

@@ -22,7 +22,7 @@ struct ForgetPasswordPage {
   @State isSubmit: boolean = false //是否可以提交  默认不可以
   @State isSubmit: boolean = false //是否可以提交  默认不可以
   loginViewModel: LoginViewModel = new LoginViewModel()
   loginViewModel: LoginViewModel = new LoginViewModel()
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
-  phone:string = (router.getParams() as Record<string, number>)['phone'] + ""; //登录 密码登录 填写手机号 点击忘记密码 带过来手机号
+  @State params:Record<string, number> =  router.getParams() as Record<string, number>;//登录 密码登录 填写手机号 点击忘记密码 带过来手机号
   @State pageTitle:string = '找回密码';
   @State pageTitle:string = '找回密码';
   @State codeStateSuccess:boolean=false
   @State codeStateSuccess:boolean=false
   onCodeSend() {
   onCodeSend() {
@@ -31,6 +31,10 @@ struct ForgetPasswordPage {
     }
     }
   }
   }
 
 
+
+
+
+
   @State toastText:string = ""
   @State toastText:string = ""
   dialogToast: CustomDialogController = new CustomDialogController({
   dialogToast: CustomDialogController = new CustomDialogController({
     builder: CustomToast({
     builder: CustomToast({
@@ -80,9 +84,14 @@ struct ForgetPasswordPage {
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    if(StringUtils.isNotEmpty(this.phone) && this.phone.indexOf("****") === -1){
-      this.phoneContent = this.phone
+    let phone = ""
+    if(this.params){
+      phone = this.params['phone']+ ""
+    }
+    if(StringUtils.isNotEmpty(phone) && phone.indexOf("****") === -1){
+      this.phoneContent = phone
     }
     }
+
   }
   }
 
 
   //发送验证码
   //发送验证码