fix:17297 健康频道>H5稿件，进入H5稿件详情，不应直接展示链接

@@ -108,9 +108,9 @@ export class ProcessUtils {
         break;
         break;
       case ContentConstants.TYPE_TELETEXT:
       case ContentConstants.TYPE_TELETEXT:
       // 图文详情，跳转h5
       // 图文详情，跳转h5
-        if(content?.linkUrl){ //有 linkUrl 走专题页展示逻辑
-          ProcessUtils.gotoSpecialTopic(content)
-        }else{
+        if (content?.linkUrl) { //有 linkUrl 走专题页展示逻辑
+          ProcessUtils.gotoSpecialTopic(content,true)
+        } else {
           ProcessUtils.gotoWeb(content);
           ProcessUtils.gotoWeb(content);
         }
         }
         break;
         break;
@@ -191,13 +191,14 @@ export class ProcessUtils {
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
   }
   }
 
 
-  public static gotoSpecialTopic(content: ContentDTO) {
+  public static gotoSpecialTopic(content: ContentDTO, backVisibility?: boolean) {
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_INNER_NEW_PAGE',
       type: 'JUMP_INNER_NEW_PAGE',
       params: {
       params: {
         contentID: content?.objectId,
         contentID: content?.objectId,
         url: content.linkUrl,
         url: content.linkUrl,
         pageID: 'SPACIAL_TOPIC_PAGE',
         pageID: 'SPACIAL_TOPIC_PAGE',
+        backVisibility: backVisibility,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,

@@ -12,26 +12,13 @@ const TAG = 'WdWebComponent';
 @Component
 @Component
 export struct WdWebComponent {
 export struct WdWebComponent {
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
-  onWebPrepared: () => void = () => {}
-  @Prop backVisibility: boolean = false
+  onWebPrepared: () => void = () => {
+  }
   @Prop webUrl: string = ''
   @Prop webUrl: string = ''
   @Link isPageEnd: boolean
   @Link isPageEnd: boolean
 
 
   build() {
   build() {
     Column() {
     Column() {
-      Row() {
-        Image($r("app.media.ic_back"))
-          .width(44)
-          .padding(13)
-          .aspectRatio(1)
-          .onClick(() => {
-            router.back();
-          })
-      }.backgroundColor(Color.Black)
-      .width('100%')
-      .height(44)
-      .visibility(this.backVisibility ? Visibility.Visible : Visibility.None)
-
       Web({ src: this.webUrl, controller: this.webviewControl })
       Web({ src: this.webUrl, controller: this.webviewControl })
         .domStorageAccess(true)
         .domStorageAccess(true)
         .databaseAccess(true)
         .databaseAccess(true)
@@ -76,6 +63,7 @@ export struct WdWebComponent {
       this.webviewControl.registerHandler(handleName, { handle: handle });
       this.webviewControl.registerHandler(handleName, { handle: handle });
     }
     }
   }
   }
+
   /**
   /**
    * 默认【CallNative】逻辑处理
    * 默认【CallNative】逻辑处理
    */
    */

@@ -25,4 +25,5 @@ export interface Params {
   creatorId?: string; //号主id
   creatorId?: string; //号主id
   videoUrl?: string;
   videoUrl?: string;
   videoCoverUrl?: string;
   videoCoverUrl?: string;
+  backVisibility?: boolean; //展示顶部返回栏
 }
 }

@@ -161,9 +161,11 @@ export struct ImageAndTextPageComponent {
           operationButtonList: this.operationButtonList,
           operationButtonList: this.operationButtonList,
           styleType: 1,
           styleType: 1,
         })
         })
+          .position({y: '100%'})
       }
       }
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
       .height(CommonConstants.FULL_HEIGHT)
       .height(CommonConstants.FULL_HEIGHT)
+      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
       .padding({ top: 38 })
       .padding({ top: 38 })
 
 
       // 发布时间
       // 发布时间
@@ -196,7 +198,6 @@ export struct ImageAndTextPageComponent {
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .height(CommonConstants.FULL_HEIGHT)
     .height(CommonConstants.FULL_HEIGHT)
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
-
   }
   }
 
 
   private async getDetail() {
   private async getDetail() {

@@ -9,7 +9,7 @@ import { OperRowListView } from './view/OperRowListView';
 import DetailViewModel from '../viewmodel/DetailViewModel';
 import DetailViewModel from '../viewmodel/DetailViewModel';
 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
 import { EmptyComponent } from '../components/view/EmptyComponent';
 import { EmptyComponent } from '../components/view/EmptyComponent';
-import { NetworkUtil } from 'wdKit';
+import { NetworkUtil, WindowModel } from 'wdKit';
 
 
 const TAG: string = 'SpacialTopicPageComponent'
 const TAG: string = 'SpacialTopicPageComponent'
 
 
@@ -89,17 +89,25 @@ export struct SpacialTopicPageComponent {
     Column() {
     Column() {
       Stack({ alignContent: Alignment.Bottom }) {
       Stack({ alignContent: Alignment.Bottom }) {
         Column() {
         Column() {
+          Text(this.contentDetailData?.newsTitle)
+          .backgroundColor(Color.White)
+          .width('100%')
+          .height(40)
+          .fontSize(18)
+          .textAlign(TextAlign.Center)
+          .fontWeight(500)
+          .visibility(this.action?.params?.backVisibility && this.isPageEnd ? Visibility.Visible : Visibility.None)
+
           WdWebComponent({
           WdWebComponent({
             webviewControl: this.webviewControl,
             webviewControl: this.webviewControl,
             webUrl: this.webUrl,
             webUrl: this.webUrl,
-            backVisibility: false,
             onWebPrepared: this.onWebPrepared.bind(this),
             onWebPrepared: this.onWebPrepared.bind(this),
-            isPageEnd: $isPageEnd
+            isPageEnd: $isPageEnd,
           })
           })
         }
         }
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
         .height(CommonConstants.FULL_HEIGHT)
-        .padding({ bottom: 75 })
+        .padding({ bottom: this.action?.params?.backVisibility ? 115 : 75 })
 
 
         if (!this.isNetConnected) {
         if (!this.isNetConnected) {
           EmptyComponent({
           EmptyComponent({
@@ -111,7 +119,7 @@ export struct SpacialTopicPageComponent {
           }).padding({ bottom: 200 })
           }).padding({ bottom: 200 })
         } else {
         } else {
           if (!this.isPageEnd) {
           if (!this.isPageEnd) {
-            detailedSkeleton()
+            detailedSkeleton().padding({ bottom: this.bottomSafeHeight })
           }
           }
         }
         }
         //底部交互区
         //底部交互区
@@ -120,17 +128,33 @@ export struct SpacialTopicPageComponent {
           publishCommentModel: this.publishCommentModel,
           publishCommentModel: this.publishCommentModel,
           operationButtonList: this.operationButtonList,
           operationButtonList: this.operationButtonList,
         })
         })
-          .padding({
-            bottom: `${this.bottomSafeHeight}px`
-          })
       }
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }
   }
 
 
+  onPageShow() {
+    if (!this.action?.params?.backVisibility) {
+      WindowModel.shared.setWindowLayoutFullScreen(true)
+    }
+  }
+
   aboutToAppear() {
   aboutToAppear() {
-    if (this.action) {
-      this.webUrl = this.action.params?.url || ''
+    if (!this.action?.params?.backVisibility) {
+      WindowModel.shared.setWindowLayoutFullScreen(true)
     }
     }
+    this.webUrl = this.action?.params?.url || ''
     this.getDetail()
     this.getDetail()
   }
   }
+
+  onPageHide() {
+    if (!this.action?.params?.backVisibility) {
+      WindowModel.shared.setWindowLayoutFullScreen(false)
+    }
+  }
+
+  aboutToDisappear() {
+    if (!this.action?.params?.backVisibility) {
+      WindowModel.shared.setWindowLayoutFullScreen(false)
+    }
+  }
 }
 }

 import { Action } from 'wdBean';
 import { Action } from 'wdBean';
 import { SpacialTopicPageComponent } from 'wdComponent'
 import { SpacialTopicPageComponent } from 'wdComponent'
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { Logger, WindowModel } from 'wdKit'
+import { Logger } from 'wdKit'
 import router from '@ohos.router';
 import router from '@ohos.router';
 
 
 const TAG = 'SpacialTopicPage';
 const TAG = 'SpacialTopicPage';
