Merge remote-tracking branch 'origin/main'

# Conflicts:
#	sight_harmony/commons/wdRouter/src/main/ets/utils/ProcessUtils.ets
#	sight_harmony/commons/wdWebComponent/src/main/ets/pages/JsBridgeBiz.ets

@@ -157,14 +157,14 @@ export class ProcessUtils {
    * 图集详情页
    * 图集详情页
    * @param content
    * @param content
    * */
    * */
-  public static gotoMultiPictureListPage(photoList: PhotoListBean[],swiperIndex: number) {
+  public static gotoMultiPictureListPage(photoList: PhotoListBean[], swiperIndex?:number) {
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 18,
         detailPageType: 18,
         extra: {
         extra: {
           photoList,
           photoList,
-          swiperIndex,
+          swiperIndex
         } as ExtraDTO
         } as ExtraDTO
       } as Params,
       } as Params,
     };
     };

@@ -99,6 +99,7 @@ function handleJsCallReceiveH5Data(data: Message) {
     case '3':
     case '3':
       let imgListData: IImgListData = JSON.parse(data?.data?.imgListData || "{}")
       let imgListData: IImgListData = JSON.parse(data?.data?.imgListData || "{}")
       let imgArr = imgListData?.imgArr || []
       let imgArr = imgListData?.imgArr || []
+      let swiperIndex = imgListData?.imgIndex
       if (imgArr.length > 0) {
       if (imgArr.length > 0) {
         const photoList: PhotoListBean[] = imgArr.map(item => {
         const photoList: PhotoListBean[] = imgArr.map(item => {
           const photo: PhotoListBean = {
           const photo: PhotoListBean = {
@@ -109,7 +110,7 @@ function handleJsCallReceiveH5Data(data: Message) {
           }
           }
           return photo
           return photo
         })
         })
-        ProcessUtils.gotoMultiPictureListPage(photoList,0)
+        ProcessUtils.gotoMultiPictureListPage(photoList,swiperIndex)
       }
       }
       break;
       break;
     case '5':
     case '5':