Merge remote-tracking branch 'origin/main'

@@ -21,7 +21,7 @@ export struct PagePersonFunction{
               .type(ButtonType.Circle)
               .type(ButtonType.Circle)
               .width(`${this.calcHeight(12)}lpx`)
               .width(`${this.calcHeight(12)}lpx`)
               .height(`${this.calcHeight(12)}lpx`)
               .height(`${this.calcHeight(12)}lpx`)
-              .backgroundColor($r('app.color.color_ED2800'))
+              .backgroundColor(this.navItem?.noticeColor.length > 0?this.navItem?.noticeColor:$r('app.color.color_ED2800'))
           }
           }
         }.width(`${this.calcHeight(46)}lpx`)
         }.width(`${this.calcHeight(46)}lpx`)
         .height(`${this.calcHeight(46)}lpx`)
         .height(`${this.calcHeight(46)}lpx`)

@@ -199,20 +199,22 @@ struct EditUserInfoPage {
     if (backParams) {
     if (backParams) {
       let userName = backParams.userName as string ///昵称
       let userName = backParams.userName as string ///昵称
       let introduction = backParams.introduction as string ///简介
       let introduction = backParams.introduction as string ///简介
-
+      this.listData = []
       if (userName) {
       if (userName) {
         if (userName != this.currentUserInfo.userName) {
         if (userName != this.currentUserInfo.userName) {
-          // this.currentUserInfo.userName = userName;
-          // this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
+          this.currentUserInfo.userName = userName;
+          this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
+          this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
           // this.updateEditModel()
           // this.updateEditModel()
-          this.getAccountOwnerInfo()
+          // this.getAccountOwnerInfo()
         }
         }
       } else if (introduction){
       } else if (introduction){
         if (introduction != this.currentUserInfo.userExtend.introduction ) {
         if (introduction != this.currentUserInfo.userExtend.introduction ) {
-          // this.currentUserInfo.userExtend.introduction = introduction;
-          // this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
+          this.currentUserInfo.userExtend.introduction = introduction;
+          this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
+          this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
           // this.updateEditModel()
           // this.updateEditModel()
-          this.getAccountOwnerInfo()
+          // this.getAccountOwnerInfo()
         }
         }
       }
       }
     }
     }

@@ -127,6 +127,10 @@ export struct MinePageComponent {
       }
       }
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.My,TrackConstants.PageName.My,Math.floor(duration))
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.My,TrackConstants.PageName.My,Math.floor(duration))
     }
     }
+
+    WindowModel.shared.setWindowSystemBarProperties({
+      statusBarContentColor: '#000000',
+    })
   }
   }
 
 
   aboutToAppear(){
   aboutToAppear(){

@@ -44,7 +44,7 @@ export struct CustomTitleAndEditUI {
       if (this.isDisplayButton){
       if (this.isDisplayButton){
         Button(this.isEditState === true?'取消':'编辑')
         Button(this.isEditState === true?'取消':'编辑')
           .type(ButtonType.Normal)
           .type(ButtonType.Normal)
-          .fontColor($r('app.color.color_222222'))
+          .fontColor($r('app.color.color_B0B0B0'))
           .backgroundColor(Color.White)
           .backgroundColor(Color.White)
           .id("edit_Button")
           .id("edit_Button")
           .alignRules({
           .alignRules({