Merge remote-tracking branch 'origin/main'

@@ -220,7 +220,6 @@ export struct MultiPictureDetailItemComponent {
     })
     })
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')
-    .backgroundColor(Color.Black)
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .gesture(
     .gesture(
       GestureGroup(
       GestureGroup(

@@ -55,7 +55,7 @@ export struct Card14Component {
         )
         )
       }
       }
       // 左标题，右图
       // 左标题，右图
-      Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {
+      Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Start }) {
 
 
         Text() {
         Text() {
             if (this.titleMarked) {
             if (this.titleMarked) {
@@ -77,16 +77,14 @@ export struct Card14Component {
           .lineHeight(25)
           .lineHeight(25)
           .fontFamily('PingFang SC-Regular')
           .fontFamily('PingFang SC-Regular')
           .textAlign(TextAlign.Start)
           .textAlign(TextAlign.Start)
-          // .flexBasis('auto')
           .margin({right: 12})
           .margin({right: 12})
-          .flexBasis(214)
+          .width('64%')
 
 
         Image(this.loadImg ? this.contentDTO.coverUrl : '')
         Image(this.loadImg ? this.contentDTO.coverUrl : '')
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
-          .flexBasis(117)
+          .aspectRatio(3 / 2)
           .height(78)
           .height(78)
           .borderRadius($r('app.float.image_border_radius'))
           .borderRadius($r('app.float.image_border_radius'))
-        // .flexBasis(160)
         .backgroundImageSize(ImageSize.Auto)
         .backgroundImageSize(ImageSize.Auto)
 
 
       }
       }

@@ -161,7 +161,7 @@ export struct ZhSingleColumn09 {
       .height(90)
       .height(90)
       .columnsTemplate('1fr 1fr 1fr 1fr')
       .columnsTemplate('1fr 1fr 1fr 1fr')
       .rowsTemplate('1fr 1fr')
       .rowsTemplate('1fr 1fr')
-      .margin({bottom: 10})
+      .margin({bottom: 5})
 
 
       Row() {
       Row() {
         Row() {
         Row() {
@@ -188,7 +188,7 @@ export struct ZhSingleColumn09 {
             this.selfClosed = true;
             this.selfClosed = true;
           })
           })
       }
       }
-      .height(40)
+      .height(20)
       .width('100%')
       .width('100%')
       .borderRadius(3)
       .borderRadius(3)
       .justifyContent(FlexAlign.SpaceBetween)
       .justifyContent(FlexAlign.SpaceBetween)

@@ -5,7 +5,7 @@ export struct PeopleShipHomeAttentionComponent {
   @Consume isAttention: string
   @Consume isAttention: string
   @Consume isLoadingAttention: boolean
   @Consume isLoadingAttention: boolean
   build() {
   build() {
-    Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+    Flex({ alignItems: ItemAlign.Start, justifyContent: FlexAlign.Start }) {
       Button({type: ButtonType.Normal, stateEffect: false } ) {
       Button({type: ButtonType.Normal, stateEffect: false } ) {
         Stack() {
         Stack() {
           Row()
           Row()
@@ -117,7 +117,6 @@ export struct PeopleShipHomeAttentionComponent {
         ToastUtils.showToast('分享为公共方法，待开发', 1000);
         ToastUtils.showToast('分享为公共方法，待开发', 1000);
       })
       })
       .visibility(Visibility.Hidden)
       .visibility(Visibility.Hidden)
-
     }
     }
 
 
   }
   }

@@ -253,7 +253,7 @@ export struct PeopleShipHomePageTopComponent {
 
 
       //  分享-关注
       //  分享-关注
       PeopleShipHomeAttentionComponent()
       PeopleShipHomeAttentionComponent()
-        .width('100%')
+        .width(`calc(100% - ${32 + 'vp'})`)
         .margin({
         .margin({
           top: '10vp',
           top: '10vp',
           bottom: '16vp'
           bottom: '16vp'

@@ -122,6 +122,7 @@ struct LoginPage {
     this.disableScreenCapture()
     this.disableScreenCapture()
   }
   }
 
 
+
   onPageHide(): void {
   onPageHide(): void {
     this.pageHideTime = DateTimeUtils.getTimeStamp()
     this.pageHideTime = DateTimeUtils.getTimeStamp()
     let duration = 0
     let duration = 0
@@ -132,8 +133,6 @@ struct LoginPage {
     }else{
     }else{
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration)
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration)
     }
     }
-    this.isPrivacyMode = false
-    this.disableScreenCapture()
   }
   }
 
 
   build() {
   build() {
@@ -262,6 +261,10 @@ struct LoginPage {
             right: { anchor: "__container__", align: HorizontalAlign.End }
             right: { anchor: "__container__", align: HorizontalAlign.End }
           })
           })
           .onClick(() => {
           .onClick(() => {
+            ///关闭禁止截图
+            this.isPrivacyMode = false
+            this.disableScreenCapture()
+
             router.back()
             router.back()
           })
           })
           .id('id_close')
           .id('id_close')