yangchenggong1_wd

fix:bug[17202] 我的-设置--关于,鸿蒙版缺少相关协议

@@ -8,7 +8,7 @@ const TAG = 'AboutPageUI'; @@ -8,7 +8,7 @@ const TAG = 'AboutPageUI';
8 8
9 @Component 9 @Component
10 export struct AboutPageUI { 10 export struct AboutPageUI {
11 - @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议']; 11 + @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议','收集个人信息明示清单','第三方信息共享清单'];
12 @State message: string = '京ICP备16066560号-6A Copyright © 人民日报客户端\nall rights reserved.' 12 @State message: string = '京ICP备16066560号-6A Copyright © 人民日报客户端\nall rights reserved.'
13 @State version: string = '版本号:v' 13 @State version: string = '版本号:v'
14 dialogController: CustomDialogController = new CustomDialogController({ 14 dialogController: CustomDialogController = new CustomDialogController({
@@ -76,9 +76,15 @@ export struct AboutPageUI { @@ -76,9 +76,15 @@ export struct AboutPageUI {
76 if (index == 0) { 76 if (index == 0) {
77 let bean = { contentID: "2", pageID: "" } as Params 77 let bean = { contentID: "2", pageID: "" } as Params
78 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 78 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
79 - } else { 79 + } else if(index == 1){
80 let bean = { contentID: "1", pageID: "" } as Params 80 let bean = { contentID: "1", pageID: "" } as Params
81 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 81 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
  82 + }else if(index == 2){
  83 + let bean = { contentID: "5", pageID: "" } as Params
  84 + WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
  85 + }else if(index == 3){
  86 + let bean = { contentID: "6", pageID: "" } as Params
  87 + WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
82 } 88 }
83 }) 89 })
84 }) 90 })
@@ -30,9 +30,11 @@ struct MineHomePage { @@ -30,9 +30,11 @@ struct MineHomePage {
30 @State attentionNum:number = 0//关注数 30 @State attentionNum:number = 0//关注数
31 registTime:number = 0//账号注册时间 31 registTime:number = 0//账号注册时间
32 @State registerTimeForDay:number = 0 32 @State registerTimeForDay:number = 0
  33 + scroller: Scroller = new Scroller();
33 34
34 onPageShow(): void { 35 onPageShow(): void {
35 this.getUserInfo() 36 this.getUserInfo()
  37 +
36 } 38 }
37 39
38 build() { 40 build() {
@@ -48,7 +50,7 @@ struct MineHomePage { @@ -48,7 +50,7 @@ struct MineHomePage {
48 this.MineHomeTitleWhite() 50 this.MineHomeTitleWhite()
49 } 51 }
50 52
51 - Scroll() { 53 + Scroll(this.scroller) {
52 Column() { 54 Column() {
53 //用户信息区域 55 //用户信息区域
54 Row() { 56 Row() {
@@ -16,6 +16,9 @@ struct LoginProtocolWebview { @@ -16,6 +16,9 @@ struct LoginProtocolWebview {
16 privateProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1001.html' 16 privateProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1001.html'
17 logoutProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1003.html' 17 logoutProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1003.html'
18 huaweiAuthProtocol = 'https://privacy.consumer.huawei.com/legal/id/authentication-terms.htm?code=CN&language=zh-CN' 18 huaweiAuthProtocol = 'https://privacy.consumer.huawei.com/legal/id/authentication-terms.htm?code=CN&language=zh-CN'
  19 +
  20 + collectionProtocol = 'https://cdnpeoplefront.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1002.html'//收集个人信息明示清单
  21 + thirdVendorProtocol = 'https://cdnpeoplefront.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1004.html'//第三方信息共享清单
19 @State contentID:string = "0" 22 @State contentID:string = "0"
20 23
21 async aboutToAppear() { 24 async aboutToAppear() {
@@ -38,6 +41,12 @@ struct LoginProtocolWebview { @@ -38,6 +41,12 @@ struct LoginProtocolWebview {
38 } else if(params.contentID == "4"){ //华为用户认证协议 41 } else if(params.contentID == "4"){ //华为用户认证协议
39 this.webUrl = this.huaweiAuthProtocol 42 this.webUrl = this.huaweiAuthProtocol
40 this.webviewController.loadUrl(this.webUrl) 43 this.webviewController.loadUrl(this.webUrl)
  44 + } else if(params.contentID == "5"){ //收集个人信息明示清单
  45 + this.webUrl = this.collectionProtocol
  46 + this.webviewController.loadUrl(this.webUrl)
  47 + } else if(params.contentID == "6"){ //第三方信息共享清单
  48 + this.webUrl = this.thirdVendorProtocol
  49 + this.webviewController.loadUrl(this.webUrl)
41 } 50 }
42 } 51 }
43 52
1 import { CustomToast} from 'wdKit/Index'; 1 import { CustomToast} from 'wdKit/Index';
2 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; 2 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
3 import { LoginModel } from './LoginModel'; 3 import { LoginModel } from './LoginModel';
4 -import { LoginViewModel } from './LoginViewModel';  
5 import { ModifyPasswordRequestItem } from './ModifyPasswordRequestItem'; 4 import { ModifyPasswordRequestItem } from './ModifyPasswordRequestItem';
6 import { router } from '@kit.ArkUI'; 5 import { router } from '@kit.ArkUI';
7 import { encryptMessage } from '../../utils/cryptoUtil'; 6 import { encryptMessage } from '../../utils/cryptoUtil';