Merge remote-tracking branch 'origin/main'

@@ -30,7 +30,7 @@ export struct CompNormalTitle {
           .fontWeight(600)
           .fontWeight(600)
       }
       }
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
-      .margin({ top: 16, bottom: 8 })
+      .margin({ top: 16, bottom: 10 })
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)

@@ -25,8 +25,8 @@ export struct ZhGridLayout02NewsContent {
   build() {
   build() {
 
 
     GridRow({
     GridRow({
-      gutter: { x: 12, y: 13 },
-      columns: { sm: listSize, md: 2 },
+      gutter: { x: 9, y: 0 },
+      columns: { sm: listSize, md: listSize },
       breakpoints: { value: ['320vp', '520vp', '840vp'] }
       breakpoints: { value: ['320vp', '520vp', '840vp'] }
     }) {
     }) {
       ForEach(this.operDataList, (item: ContentDTO, index: number) => {
       ForEach(this.operDataList, (item: ContentDTO, index: number) => {
@@ -46,13 +46,16 @@ export struct ZhGridLayout02NewsContent {
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
           .width('100%')
           .width('100%')
           .height(95)
           .height(95)
+          .borderWidth(0.5)
+          .borderColor($r('app.color.color_0D000000'))
           .borderRadius(4)
           .borderRadius(4)
         if (this.compDTO.operDataList[index].liveRoomDataBean != undefined
         if (this.compDTO.operDataList[index].liveRoomDataBean != undefined
           && this.compDTO.operDataList[index].liveRoomDataBean?.pv != undefined) {
           && this.compDTO.operDataList[index].liveRoomDataBean?.pv != undefined) {
           Text(this.computeShowNum(this.compDTO.operDataList[index].liveRoomDataBean))
           Text(this.computeShowNum(this.compDTO.operDataList[index].liveRoomDataBean))
-            .fontSize('11vp')
+            .fontSize(12)
             .fontWeight(400)
             .fontWeight(400)
             .fontColor(Color.White)
             .fontColor(Color.White)
+            .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 })
             .margin({
             .margin({
               right: '5vp',
               right: '5vp',
               bottom: '5vp'
               bottom: '5vp'
@@ -61,9 +64,12 @@ export struct ZhGridLayout02NewsContent {
       }
       }
 
 
       Text(item.newsTitle)
       Text(item.newsTitle)
-        .margin({ top: '6', bottom: '10' })
-        .fontSize(13)
+        .margin({ top: 8, bottom: 14 })
+        .fontSize(15)
         .maxLines(2)
         .maxLines(2)
+        .lineHeight(21)
+        .width('100%')
+        .textAlign(TextAlign.Start)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
     }
     }
     .width('100%')
     .width('100%')

@@ -84,6 +84,10 @@ export function touchUpPullRefresh(pageModel: PageModel, pageAdvModel: PageAdMod
  * @param pageAdvModel 广告数据
  * @param pageAdvModel 广告数据
  */
  */
 export function autoRefresh(pageModel: PageModel, pageAdvModel: PageAdModel) {
 export function autoRefresh(pageModel: PageModel, pageAdvModel: PageAdModel) {
+  if (pageModel.isRefreshing === true) {
+    // 拦截多次刷新
+    return
+  }
   pageModel.isVisiblePullDown = true;
   pageModel.isVisiblePullDown = true;
   pageModel.offsetY = vp2px(pageModel.pullDownRefreshHeight);
   pageModel.offsetY = vp2px(pageModel.pullDownRefreshHeight);
   pullRefreshState(pageModel, RefreshState.Refreshing);
   pullRefreshState(pageModel, RefreshState.Refreshing);

@@ -26,7 +26,7 @@ export function touchUpLoadMore(model: PageModel) {
   }, () => {
   }, () => {
     self.offsetY = 0;
     self.offsetY = 0;
   })
   })
-  if ((self.isCanLoadMore === true) && (self.hasMore === true)) {
+  if ((self.isCanLoadMore === true) && (self.hasMore === true) && (self.isLoading === false)) {
     self.isLoading = true;
     self.isLoading = true;
     setTimeout(() => {
     setTimeout(() => {
       closeLoadMore(model);
       closeLoadMore(model);

@@ -169,6 +169,10 @@
     {
     {
       "name": "color_ED2800_99",
       "name": "color_ED2800_99",
       "value": "#99ED2800"
       "value": "#99ED2800"
+    },
+    {
+      "name": "color_white_30",
+      "value": "#4D000000"
     }
     }
   ]
   ]
 }
 }