@@ -30,28 +30,8 @@ struct SpacialTopicPage {
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    WindowModel.shared.setWindowLayoutFullScreen(true)
     Logger.info(TAG, 'aboutToAppear');
     Logger.info(TAG, 'aboutToAppear');
     let action: Action = router.getParams() as Action
     let action: Action = router.getParams() as Action
     this.action = action
     this.action = action
   }
   }
-
-  aboutToDisappear() {
-    Logger.info(TAG, 'aboutToDisappear');
-    WindowModel.shared.setWindowLayoutFullScreen(false)
-  }
-
-  onPageShow() {
-    WindowModel.shared.setWindowLayoutFullScreen(true)
-    Logger.info(TAG, 'onPageShow');
-  }
-
-  onPageHide() {
-    Logger.info(TAG, 'onPageHide');
-    WindowModel.shared.setWindowLayoutFullScreen(false)
-  }
-
-  onBackPress() {
-    Logger.info(TAG, 'onBackPress');
-  }
 }
 }

@@ -17,20 +17,15 @@ struct DefaultWebPage {
 
 
   build() {
   build() {
     Column() {
     Column() {
-      Stack({ alignContent: Alignment.Bottom }) {
-        Column() {
       WdWebComponent({
       WdWebComponent({
         webviewControl: this.webviewControl,
         webviewControl: this.webviewControl,
         webUrl: this.webUrl,
         webUrl: this.webUrl,
-            backVisibility: false,
         isPageEnd: $isPageEnd
         isPageEnd: $isPageEnd
       })
       })
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .height(CommonConstants.FULL_HEIGHT)
     .height(CommonConstants.FULL_HEIGHT)
   }
   }
-    }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
-  }
 
 
   aboutToAppear() {
   aboutToAppear() {
     let action: Action = router.getParams() as Action
     let action: Action = router.getParams() as Action