Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -248,9 +248,9 @@ 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.listData = []
           this.currentUserInfo.userName = userName;
           this.currentUserInfo.userName = userName;
           this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
           this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
           this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
           this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
@@ -259,6 +259,7 @@ struct EditUserInfoPage {
         }
         }
       } else if (introduction){
       } else if (introduction){
         if (introduction != this.currentUserInfo.userExtend.introduction ) {
         if (introduction != this.currentUserInfo.userExtend.introduction ) {
+          this.listData = []
           this.currentUserInfo.userExtend.introduction = introduction;
           this.currentUserInfo.userExtend.introduction = introduction;
           this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
           this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
           this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
           this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))