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

@@ -40,4 +40,6 @@ export class WDRouterPage {
   static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");
   //我的 关注
   static followListPage = new WDRouterPage("wdComponent", "ets/components/page/FollowListPage");
+
+  static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
 }

+import { Logger, StringUtils } from 'wdKit'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 
 @Component
 export default struct MinePageUserSimpleInfoUI {
   @Prop isLogin:boolean
   @Prop userName:string
-
+  @Consume('isLogin')@Watch('loginChange') isLogin2:Record<string,string>
+  loginChange(){
+    Logger.debug("isLogin",'MinePageUserSimpleInfoUI')
+    if(this.isLogin2){
+      this.isLogin=true
+      this.userName=this.isLogin2['userName']
+    }
+  }
 
   build(){
     Row(){

+import { WDRouterPage } from 'wdRouter/src/main/ets/router/WDRouterPage'
+import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule'
+import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index'
+
 @CustomDialog
 export struct CustomProtocolDialog {
   controller: CustomDialogController
@@ -19,9 +23,15 @@ export struct CustomProtocolDialog {
         .margin({ top: 20 })
       Text() {
         Span("为保障您的合法权益，请阅读并同意").fontSize(14).fontColor("#666666")
-        Span("《用户协议》").fontSize(14).fontColor("#ED2800")
+        Span("《用户协议》").fontSize(14).fontColor("#ED2800").onClick(()=>{
+          let bean={contentId:"1",pageID:""} as Params
+          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
+        })
         Span("及").fontSize(14).fontColor("#666666")
-        Span("《隐私政策》").fontSize(14).fontColor("#ED2800")
+        Span("《隐私政策》").fontSize(14).fontColor("#ED2800").onClick(()=>{
+          let bean={contentId:"2",pageID:""} as Params
+          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
+        })
         Span("后进行登录").fontSize(14).fontColor("#666666")
       }.margin({ top: 12, left: 16, right: 16 })
 

@@ -7,6 +7,7 @@ import promptAction from '@ohos.promptAction'
 import { SPHelper } from 'wdKit'
 import { WDRouterPage } from 'wdRouter/src/main/ets/router/WDRouterPage';
 import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule';
+import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params'
 
 @Extend(Row)
 function otherStyle() {
@@ -95,9 +96,6 @@ struct LoginPage {
 
 
         Row() {
-          // Checkbox().selectedColor("#ED2800").onChange((value) => {
-          //   this.protocolState = value
-          // })
           Image(this.protocolState ? $r('app.media.login_checkbox_select') : $r('app.media.login_checkbox_unselected'))
             .width(15)
             .height(15)
@@ -109,10 +107,14 @@ struct LoginPage {
             Span("我已阅读并同意").fontColor("#999999").fontSize(12)
             Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
               //todo 协议
+              let bean={contentId:"1",pageID:""} as Params
+              WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
             })
             Span("及").fontColor("#999999").fontSize(12)
             Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => {
               //todo 协议
+              let bean={contentId:"2",pageID:""} as Params
+              WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
             })
           }
         }.margin({ top: 28 }).alignItems(VerticalAlign.Center)
@@ -299,19 +301,22 @@ struct LoginPage {
     if (this.checkCodePage) {
       this.loginViewModel.appLogin(this.phoneContent, 2, this.codeContent).then((data) => {
         Logger.debug(TAG, "requestLogin: " + data.jwtToken)
-        let dd = SPHelper.default.get('userName', 'dd').then((value) => {
-          Logger.debug(TAG, 'SP:' + value)
-        })
-        router.back()
+        router.back({
+          params: { userName: data.userName,
+            userId:data.id},
+          url: 'pages/MainPage'
+        }
+        )
       })
     } else {
       this.loginViewModel.appLoginByPassword(this.accountContent, 0, this.passwordContent, "").then((data) => {
         Logger.debug(TAG, "requestLogin: " + data.jwtToken)
-        let dd = SPHelper.default.get('userName', 'dd').then((value) => {
-          Logger.debug(TAG, 'SP:' + value)
-        })
         promptAction.showToast({ message: '登录成功' })
-        router.back()
+        router.back({
+          params: { userName: data.userName,
+            userId:data.id},
+          url: 'pages/MainPage'
+        })
       }).catch((value: string) => {
         promptAction.showToast({ message: value })
       })

+import router from '@ohos.router';
+import webview from '@ohos.web.webview';
+import { Logger } from 'wdKit';
+import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params';
+
+
+const TAG = 'LoginProtocolWebview';
+
+@Entry
+@Component
+struct LoginProtocolWebview {
+  webUrl: string = ''
+  webviewController: webview.WebviewController = new webview.WebviewController()
+
+  aboutToAppear() {
+    if (router.getParams()) {
+      let params = router.getParams() as Params
+      if (params.contentID == "1") {
+        this.webUrl = "https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1005.html"
+      } else {
+        this.webUrl = "https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1001.html"
+      }
+    }
+
+  }
+
+  build() {
+
+    Column() {
+      Row() {
+        Image($r("app.media.login_back_icon"))
+          .width(24)
+          .aspectRatio(1)
+          .onClick(() => {
+            router.back();
+          }).margin({left:16})
+        Text()
+      }
+      .alignItems(VerticalAlign.Center)
+      .width('100%')
+      .height(44)
+
+      Web({ src: this.webUrl, controller: this.webviewController })
+        .domStorageAccess(true)
+        .databaseAccess(true)
+        .javaScriptAccess(true)
+        .zoomAccess(false)
+        .horizontalScrollBarAccess(false)
+        .verticalScrollBarAccess(false)
+        .onHttpErrorReceive((event) => {
+          //TODO 页面加载不成功的时候处理
+          Logger.info(TAG, 'onHttpErrorReceive event.request.getRequestUrl:' + event?.request.getRequestUrl());
+          Logger.info(TAG, 'onHttpErrorReceive event.response.getResponseCode:' + event?.response.getResponseCode());
+        })
+    }
+  }
+}
\ No newline at end of file

@@ -2,6 +2,7 @@
   "src": [
     "pages/Index",
     "pages/login/LoginPage",
-    "pages/login/ForgetPasswordPage"
+    "pages/login/ForgetPasswordPage",
+    "pages/login/LoginProtocolWebview"
   ]
 }

@@ -2,12 +2,15 @@ import { BottomNavigationComponent} from 'wdComponent';
 import { BreakpointConstants } from 'wdConstant';
 
 import { BreakpointSystem, Logger } from 'wdKit';
+import router from '@ohos.router';
 
 const TAG = 'MainPage';
 
 @Entry
 @Component
 struct MainPage {
+  @Provide('isLogin') isLogin:Record<string,string>={}
+
   private breakpointSystem: BreakpointSystem = new BreakpointSystem()
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_XS;
 
@@ -27,6 +30,8 @@ struct MainPage {
 
   onPageShow() {
     Logger.info(TAG, 'onPageShow');
+    let params=router.getParams() as Record<string,string>
+    this.isLogin=params
   }
 
   onPageHide() {