Merge remote-tracking branch 'origin/main'

@@ -12,7 +12,7 @@ export struct MultiPictureDetailItemComponent {
 
 
 
 
   async aboutToAppear() {
   async aboutToAppear() {
-    // Logger.info(TAG, 'pictures preview')
+    // Logger.info(TAG, 'pictures preview'
   }
   }
 
 
   build() {
   build() {

@@ -25,7 +25,6 @@ export struct ZhSingleRow02 {
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
 
 
   resetMoreTips() {
   resetMoreTips() {
-    console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
     if (this.moreWidth < this.initMoreWidth * 2) {
     if (this.moreWidth < this.initMoreWidth * 2) {
       this.moreTips = '查看更多';
       this.moreTips = '查看更多';
     }
     }
@@ -56,7 +55,6 @@ export struct ZhSingleRow02 {
     if (this.moreWidth > this.initMoreWidth) {
     if (this.moreWidth > this.initMoreWidth) {
       this.moreWidth = 16
       this.moreWidth = 16
     }
     }
-    this.resetMoreTips()
   }
   }
 
 
   toMore() {
   toMore() {
@@ -90,7 +88,7 @@ export struct ZhSingleRow02 {
                 .margin({ right: 8 })
                 .margin({ right: 8 })
             })
             })
           }
           }
-          if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+          if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
             Row() {
             Row() {
               Ellipse()
               Ellipse()
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))

@@ -165,7 +165,7 @@ export struct ZhSingleRow03 {
               this.ItemCard(item)
               this.ItemCard(item)
             })
             })
           }
           }
-          if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+          if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
             Row() {
             Row() {
               Ellipse()
               Ellipse()
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))

@@ -141,7 +141,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
             })
             })
           }
           }
 
 
-          if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+          if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
             Row() {
             Row() {
               Ellipse()
               Ellipse()
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))

@@ -92,9 +92,8 @@ struct MultiPictureDetailPage {
    * TODO:颜色待根据业务接口修改
    * TODO:颜色待根据业务接口修改
    */
    */
   openFullScreen() {
   openFullScreen() {
+    WindowModel.shared.setWindowLayoutFullScreen(true)
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
-    // WindowModel.shared.setWindowLayoutFullScreen(true)
-    // WindowModel.shared.setWindowSystemBarEnable([])
   }
   }
 
 
   /**
   /**
@@ -102,9 +101,8 @@ struct MultiPictureDetailPage {
    * TODO:颜色待根据业务接口修改
    * TODO:颜色待根据业务接口修改
    */
    */
   closeFullScreen() {
   closeFullScreen() {
+    WindowModel.shared.setWindowLayoutFullScreen(false)
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
-    // WindowModel.shared.setWindowLayoutFullScreen(false)
-    // WindowModel.shared.setWindowSystemBarEnable(['status', 'navigation'])
   }
   }
 
 
 }
 }

@@ -353,7 +353,12 @@ export struct MultiPictureDetailPageComponent {
                         .lineHeight(19)
                         .lineHeight(19)
                     }
                     }
                     .fontColor(Color.White)
                     .fontColor(Color.White)
-                    .margin(4)
+                    .margin({
+                      top: 4,
+                      left: 18,
+                      bottom: 4,
+                      right: 4
+                    })
                   }
                   }
                   if (this.contentDetailData.newsTitle) {
                   if (this.contentDetailData.newsTitle) {
                     Text(`${this.contentDetailData.newsTitle}`)
                     Text(`${this.contentDetailData.newsTitle}`)
@@ -364,9 +369,9 @@ export struct MultiPictureDetailPageComponent {
                       .lineHeight(24)
                       .lineHeight(24)
                       .margin({
                       .margin({
                         top: 4,
                         top: 4,
-                        left: 0,
+                        left: 18,
                         bottom: 4,
                         bottom: 4,
-                        right: 0
+                        right: 18
                       })
                       })
                   }
                   }
                   if (this.contentDetailData.photoList?.[this.swiperIndex].picDesc) {
                   if (this.contentDetailData.photoList?.[this.swiperIndex].picDesc) {