Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

@@ -7,7 +7,7 @@ import {
   ResponseBean
 } from 'wdBean';
 import { Logger } from 'wdKit';
-import { WdWebComponent } from 'wdWebComponent';
+import { WdWebComponent, WdWebLocalComponent } from 'wdWebComponent';
 import { BridgeWebViewControl } from '../../../../../wdWebComponent/oh_modules/wdJsBridge/Index';
 
 @Component
@@ -74,12 +74,10 @@ export struct ImageAndTextWebComponent {
 
   build() {
     Column() {
-      WdWebComponent({
-        type: 0,
+      WdWebLocalComponent({
         webviewControl: this.webviewControl,
-        webResource: $rawfile('apph5/index.html'),
+        webResource: $rawfile('index.html'),
         backVisibility: false,
-        reload: this.reload
       })
     }
   }

 export { WdWebComponent } from './src/main/ets/pages/WdWebComponent'
+
+export { WdWebLocalComponent } from './src/main/ets/pages/WdWebLocalComponent'
\ No newline at end of file

@@ -13,11 +13,6 @@ export struct WdWebComponent {
   private webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   //TODO 默认网页
   webUrl: string = ConfigConstants.DETAIL_URL
-
-  // 0网页， 1本地html
-  type: number = 0
-
-  webResource: Resource = {} as Resource
   /**
    * 对外暴露webview的回调，能力
    */
@@ -68,7 +63,7 @@ export struct WdWebComponent {
       .height(44)
       .visibility(this.backVisibility ? Visibility.Visible : Visibility.None)
 
-      Web({ src: this.type == 0 ? this.webUrl : this.webResource, controller: this.webviewControl })
+      Web({ src: this.webUrl, controller: this.webviewControl })
         .domStorageAccess(true)
         .databaseAccess(true)
         .javaScriptAccess(true)

+import router from '@ohos.router';
+import { BridgeWebViewControl } from 'wdJsBridge';
+
+const TAG = 'WdWebLocalComponent';
+
+@Component
+export struct WdWebLocalComponent {
+  private webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
+  backVisibility: boolean = false
+  webResource: Resource = {} as Resource
+
+  build() {
+    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.webResource, controller: this.webviewControl })
+        .domStorageAccess(true)
+        .databaseAccess(true)
+        .javaScriptAccess(true)
+    }
+  }
+}
+