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

@@ -46,6 +46,8 @@ export struct RmhTitle {
             .maxLines(1)
             .maxLines(1)
             .alignSelf(ItemAlign.Start)
             .alignSelf(ItemAlign.Start)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
             .textOverflow({ overflow: TextOverflow.Ellipsis })
+            .textAlign(TextAlign.Start)
+            .width('70%')
         }
         }
       }
       }
 
 

@@ -324,6 +324,27 @@ export struct HomePageBottomComponent{
       data.push(new CommentListItem(item.fromUserHeader,item.fromUserName,item.targetTitle,item.createTime,commentContent,item.likeNum,0,item.id,item.targetId,item.targetType,item.targetRelId,item.targetRelObjectId,item.targetRelType,item.targetStatus,item.checkStatus,parentCommentContent,parentCommentUserName))
       data.push(new CommentListItem(item.fromUserHeader,item.fromUserName,item.targetTitle,item.createTime,commentContent,item.likeNum,0,item.id,item.targetId,item.targetType,item.targetRelId,item.targetRelObjectId,item.targetRelType,item.targetStatus,item.checkStatus,parentCommentContent,parentCommentUserName))
     })
     })
 
 
+    if(status.commentIdList.length === 0){
+      data.forEach((item)=>{
+        let publishTime = DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime,DateTimeUtils.PATTERN_DATE_TIME_HYPHEN))
+        this.data_comment.push(new CommentListItem(item.fromUserHeader,item.fromUserName,item.targetTitle,publishTime,item.commentContent,item.likeNum,item.like_status,item.id,item.targetId,item.targetType,item.targetRelId,item.targetRelObjectId,item.targetRelType,item.targetStatus,item.checkStatus,item.parentCommentContent,item.parentCommentUserName))
+      })
+
+      this.data_comment.notifyDataReload()
+
+      this.count = this.data_comment.totalCount()
+      this.commentNum = value.totalCount
+      if (this.data_comment.totalCount() < value.totalCount) {
+        this.curPageNum++
+      }else {
+        this.hasMore = false
+      }
+
+      this.isLoading = false
+      this.isGetRequest = true
+      return
+    }
+
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status,getContext(this)).then((newValue)=>{
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status,getContext(this)).then((newValue)=>{
       newValue.forEach((item)=>{
       newValue.forEach((item)=>{
         data.forEach((list)=>{
         data.forEach((list)=>{

@@ -139,6 +139,27 @@ export struct OtherHomePageBottomCommentComponent {
       data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, item.createTime, commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, parentCommentUserName))
       data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, item.createTime, commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, parentCommentUserName))
     })
     })
 
 
+    if(status.commentIdList.length === 0){
+      data.forEach((item) => {
+        this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName))
+      })
+
+      this.data_comment.notifyDataReload()
+
+      this.count = this.data_comment.totalCount()
+      this.commentNum = value.totalCount
+      if (this.data_comment.totalCount() < value.totalCount) {
+        this.curPageNum++
+      } else {
+        this.hasMore = false
+      }
+
+      this.isLoading = false
+      this.isGetRequest = true
+      return
+    }
+
+
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status, getContext(this)).then((newValue) => {
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status, getContext(this)).then((newValue) => {
       newValue.forEach((item) => {
       newValue.forEach((item) => {
         data.forEach((list) => {
         data.forEach((list) => {

@@ -81,9 +81,9 @@ export struct AccountAndSecurityLayout {
 
 
     // 收到eventId为1的事件后执行该回调
     // 收到eventId为1的事件后执行该回调
     let callback = (eventData: emitter.EventData): void => {
     let callback = (eventData: emitter.EventData): void => {
-      promptAction.showToast({
-        message: JSON.stringify(eventData)
-      });
+      // promptAction.showToast({
+      //   message: JSON.stringify(eventData)
+      // });
       if(eventData&&eventData.data){
       if(eventData&&eventData.data){
         this.listData[0].subTitle = eventData.data['content']
         this.listData[0].subTitle = eventData.data['content']
       }
       }

@@ -184,6 +184,10 @@ struct ForgetPasswordPage {
     this.loginViewModel.changeBindPhone(this.phoneContent,this.codeContent).then(()=>{
     this.loginViewModel.changeBindPhone(this.phoneContent,this.codeContent).then(()=>{
       ToastUtils.shortToast('绑定成功')
       ToastUtils.shortToast('绑定成功')
       this.querySecurity()
       this.querySecurity()
+    }).catch((message: string) => {
+      if (message != '') {
+        ToastUtils.shortToast(message)
+      }
     })
     })
   }
   }
 
 

@@ -171,8 +171,8 @@ export class LoginViewModel {
     return new Promise<object>((success, fail) => {
     return new Promise<object>((success, fail) => {
       this.loginModel.changeBindPhone(phone, verificationCode).then((data: object) => {
       this.loginModel.changeBindPhone(phone, verificationCode).then((data: object) => {
         success(data)
         success(data)
-      }).catch(() => {
-        fail()
+      }).catch((message: string) => {
+        fail(message)
       })
       })
     })
     })
   }
   }