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

@@ -5,7 +5,7 @@ export class ToastUtils {
   private static shortToastTime: number = 1000
   private static shortToastTime: number = 1000
 
 
   static showToast(message: ResourceStr, duration: number) {
   static showToast(message: ResourceStr, duration: number) {
-    prompt.showToast({ message: message, duration: duration })
+    prompt.showToast({ message: message, duration: duration, alignment: Alignment.Center })
   }
   }
 
 
   static shortToast(message: ResourceStr) {
   static shortToast(message: ResourceStr) {

@@ -27,6 +27,7 @@ export struct Card19Component {
           .textOverflowStyle(3)
           .textOverflowStyle(3)
           .margin({ bottom: 8 })
           .margin({ bottom: 8 })
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
+          .lineHeight(22)
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
             this.clicked = true;
             this.clicked = true;
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)

@@ -31,7 +31,7 @@ export struct Card20Component {
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .textOverflowStyle(3)
           .textOverflowStyle(3)
           .margin({ bottom: 8 })
           .margin({ bottom: 8 })
-          .lineHeight(20)
+          .lineHeight(22)
       }
       }
       if (this.contentDTO.fullColumnImgUrls[0]) {
       if (this.contentDTO.fullColumnImgUrls[0]) {
         createImg({ contentDTO: this.contentDTO })
         createImg({ contentDTO: this.contentDTO })

@@ -55,7 +55,7 @@ export struct Card6Component {
                   this.contentDTO.objectType == '5' ? 30 : 0)
                   this.contentDTO.objectType == '5' ? 30 : 0)
           }.alignContent(Alignment.TopStart)
           }.alignContent(Alignment.TopStart)
 
 
-        }.height("80%")
+        }.height("75%")
         .justifyContent(FlexAlign.Start)
         .justifyContent(FlexAlign.Start)
 
 
 
 
@@ -64,7 +64,7 @@ export struct Card6Component {
       }
       }
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
-      .width('58%')
+      .width('64%')
 
 
       Stack() {
       Stack() {
         Image(this.loadImg ? this.contentDTO.coverUrl : '')
         Image(this.loadImg ? this.contentDTO.coverUrl : '')
@@ -87,7 +87,7 @@ export struct Card6Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
-    .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 127 : 217)
+    .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 107 : 217)
     .justifyContent(FlexAlign.SpaceBetween)
     .justifyContent(FlexAlign.SpaceBetween)
   }
   }
 }
 }

@@ -27,6 +27,5 @@ export default struct PageNoMoreLayout {
     .width(RefreshConstants.FULL_WIDTH)
     .width(RefreshConstants.FULL_WIDTH)
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .height(RefreshConstants.CUSTOM_LAYOUT_HEIGHT)
     .height(RefreshConstants.CUSTOM_LAYOUT_HEIGHT)
-    .margin({bottom:RefreshConstants.NoMoreLayoutConstant_MARGIN_BOTTOM})
   }
   }
 }
 }

@@ -40,7 +40,7 @@ export struct SearchResultComponent {
 
 
     SearcherAboutDataModel.getSearchSuggestData(request, getContext(this)).then((value) => {
     SearcherAboutDataModel.getSearchSuggestData(request, getContext(this)).then((value) => {
       value.forEach((item) => {
       value.forEach((item) => {
-        if(item.appStyle != "13"){
+        if(item.objectType != "13"){
           this.data.push(item)
           this.data.push(item)
         }
         }
       })
       })

@@ -185,7 +185,7 @@ export struct SearchResultContentComponent {
         }
         }
 
 
         let contentDTO = this.dataTransform(value, photos);
         let contentDTO = this.dataTransform(value, photos);
-        if (contentDTO.appStyle != "13") {
+        if(value.data.type != "13"){
           this.data.push(contentDTO)
           this.data.push(contentDTO)
         }
         }
 
 

@@ -70,7 +70,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
                 .textAlign(TextAlign.Start)
                 .textAlign(TextAlign.Start)
                 .margin({ top: 8 })
                 .margin({ top: 8 })
                 .width(150)
                 .width(150)
-                .lineHeight(17)
+                .lineHeight(19)
             }
             }
           }
           }
           .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
           .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })

@@ -49,7 +49,6 @@ export class RefreshConstants {
   static readonly NoMoreLayoutConstant_NORMAL_PADDING: number = 8;
   static readonly NoMoreLayoutConstant_NORMAL_PADDING: number = 8;
   static readonly NoMoreLayoutConstant_TITLE_FONT: string = '16vp';
   static readonly NoMoreLayoutConstant_TITLE_FONT: string = '16vp';
   static readonly NoMoreLayoutConstant_TITLE_COLOR: string = '#666666';
   static readonly NoMoreLayoutConstant_TITLE_COLOR: string = '#666666';
-  static readonly NoMoreLayoutConstant_MARGIN_BOTTOM: number = 40;
   /**
   /**
    * The RefreshLayout constants.
    * The RefreshLayout constants.
    */
    */