Merge remote-tracking branch 'origin/main'

 import {  PhotoListBean } from 'wdBean';
 import {  PhotoListBean } from 'wdBean';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
-import router from '@ohos.router';
-import display from '@ohos.display';
 
 
 const TAG = 'MultiPictureDetailPageComponent';
 const TAG = 'MultiPictureDetailPageComponent';
 
 
@@ -11,14 +9,10 @@ export struct MultiPictureDetailItemComponent {
   //alt app.media.picture_loading 设计稿尺寸
   //alt app.media.picture_loading 设计稿尺寸
   @State imageWidth:string | number = 167
   @State imageWidth:string | number = 167
   @State ratio:number = 167/60
   @State ratio:number = 167/60
-  private scroller: Scroller = new Scroller()
-  private displayTool = display.getDefaultDisplaySync()
-  @State picHeight: number = 0
 
 
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     Logger.info(TAG, 'pictures preview')
     Logger.info(TAG, 'pictures preview')
-    this.picHeight = this.displayTool.width * 578 / 375
   }
   }
 
 
   build() {
   build() {
@@ -33,16 +27,6 @@ export struct MultiPictureDetailItemComponent {
           this.imageWidth = '100%'
           this.imageWidth = '100%'
           this.ratio = this.MultiPictureDetailItem.width / this.MultiPictureDetailItem.height
           this.ratio = this.MultiPictureDetailItem.width / this.MultiPictureDetailItem.height
         })
         })
-        /*.onDrop(event => {
-          router.back();
-        })
-        .draggable(true)*/
-      /*Scroll(this.scroller) {
-
-      }
-      .scrollable(ScrollDirection.Vertical)
-      .scrollBarWidth(0)
-      .height(px2vp(this.picHeight))*/
     }
     }
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')

@@ -18,6 +18,7 @@ import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
+import { router } from '@kit.ArkUI';
 
 
 const TAG = 'MultiPictureDetailPageComponent';
 const TAG = 'MultiPictureDetailPageComponent';
 
 
@@ -34,6 +35,7 @@ export struct MultiPictureDetailPageComponent {
   @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
+  private swiperControllerItem: SwiperController = new SwiperController()
   @State swiperIndex: number = 0;
   @State swiperIndex: number = 0;
   @Provide followStatus: string = '0' // 关注状态
   @Provide followStatus: string = '0' // 关注状态
   private scroller: Scroller = new Scroller()
   private scroller: Scroller = new Scroller()
@@ -71,7 +73,19 @@ export struct MultiPictureDetailPageComponent {
       if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
       if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
         Swiper(this.swiperController) {
         Swiper(this.swiperController) {
           ForEach(this.contentDetailData.photoList, (item: PhotoListBean) => {
           ForEach(this.contentDetailData.photoList, (item: PhotoListBean) => {
-            MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
+            Swiper(this.swiperController) {
+              MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
+            }
+            .width('100%')
+            .height('100%')
+            .vertical(true)
+            .autoPlay(false)
+            .cachedCount(1)
+            .indicator(false)
+            .displayCount(1)
+            .onAnimationEnd(event => {
+              router.back()
+            })
           })
           })
         }
         }
         .index(this.swiperIndex)
         .index(this.swiperIndex)
@@ -82,6 +96,7 @@ export struct MultiPictureDetailPageComponent {
         .cachedCount(3)
         .cachedCount(3)
         .indicator(false)
         .indicator(false)
         .displayCount(1)
         .displayCount(1)
+        .loop(false)
         .id('e_swiper_content')
         .id('e_swiper_content')
         .alignRules({
         .alignRules({
           center: { anchor: "__container__", align: VerticalAlign.Center },
           center: { anchor: "__container__", align: VerticalAlign.Center },