Merge remote-tracking branch 'origin/main'

@@ -299,7 +299,7 @@ export struct DynamicDetailComponent {
                 }.padding({
                 }.padding({
                   left: $r('app.float.vp_16')
                   left: $r('app.float.vp_16')
                 , right: $r('app.float.vp_16')
                 , right: $r('app.float.vp_16')
-                })
+                }).width('100%')
                 //标题
                 //标题
                 Text(this.titleText())
                 Text(this.titleText())
                   .fontColor($r('app.color.color_222222'))
                   .fontColor($r('app.color.color_222222'))
@@ -1221,6 +1221,11 @@ struct createImg {
         }
         }
       })
       })
     }
     }
+    .margin({
+      left: $r('app.float.margin_16'),
+      right: $r('app.float.margin_16'),
+      top: $r('app.float.margin_8')
+    })
   }
   }
 }
 }
 
 

@@ -25,6 +25,7 @@ export struct ENewspaperPageComponent {
   @State picHeight: number = 0
   @State picHeight: number = 0
   @Provide itemPicWidth: number = 0
   @Provide itemPicWidth: number = 0
   @Provide itemPicHeight: number = 0
   @Provide itemPicHeight: number = 0
+  @State isShowSkeleton:boolean = false
 
 
   @Provide topMargin: number = DisplayUtils.getDeviceHeight()
   @Provide topMargin: number = DisplayUtils.getDeviceHeight()
 
 
@@ -83,6 +84,7 @@ export struct ENewspaperPageComponent {
     builder: ENewspaperCalendarDialog({
     builder: ENewspaperCalendarDialog({
       selectDate: this.selectDate,
       selectDate: this.selectDate,
       onDateChange: (date: RMCalendarBean) => {
       onDateChange: (date: RMCalendarBean) => {
+        this.isShowSkeleton = true
         console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date))
         console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date))
         if (date.fullYear && date.month && date.date) {
         if (date.fullYear && date.month && date.date) {
           let month: number = date.month + 1
           let month: number = date.month + 1
@@ -254,7 +256,7 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_top')
         .id('e_newspaper_top')
 
 
-        if (!this.newspaperListBean || !this.newspaperListBean.list || this.newspaperListBean.list.length == 0) {
+        if (!this.newspaperListBean || !this.newspaperListBean.list || this.newspaperListBean.list.length == 0 || this.isShowSkeleton) {
           newsSkeleton()
           newsSkeleton()
             .alignRules({
             .alignRules({
               top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
               top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
@@ -476,6 +478,7 @@ export struct ENewspaperPageComponent {
         let listBean =
         let listBean =
           await NewspaperViewModel.getNewspaperList(this.calendarDate, this.itemPicWidth + 'x' + this.itemPicHeight)
           await NewspaperViewModel.getNewspaperList(this.calendarDate, this.itemPicWidth + 'x' + this.itemPicHeight)
         this.newspaperListBean = listBean;
         this.newspaperListBean = listBean;
+        this.isShowSkeleton = false
       } else {
       } else {
         this.showToastTip('网络出小差了，请检查网络后重试')
         this.showToastTip('网络出小差了，请检查网络后重试')
       }
       }

@@ -109,7 +109,7 @@ struct PeopleShipHomePage {
                       topHeight: this.topHeight
                       topHeight: this.topHeight
                     })
                     })
                       .width("100%")
                       .width("100%")
-                      .height(this.topHeight)
+                      // .height(this.topHeight)
                     // 列表
                     // 列表
                     PeopleShipHomeListComponent({
                     PeopleShipHomeListComponent({
                       publishCount: this.publishCount,
                       publishCount: this.publishCount,