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

@@ -249,8 +249,7 @@ export struct MorningEveningPaperComponent {
     // 图片转换为PixelMap对象
     // 图片转换为PixelMap对象
     // const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
     // const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
     // console.log(TAG, "compInfoBean compStyle = " + imageUrl)
     // console.log(TAG, "compInfoBean compStyle = " + imageUrl)
-    
-    if (this.pageInfoBean.backgroundColor.length > 0){
+    if (this.pageInfoBean.backgroundColor.length > 0 && this.pageInfoBean.topicInfo?.frontLinkObject != undefined){
       let colorDatas = ColorUtils.hexColorValueToRGB(this.pageInfoBean.backgroundColor)
       let colorDatas = ColorUtils.hexColorValueToRGB(this.pageInfoBean.backgroundColor)
       let color = ColorUtils.getMorningEveningPaperRgb({red:colorDatas[0],green:colorDatas[1],blue:colorDatas[2],alpha:1})
       let color = ColorUtils.getMorningEveningPaperRgb({red:colorDatas[0],green:colorDatas[1],blue:colorDatas[2],alpha:1})
       this.mixedBgColor = "#ff" + color.red.toString(16).padStart(2,'0') + color.green.toString(16).padStart(2,'0') + color.blue.toString(16).padStart(2,'0');
       this.mixedBgColor = "#ff" + color.red.toString(16).padStart(2,'0') + color.green.toString(16).padStart(2,'0') + color.blue.toString(16).padStart(2,'0');
@@ -258,6 +257,7 @@ export struct MorningEveningPaperComponent {
     }
     }
 
 
     if (imageUrl.length > 0 && this.pageInfoBean.topicInfo.frontFlag === 1) {
     if (imageUrl.length > 0 && this.pageInfoBean.topicInfo.frontFlag === 1) {
+
       const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
       const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
       this.pickColor(imageSource)
       this.pickColor(imageSource)
     } else {
     } else {

@@ -146,6 +146,7 @@ export struct CommentTabComponent {
       this.publishCommentModel.rootCommentId = '-1';
       this.publishCommentModel.rootCommentId = '-1';
       this.publishCommentModel.parentId = '-1';
       this.publishCommentModel.parentId = '-1';
       this.publishCommentModel.placeHolderText = "说两句..."
       this.publishCommentModel.placeHolderText = "说两句..."
+      this.publishCommentModel.visitorComment = String(this.contentDetail?.visitorComment || '')
       if (this.contentDetail.bestNoticer === 1) {
       if (this.contentDetail.bestNoticer === 1) {
         this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
         this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
       }
       }

@@ -626,7 +626,7 @@ export struct PaperSingleColumn999CardView {
   }
   }
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
-    // this.loadImg = await onlyWifiLoadImg();
+    this.loadImg = await onlyWifiLoadImg();
     this.onChangeCommentList()
     this.onChangeCommentList()
     this.isRead = hasClicked(this.item.objectId, '')
     this.isRead = hasClicked(this.item.objectId, '')
   }
   }