Merge remote-tracking branch 'origin/main'

@@ -44,7 +44,7 @@ export struct CompParser {
 
 
   @Builder
   @Builder
   componentBuilder(compDTO: CompDTO, compIndex: number) {
   componentBuilder(compDTO: CompDTO, compIndex: number) {
-    // if (compDTO.operDataList[0]?.objectType !== '3' && compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
+    if (compDTO.operDataList[0]?.objectType !== '3' && compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
     if (compDTO.compStyle === CompStyle.Label_03) {
     if (compDTO.compStyle === CompStyle.Label_03) {
       LabelComponent({ compDTO: compDTO })
       LabelComponent({ compDTO: compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -119,6 +119,6 @@ export struct CompParser {
     }
     }
   }
   }
 
 
-  // }
+  }
 }
 }
 
 

@@ -19,7 +19,7 @@ export struct FollowChildComponent{
           Row() {
           Row() {
             Row(){
             Row(){
               Stack({alignContent: Alignment.Bottom}){
               Stack({alignContent: Alignment.Bottom}){
-                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
+                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
                   .objectFit(ImageFit.Auto)
                   .objectFit(ImageFit.Auto)
                   .width('92lpx')
                   .width('92lpx')
                   .height('92lpx')
                   .height('92lpx')
@@ -128,7 +128,7 @@ export struct FollowChildComponent{
           Row() {
           Row() {
             Row(){
             Row(){
               Stack({alignContent: Alignment.Bottom}){
               Stack({alignContent: Alignment.Bottom}){
-                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
+                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
                   .objectFit(ImageFit.Auto)
                   .objectFit(ImageFit.Auto)
                   .width('92lpx')
                   .width('92lpx')
                   .height('92lpx')
                   .height('92lpx')

@@ -70,7 +70,7 @@ export struct FollowListDetailUI {
     Column() {
     Column() {
       if (this.count === 0) {
       if (this.count === 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {
-          EmptyComponent({ emptyType: 14 })
+          EmptyComponent({ emptyType: 14,emptyHeight:"100%" })
             .layoutWeight(1)
             .layoutWeight(1)
             .width('100%')
             .width('100%')
         }
         }
@@ -179,6 +179,7 @@ export struct FollowListDetailUI {
           if (!this.data || value.list.length == 0) {
           if (!this.data || value.list.length == 0) {
             this.hasMore = false
             this.hasMore = false
             this.isLoading = false
             this.isLoading = false
+            this.isGetRequest = true
           } else {
           } else {
             this.getFollowListStatus(value)
             this.getFollowListStatus(value)
           }
           }
@@ -226,6 +227,8 @@ export struct FollowListDetailUI {
           })
           })
         })
         })
         this.getFollowStatus(data_temp, result.totalCount)
         this.getFollowStatus(data_temp, result.totalCount)
+      }else{
+        this.isGetRequest = true
       }
       }
     }).catch((err: Error) => {
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       console.log(TAG, JSON.stringify(err))

@@ -449,7 +449,7 @@ struct ChannelDialog {
       }.width('100%').height('100%')
       }.width('100%').height('100%')
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
     }
     }
-    .padding({ top: 40, right: 15, bottom: 20, left: 15 })
+    .padding({ top: 40, right: 15, bottom: 40, left: 15 })
     .backgroundColor('#ffffff')
     .backgroundColor('#ffffff')
   }
   }
 }
 }
@@ -526,10 +526,9 @@ struct ChannelSubscriptionLayout {
         .width(18)
         .width(18)
     }
     }
     .width(36)
     .width(36)
-    .height(36)
+    .height(40)
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
-    .padding({ bottom: 6 })
-    .backgroundColor('#ffffff')
+    .backgroundColor(Color.White)
     .onClick(() => {
     .onClick(() => {
       if (this.dialogController != null) {
       if (this.dialogController != null) {
         this.dialogController.open()
         this.dialogController.open()

@@ -197,7 +197,7 @@ export struct EmptyComponent {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
       contentString = '网络出小差了，请检查网络后重试'
       contentString = '网络出小差了，请检查网络后重试'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
-      contentString = '获取内容失败请重试'
+      contentString = '获取内容失败，请重试'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCreation) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCreation) {
       contentString = '暂无作品'
       contentString = '暂无作品'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoBooking) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoBooking) {

@@ -52,7 +52,7 @@ export class PageHelper {
     PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
     PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
       if (pageInfo == null) {
       if (pageInfo == null) {
         pageModel.viewType = ViewType.EMPTY;
         pageModel.viewType = ViewType.EMPTY;
-        pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoListContent;
+        pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
         return;
         return;
       }
       }
       pageModel.pageInfo = pageInfo;
       pageModel.pageInfo = pageInfo;
@@ -94,7 +94,7 @@ export class PageHelper {
       // 没数据，展示空页面
       // 没数据，展示空页面
       Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
       Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
       pageModel.viewType = ViewType.EMPTY;
       pageModel.viewType = ViewType.EMPTY;
-      pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoListContent;
+      pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
 
 
     }
     }
   }
   }