Revert "稿件底部评论点赞组件封装完善1"

This reverts commit 0ba08f93.

@@ -46,6 +46,10 @@ export class HttpUrlUtils {
    */
    */
   static readonly INTERACT_EXECUTELIKE: string = "/api/rmrb-interact/interact/zh/c/like/executeLike";
   static readonly INTERACT_EXECUTELIKE: string = "/api/rmrb-interact/interact/zh/c/like/executeLike";
   /**
   /**
+   * 收藏、取消收藏
+   */
+  static readonly INTERACT_EXECUTECOLLECTRECORD: string = "/api/rmrb-interact/interact/zh/c/collect/executeCollcetRecord";
+  /**
    * 关注号主
    * 关注号主
    */
    */
   static readonly INTERACT_ACCENTION_OPERATION: string = "/api/rmrb-interact/interact/zh/c/attention/operation";
   static readonly INTERACT_ACCENTION_OPERATION: string = "/api/rmrb-interact/interact/zh/c/attention/operation";

@@ -2,11 +2,11 @@
  * 批查接口查询互动相关数据，返回数据bean
  * 批查接口查询互动相关数据，返回数据bean
  */
  */
 export interface InteractDataDTO {
 export interface InteractDataDTO {
-  collectNum: number | string;
-  commentNum: number | string;
+  collectNum: number | String;
+  commentNum: number | String;
   contentId: string;
   contentId: string;
   contentType: number;
   contentType: number;
-  likeNum: number | string;
+  likeNum: number | String;
   readNum: number;
   readNum: number;
   shareNum: number;
   shareNum: number;
 }
 }

@@ -38,7 +38,7 @@ export struct ImageAndTextPageComponent {
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
   @State publishTime: string = ''
   @State publishTime: string = ''
-  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+  @State publishCommentModel: publishCommentModel = {} as publishCommentModel
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -142,10 +142,7 @@ export struct ImageAndTextPageComponent {
 
 
         //底部交互区
         //底部交互区
         if (this.contentDetailData?.length) {
         if (this.contentDetailData?.length) {
-          OperRowListView({
-            contentDetailData: this.contentDetailData[0],
-            publishCommentModel: this.publishCommentModel
-          })
+          OperRowListView({ contentDetailData: this.contentDetailData[0] })
         }
         }
       }
       }
 
 

@@ -40,11 +40,11 @@ const TAG = 'OperRowListView';
 export struct OperRowListView {
 export struct OperRowListView {
   @Prop contentDetailData: ContentDetailDTO // 稿件详情
   @Prop contentDetailData: ContentDetailDTO // 稿件详情
   @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share'] // 组件展示条件
   @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share'] // 组件展示条件
-  @Prop publishCommentModel: publishCommentModel
   // @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   // @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
   @State likeBean: Record<string, string> = {}
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
@@ -62,13 +62,13 @@ export struct OperRowListView {
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     // 评论需要数据
     // 评论需要数据
-  /*  this.publishCommentModel.targetId = this.contentDetailData.newsId + ''
+    this.publishCommentModel.targetId = this.contentDetailData.newsId + ''
     this.publishCommentModel.targetRelId = this.contentDetailData.reLInfo?.relId + ''
     this.publishCommentModel.targetRelId = this.contentDetailData.reLInfo?.relId + ''
     this.publishCommentModel.targetTitle = this.contentDetailData.newsTitle + ''
     this.publishCommentModel.targetTitle = this.contentDetailData.newsTitle + ''
     this.publishCommentModel.targetRelType = this.contentDetailData.reLInfo?.relType + ''
     this.publishCommentModel.targetRelType = this.contentDetailData.reLInfo?.relType + ''
     this.publishCommentModel.targetRelObjectId = this.contentDetailData.reLInfo?.relObjectId + ''
     this.publishCommentModel.targetRelObjectId = this.contentDetailData.reLInfo?.relObjectId + ''
     this.publishCommentModel.keyArticle = this.contentDetailData.keyArticle + ''
     this.publishCommentModel.keyArticle = this.contentDetailData.keyArticle + ''
-    this.publishCommentModel.targetType = this.contentDetailData.newsType + ''*/
+    this.publishCommentModel.targetType = this.contentDetailData.newsType + ''
   }
   }
 
 
   build() {
   build() {
@@ -232,6 +232,7 @@ export struct OperRowListView {
 
 
     }
     }
     PageRepository.postExecuteCollectRecord(params).then(res => {
     PageRepository.postExecuteCollectRecord(params).then(res => {
+      // console.log(TAG, '收藏、取消收藏', 'toggleLikeStatus==',)
       if (this.newsStatusOfUser) {
       if (this.newsStatusOfUser) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.queryContentInteractCount()
         this.queryContentInteractCount()
@@ -257,9 +258,7 @@ export struct OperRowListView {
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
         this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
         this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
         // 评论组件需要数据
         // 评论组件需要数据
-        if (Number.parseInt(this.interactData.commentNum) > Number.parseInt(this.publishCommentModel.totalCommentNumer)) {
-          this.publishCommentModel.totalCommentNumer = this.interactData.commentNum + '' || '0'
-        }
+        this.publishCommentModel.totalCommentNumer = this.interactData.commentNum + '' || '0'
       }
       }
       // console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
       // console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
       console.log(TAG, 'this.interactData', JSON.stringify(this.interactData))
       console.log(TAG, 'this.interactData', JSON.stringify(this.interactData))

@@ -282,7 +282,7 @@ export class PageRepository {
    * @returns
    * @returns
    */
    */
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
-    let url = HttpUrlUtils.getExecuteCollcetUrl()
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
     return WDHttp.post(url, params)
     return WDHttp.post(url, params)
   }
   }
 
 

@@ -288,7 +288,7 @@ export class ContentDetailRequest {
    * @returns
    * @returns
    */
    */
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
-    let url = HttpUrlUtils.getExecuteCollcetUrl()
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
     return WDHttp.post(url, params)
     return WDHttp.post(url, params)
   }
   }