Merge remote-tracking branch 'origin/main'

@@ -112,14 +112,12 @@ struct OneKeyLoginPage {
 
 
       this.loginButton()
       this.loginButton()
 
 
-      Button("账号密码登录")
-        .type(ButtonType.Normal)
-        .align(Alignment.Center)
-        .foregroundColor("#666666")
-        .backgroundColor(Color.White)
+      Text("账号密码登录")
+        .fontColor("#666666")
         .height(26)
         .height(26)
+        .width(100)
         .margin({top: 20})
         .margin({top: 20})
-        .onClick((event) => {
+        .onClick(() => {
           router.replaceUrl({url: WDRouterPage.loginPage.url()})
           router.replaceUrl({url: WDRouterPage.loginPage.url()})
         })
         })
     }
     }

@@ -36,6 +36,7 @@ export struct MultiPictureDetailPageComponent {
   private contentId: string = ''
   private contentId: string = ''
   private relType: string = ''
   private relType: string = ''
   private displayTool = display.getDefaultDisplaySync()
   private displayTool = display.getDefaultDisplaySync()
+  @State nShowDownloadTitleHeight: number = 0
   @State titleHeight: number = 0
   @State titleHeight: number = 0
   @State index: number = 0
   @State index: number = 0
   @State currentIndex: number = 0
   @State currentIndex: number = 0
@@ -50,6 +51,7 @@ export struct MultiPictureDetailPageComponent {
   @State swiperIndex: number = 0;
   @State swiperIndex: number = 0;
   @Provide followStatus: string | undefined = undefined // 关注状态
   @Provide followStatus: string | undefined = undefined // 关注状态
   @Provide showCommentList: boolean = false
   @Provide showCommentList: boolean = false
+  private subScroller: Scroller = new Scroller()
   private scroller: Scroller = new Scroller()
   private scroller: Scroller = new Scroller()
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State isOffLine: boolean = false // 存储视频下线状态用来展示缺省图
   @State isOffLine: boolean = false // 存储视频下线状态用来展示缺省图
@@ -63,6 +65,7 @@ export struct MultiPictureDetailPageComponent {
   followUserId: string = ''
   followUserId: string = ''
   followUserName: string = ''
   followUserName: string = ''
   @State isEnableSwipe: boolean = true;
   @State isEnableSwipe: boolean = true;
+  @State isScrollerTop: boolean = false;
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -74,7 +77,8 @@ export struct MultiPictureDetailPageComponent {
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     //获取宽高尺寸
     //获取宽高尺寸
-    this.titleHeight = this.displayTool.width * 178 / 375
+    this.titleHeight = this.displayTool.width * 227 / 375
+    this.nShowDownloadTitleHeight = this.displayTool.width * 311 / 375
     //注册字体
     //注册字体
     // font.registerFont({
     // font.registerFont({
     //   familyName: 'BebasNeueBold',
     //   familyName: 'BebasNeueBold',
@@ -353,34 +357,34 @@ export struct MultiPictureDetailPageComponent {
   @Builder
   @Builder
   NShowDownload() {
   NShowDownload() {
     Column() {
     Column() {
-      Row() {
-        Scroll(this.scroller) {
-          Row() {
-            Flex({
-              direction: FlexDirection.Column,
-              justifyContent: FlexAlign.Start
-            }) {
-              if (this.contentDetailData?.photoList?.length) {
-                Text() {
-                  Span(`${this.swiperIndex + 1}`)
-                    .fontSize(24)
-                    .fontFamily('PingFang SC-Medium')
-                    .fontWeight(500)
-                    .lineHeight(28)
-                  Span(`/${this.contentDetailData?.photoList?.length}`)
-                    .fontSize(14)
-                    .fontFamily('PingFang SC-Medium')
-                    .fontWeight(500)
-                    .lineHeight(19)
-                }
-                .fontColor(Color.White)
-                .margin({
-                  top: 4,
-                  left: 18,
-                  bottom: 4,
-                  right: 4
-                })
-              }
+      Scroll(this.scroller) {
+        Flex({
+          direction: FlexDirection.Column,
+          justifyContent: FlexAlign.Start
+        }) {
+          if (this.contentDetailData?.photoList?.length) {
+            Text() {
+              Span(`${this.swiperIndex + 1}`)
+                .fontSize(24)
+                .fontFamily('PingFang SC-Medium')
+                .fontWeight(500)
+                .lineHeight(28)
+              Span(`/${this.contentDetailData?.photoList?.length}`)
+                .fontSize(14)
+                .fontFamily('PingFang SC-Medium')
+                .fontWeight(500)
+                .lineHeight(19)
+            }
+            .fontColor(Color.White)
+            .margin({
+              top: 4,
+              left: 18,
+              bottom: 4,
+              right: 4
+            })
+          }
+          List() {
+            ListItem(){
               if (this.contentDetailData.newsTitle) {
               if (this.contentDetailData.newsTitle) {
                 Text(`${this.contentDetailData.newsTitle}`)
                 Text(`${this.contentDetailData.newsTitle}`)
                   .fontColor(Color.White)
                   .fontColor(Color.White)
@@ -396,6 +400,8 @@ export struct MultiPictureDetailPageComponent {
                   })
                   })
                   .width('92%')
                   .width('92%')
               }
               }
+            }
+            ListItem(){
               if (this.contentDetailData.photoList?.[this.swiperIndex].picDesc) {
               if (this.contentDetailData.photoList?.[this.swiperIndex].picDesc) {
                 Text(`${this.contentDetailData.photoList?.[this.swiperIndex].picDesc}`)
                 Text(`${this.contentDetailData.photoList?.[this.swiperIndex].picDesc}`)
                   .fontColor(Color.White)
                   .fontColor(Color.White)
@@ -415,15 +421,30 @@ export struct MultiPictureDetailPageComponent {
               }
               }
             }
             }
           }
           }
-          .width('100%')
+          .nestedScroll(
+            {
+              scrollForward: NestedScrollMode.PARENT_FIRST,
+              scrollBackward: NestedScrollMode.SELF_FIRST
+            }
+          )
+          .constraintSize (
+            {
+              maxHeight: px2vp(this.titleHeight)
+            }
+          )
         }
         }
-        .scrollable(ScrollDirection.Vertical)
-        .scrollBarWidth(0)
-        .constraintSize({
-          maxHeight: px2vp(this.titleHeight)
-        })
-        .align(Alignment.Bottom)
+        .width('100%')
       }
       }
+      .scrollable(ScrollDirection.Vertical)
+      .scrollBarWidth(0)
+      .constraintSize (
+        {
+          maxHeight: px2vp(this.nShowDownloadTitleHeight)
+        }
+      )
+      // .initialOffset({
+      //   yOffset: px2vp(this.titleHeight)/2
+      // })
 
 
       OperRowListView({
       OperRowListView({
         contentDetailData: this.contentDetailData,
         contentDetailData: this.contentDetailData,