feat：解决冲突

@@ -8,10 +8,13 @@ import router from '@ohos.router';
 struct SettingPage {
 struct SettingPage {
   @State message: string = 'Hello World 02'
   @State message: string = 'Hello World 02'
   @State pageType: string = '';
   @State pageType: string = '';
+  @State params:any =  router.getParams();
 
 
   onPageShow() {
   onPageShow() {
-    const params = router.getParams(); // 获取传递过来的参数对象
-    this.pageType =  'mainSetting';// 获取info属性的值
+
+    this.pageType = this.params.pageType;
+
+    // this.pageType =  'mainSetting';// 获取info属性的值
   }
   }
 
 
   build() {
   build() {

@@ -4,11 +4,11 @@
     "pages/MainPage",
     "pages/MainPage",
     "pages/ColumnPage",
     "pages/ColumnPage",
     "pages/TestPage",
     "pages/TestPage",
-    "pages/SettingPage",
-    "pages/PrivacySettingPage",
-    "pages/SettingAboutPage",
+    "components/page/SettingPage",
+    "components/page/PrivacySettingPage",
+    "components/page/SettingAboutPage",
     "pages/AppointmentListPage",
     "pages/AppointmentListPage",
-    "pages/SettingPasswordPage",
+    "components/page/SettingPasswordPage",
 	"pages/FollowListPage"
 	"pages/FollowListPage"
   ]
   ]
 }
 }

@@ -12,6 +12,7 @@ import { MineMainSettingFunctionItem } from '../viewmodel/MineMainSettingFunctio
 import storageStatistics from "@ohos.file.storageStatistics";
 import storageStatistics from "@ohos.file.storageStatistics";
 import { BusinessError } from '@ohos.base';
 import { BusinessError } from '@ohos.base';
 import ArrayList from '@ohos.util.ArrayList';
 import ArrayList from '@ohos.util.ArrayList';
+import router from '@ohos.router';
 
 
 
 
 @Component
 @Component
@@ -58,7 +59,12 @@ export struct AccountAndSecurityLayout {
             }
             }
             .onClick(() => {
             .onClick(() => {
               console.log(index + "")
               console.log(index + "")
-              RouteManager.jumpNewPage("pages/SettingPasswordPage") // 调用跳转方法，跳转新页面
+              if (index == 1) {
+                router.pushUrl({
+                  url:"pages/SettingPasswordPage",
+                  params : {'currentType' : 4}
+                })
+              }
             })
             })
 
 
           }, item => item)
           }, item => item)

@@ -11,6 +11,7 @@ import RouteManager from '../../utils/RouteManager'
 import storageStatistics from "@ohos.file.storageStatistics";
 import storageStatistics from "@ohos.file.storageStatistics";
 import { BusinessError } from '@ohos.base';
 import { BusinessError } from '@ohos.base';
 import RouteManager from '../../utils/RouteManager'
 import RouteManager from '../../utils/RouteManager'
+import router from '@ohos.router';
 
 
 
 
 @Component
 @Component
@@ -67,15 +68,25 @@ export struct MineSettingComponent {
               }.padding({ left: '27lpx' })
               }.padding({ left: '27lpx' })
               .onClick(() => {
               .onClick(() => {
 
 
-                // 在Home页面中
-                let paramsInfo: object = {
-                  pageId: 123,
-                  pageType:'AccountAndSecurityLayout'
-                };
-                RouteManager.jumpNewPage("pages/SettingPasswordPage") // 调用跳转方法，跳转新页面
-
+                // // 在Home页面中
+                // let paramsInfo: object = {
+                //   pageId: 123,
+                //   pageType:'AccountAndSecurityLayout'
+                // };
                 console.log(subIndex + "")
                 console.log(subIndex + "")
-                if (subIndex == 2) {
+                if (subIndex == 0) {
+                  // router.pushUrl({
+                  //   url:"pages/SettingPasswordPage",
+                  //   params : {'currentType' : 4}
+                  // })
+
+                  router.pushUrl({
+                    url:"pages/SettingPage",
+                    params : {'pageType' : 'AccountAndSecurityLayout'}
+                  })
+                  //SettingPage
+                  // RouteManager.jumpNewPage("pages/SettingPasswordPage", {'currentType' : 4}) // 调用跳转方法，跳转新页面
+                }else if (subIndex == 2) {
                   // RouteManager.jumpNewPage("pages/SettingPage") // 调用跳转方法，跳转新页面
                   // RouteManager.jumpNewPage("pages/SettingPage") // 调用跳转方法，跳转新页面
                   RouteManager.jumpNewPage("pages/PrivacySettingPage")
                   RouteManager.jumpNewPage("pages/PrivacySettingPage")
                 }
                 }

@@ -2,13 +2,13 @@ import dataPreferences from '@ohos.data.preferences';
 import { PermissionUtil } from 'wdKit'
 import { PermissionUtil } from 'wdKit'
 import { SPHelper } from 'wdKit'
 import { SPHelper } from 'wdKit'
 import hilog from '@ohos.hilog';
 import hilog from '@ohos.hilog';
-import {PrivacySettingModel} from '../../viewmodel/PrivacySettingModel'
+import { PrivacySettingModel } from '../../viewmodel/PrivacySettingModel'
 
 
 const TAG = 'PrivacySettingComponents';
 const TAG = 'PrivacySettingComponents';
 
 
 @Component
 @Component
-export  struct PrivacySettingComponents {
-  @State  listData: Array<PrivacySettingModel> = [new PrivacySettingModel('开启个性推荐', false, null), new PrivacySettingModel('相册权限', false, 'ohos.permission.READ_MEDIA'), new PrivacySettingModel('相机权限', false, 'ohos.permission.CAMERA'), new PrivacySettingModel('定位权限', false, 'ohos.permission.LOCATION'), new PrivacySettingModel('麦克风权限', false, 'ohos.permission.MICROPHONE')];
+export struct PrivacySettingComponents {
+  @State listData: Array<PrivacySettingModel> = [new PrivacySettingModel('开启个性推荐', false, null), new PrivacySettingModel('相册权限', false, 'ohos.permission.READ_MEDIA'), new PrivacySettingModel('相机权限', false, 'ohos.permission.CAMERA'), new PrivacySettingModel('定位权限', false, 'ohos.permission.LOCATION'), new PrivacySettingModel('麦克风权限', false, 'ohos.permission.MICROPHONE')];
   @State tips: string = '设置前可查阅'
   @State tips: string = '设置前可查阅'
   @State privacyTips: string = '《隐私政策》'
   @State privacyTips: string = '《隐私政策》'
 
 
@@ -17,7 +17,7 @@ export  struct PrivacySettingComponents {
     // SPHelper.default.save('sdf','sdf');
     // SPHelper.default.save('sdf','sdf');
     // this.initListData();
     // this.initListData();
     this.getPermissionStatus();
     this.getPermissionStatus();
-   RefreshStatus;
+    RefreshStatus;
 
 
   }
   }
 
 
@@ -31,13 +31,13 @@ export  struct PrivacySettingComponents {
   //   this.listData.push(model1, model2, model3, model4, model5);
   //   this.listData.push(model1, model2, model3, model4, model5);
   // }
   // }
 
 
-  async  getPermissionStatus(){
-    const permissionUtil =  new PermissionUtil();
+  async getPermissionStatus() {
+    const permissionUtil = new PermissionUtil();
     for (const element of this.listData) {
     for (const element of this.listData) {
       if (!element.permissionKey) {
       if (!element.permissionKey) {
         continue;
         continue;
       }
       }
-      const result =  await permissionUtil.checkPermissions(element.permissionKey);
+      const result = await permissionUtil.checkPermissions(element.permissionKey);
       element.permission = result;
       element.permission = result;
     }
     }
   }
   }
@@ -52,49 +52,48 @@ export  struct PrivacySettingComponents {
     .backgroundColor('#F8F8F8')
     .backgroundColor('#F8F8F8')
   }
   }
 
 
-  @Builder PrivacySettingComponentsUI()  {
+  @Builder PrivacySettingComponentsUI() {
     Column() {
     Column() {
 
 
-      List({space:'23lpx'}){
-        ForEach(this.listData, (item:PrivacySettingModel, index) =>{
+      List({ space: '23lpx' }) {
+        ForEach(this.listData, (item: PrivacySettingModel, index) => {
           ListItem() {
           ListItem() {
             if (index == 0) {
             if (index == 0) {
-              getTuiJianCell({item, index});
-            }else{
-              getArrowCell({item, index});
+              getTuiJianCell({ item, index });
+            } else {
+              getArrowCell({ item, index });
             }
             }
-          }.onClick(()=>{
+          }.onClick(() => {
             if (index != 0) {
             if (index != 0) {
-              if (!item.permission){
+              if (!item.permission) {
                 //跳转权限设置
                 //跳转权限设置
-                const permissionUtil =  new PermissionUtil();
+                const permissionUtil = new PermissionUtil();
                 PermissionUtil.reqPermissionsFromUser([item.permissionKey]);
                 PermissionUtil.reqPermissionsFromUser([item.permissionKey]);
               }
               }
             }
             }
           })
           })
         }, item => item)
         }, item => item)
       }
       }
-      .padding({left:'29lpx', right:'29lpx'})
-      .margin({top:'38lpx'})
+      .padding({ left: '29lpx', right: '29lpx' })
+      .margin({ top: '38lpx' })
 
 
-      Row(){
+      Row() {
         Text(this.tips)
         Text(this.tips)
           .fontSize('25lpx')
           .fontSize('25lpx')
           .textAlign(TextAlign.Start)
           .textAlign(TextAlign.Start)
           .fontColor($r("app.color.color_666666"))
           .fontColor($r("app.color.color_666666"))
-          .margin({left:'29lpx', top:'46lpx'})
+          .margin({ left: '29lpx', top: '46lpx' })
         // .backgroundColor(Color.Orange)
         // .backgroundColor(Color.Orange)
         Text(this.privacyTips)
         Text(this.privacyTips)
           .fontSize('25lpx')
           .fontSize('25lpx')
           .textAlign(TextAlign.Start)
           .textAlign(TextAlign.Start)
           .fontColor('#ED2800')
           .fontColor('#ED2800')
-          .margin({top:'46lpx'})
-          .onClick(()=>{
+          .margin({ top: '46lpx' })
+          .onClick(() => {
             //跳转隐私政策
             //跳转隐私政策
           })
           })
       }
       }
 
 
-
     }
     }
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')
@@ -141,9 +140,10 @@ struct getArrowCell {
 }
 }
 
 
 @Component
 @Component
-struct getTuiJianCell{
-  @ObjectLink item :PrivacySettingModel;
+struct getTuiJianCell {
+  @ObjectLink item: PrivacySettingModel;
   index;
   index;
+
   build() {
   build() {
     //@Builder getTuiJianCell(item:PrivacySettingModel, index)
     //@Builder getTuiJianCell(item:PrivacySettingModel, index)
     Column() {
     Column() {

 import MinePageMoreFunctionModel from '../../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../../viewmodel/MinePageMoreFunctionModel'
 import RouteManager from '../../../utils/RouteManager'
 import RouteManager from '../../../utils/RouteManager'
+import router from '@ohos.router'
 
 
 @Component
 @Component
 export default struct MinePageMoreFunctionUI{
 export default struct MinePageMoreFunctionUI{
@@ -66,18 +67,14 @@ export default struct MinePageMoreFunctionUI{
           .onClick(()=>{
           .onClick(()=>{
             console.log(index+"")
             console.log(index+"")
             if (index == 3) {
             if (index == 3) {
-              RouteManager.jumpNewPage("pages/SettingPage")
+              router.pushUrl({
+                url:"pages/SettingPage",
+                params : {'pageType' : 'mainSetting'}
+              })
             } else if (index == 2) {
             } else if (index == 2) {
-              RouteManager.jumpNewPage("pages/PrivacySettingPage")
+              // RouteManager.jumpNewPage("pages/PrivacySettingPage")
             } else if (index == 4) {
             } else if (index == 4) {
               RouteManager.jumpNewPage("pages/SettingAboutPage")
               RouteManager.jumpNewPage("pages/SettingAboutPage")
-            }else  {
-              // 在Home页面中
-              let paramsInfo: object = {
-                pageId: 123,
-                pageType:'mainSetting'
-              };
-              RouteManager.jumpNewPage("pages/PrivacySettingPage",paramsInfo)
             }
             }
 
 
           })
           })

 
 
-import MinePagePersonalFunctionsItem from '../viewmodel/MinePagePersonalFunctionsItem'
-import MinePageCreatorFunctionsItem from '../viewmodel/MinePageCreatorFunctionsItem'
-import MinePageMoreFunctionModel from '../viewmodel/MinePageMoreFunctionModel';
-import { HttpUrlUtils } from '../network/HttpUrlUtils';
+import MinePagePersonalFunctionsItem from '../../../../../../../../PeopleDaily_Harmony/wdComponent/src/main/ets/viewmodel/MinePagePersonalFunctionsItem'
+import MinePageCreatorFunctionsItem from '../../../../../../../../PeopleDaily_Harmony/wdComponent/src/main/ets/viewmodel/MinePageCreatorFunctionsItem'
+import MinePageMoreFunctionModel from '../../../../../../../../PeopleDaily_Harmony/wdComponent/src/main/ets/viewmodel/MinePageMoreFunctionModel';
+import { HttpUrlUtils } from '../../../../../../../../PeopleDaily_Harmony/wdComponent/src/main/ets/network/HttpUrlUtils';
 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
 import { ResponseDTO, WDHttp } from 'wdNetwork';
 import { ResponseDTO, WDHttp } from 'wdNetwork';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
-import { MineMainSettingFunctionItem } from '../viewmodel/MineMainSettingFunctionItem'
+import { MineMainSettingFunctionItem } from '../../../../../../../../PeopleDaily_Harmony/wdComponent/src/main/ets/viewmodel/MineMainSettingFunctionItem'
 
 
 const TAG = "MineSettingDatasModel"
 const TAG = "MineSettingDatasModel"
 
 
@@ -68,10 +68,10 @@ class MineSettingDatasModel{
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '更换手机号', '18888888888', 0, false))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '更换手机号', '18888888888', 0, false))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '设置密码', null, 0, false))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '设置密码', null, 0, false))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.mine_order_icon'), '绑定QQ', '立即绑定', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.mine_order_icon'), '绑定微信', '立即绑定', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.mine_order_icon'), '绑定新浪微博', '立即绑定', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, 'Apple ID', null, 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_qqicon'), '绑定QQ', '立即绑定', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_wechaticon'), '绑定微信', '立即绑定', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_weiboicon'), '绑定新浪微博', '立即绑定', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_appleicon'), 'Apple ID', null, 0, false))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
 
 
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '注销账号', null, 0, false))
     this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '注销账号', null, 0, false))

@@ -5,13 +5,13 @@
         "name": "default",
         "name": "default",
         "type": "HarmonyOS",
         "type": "HarmonyOS",
         "material": {
         "material": {
-          "certpath": "C:\\Users\\PC\\.ohos\\config\\default_sight_harmony_vDjosN2opayZneQDLiBs3Lc0sT1uPzRAYaDxxv2LWEQ=.cer",
-          "storePassword": "0000001A87430EDC6C0D1CD6A6473A6D385177DBFF70325BBD48C7E491A0D9B37F91920FD46D82B2436B",
+          "certpath": "/Users/ysy/.ohos/config/auto_debug_sight_harmony_com.wondertek.sight_30086000745972390.cer",
+          "storePassword": "0000001AD1ABE6FB1D5AEC538066BBDCACCDF8DFB85BA89D4A7B163112F48FDFAD37222DD5D2FBC6738C",
           "keyAlias": "debugKey",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001A8E615E1CB276AA122C291AFBCDFF792FEE8AA618B186EE7C99220C7F549B8C2ED6A209703D75",
-          "profile": "C:\\Users\\PC\\.ohos\\config\\default_sight_harmony_vDjosN2opayZneQDLiBs3Lc0sT1uPzRAYaDxxv2LWEQ=.p7b",
+          "keyPassword": "0000001AA4301CF4CB6CD92BFD749A3C09BC771B02A1E544A47EBBC557DB27E8150CB2AB5CB13029999D",
+          "profile": "/Users/ysy/.ohos/config/auto_debug_sight_harmony_com.wondertek.sight_30086000745972390.p7b",
           "signAlg": "SHA256withECDSA",
           "signAlg": "SHA256withECDSA",
-          "storeFile": "C:\\Users\\PC\\.ohos\\config\\default_sight_harmony_vDjosN2opayZneQDLiBs3Lc0sT1uPzRAYaDxxv2LWEQ=.p12"
+          "storeFile": "/Users/ysy/.ohos/config/auto_debug_sight_harmony_com.wondertek.sight_30086000745972390.p12"
         }
         }
       }
       }
     ],
     ],

@@ -29,3 +29,5 @@ export { DeviceUtil } from './src/main/ets/utils/DeviceUtil'
 export { DisplayUtils } from './src/main/ets/utils/DisplayUtils'
 export { DisplayUtils } from './src/main/ets/utils/DisplayUtils'
 
 
 export { SystemUtils } from './src/main/ets/utils/SystemUtils'
 export { SystemUtils } from './src/main/ets/utils/SystemUtils'
+
+export { PermissionUtil } from './src/main/ets/utils/PermissionUtil'

+import bundleManager from '@ohos.bundle.bundleManager';
+import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
+import common from '@ohos.app.ability.common';
+import featureAbility from '@ohos.ability.featureAbility';
+import wantConstant from '@ohos.ability.wantConstant';
+
+export class PermissionUtil {
+  async checkAccessToken(permission: Permissions): Promise<abilityAccessCtrl.GrantStatus> {
+    let atManager = abilityAccessCtrl.createAtManager();
+    let grantStatus: abilityAccessCtrl.GrantStatus = abilityAccessCtrl.GrantStatus.PERMISSION_DENIED;
+
+    // 获取应用程序的accessTokenID
+    let tokenId: number = 0;
+    try {
+      let bundleInfo: bundleManager.BundleInfo = await bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
+      let appInfo: bundleManager.ApplicationInfo = bundleInfo.appInfo;
+      tokenId = appInfo.accessTokenId;
+    } catch (err) {
+      console.error(`getBundleInfoForSelf failed, code is ${err.code}, message is ${err.message}`);
+    }
+
+    // 校验应用是否被授予权限
+    try {
+      grantStatus = await atManager.checkAccessToken(tokenId, permission);
+    } catch (err) {
+      console.error(`checkAccessToken failed, code is ${err.code}, message is ${err.message}`);
+    }
+
+    return grantStatus;
+  }
+
+  async checkPermissions(permission: Permissions): Promise<boolean> {
+    let hasPermissions = false;
+    let grantStatus: abilityAccessCtrl.GrantStatus = await this.checkAccessToken(permission);
+
+    if (grantStatus === abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) {
+      // 已经授权，可以继续访问目标操作
+      hasPermissions = true;
+    } else {
+      hasPermissions = false;
+      // 申请日历权限
+    }
+    return hasPermissions;
+  }
+
+  static reqPermissionsFromUser(permissions: Array<Permissions>): void {
+    // let context = getContext(this) as common.UIAbilityContext;
+    // let atManager = abilityAccessCtrl.createAtManager();
+    // // requestPermissionsFromUser会判断权限的授权状态来决定是否唤起弹窗
+    // atManager.requestPermissionsFromUser(context, permissions).then((data) => {
+    //   let grantStatus: Array<number> = data.authResults;
+    //   let length: number = grantStatus.length;
+    //   for (let i = 0; i < length; i++) {
+    //     if (grantStatus[i] === 0) {
+    //       // 用户授权，可以继续访问目标操作
+    //
+    //     } else {
+    //
+    //       this.jumpSetting();
+    //       // 用户拒绝授权，提示用户必须授权才能访问当前页面的功能，并引导用户到系统设置中打开相应的权限
+    //       AlertDialog.show({
+    //         title: '权限设置',
+    //         message: '到系统设置中打开相应的权限',
+    //         confirm: {
+    //           value: "OK",
+    //           action: () => {
+    //
+    //           },
+    //         }
+    //       })
+    //       return;
+    //     }
+    //   }
+    //   // 授权成功
+    // }).catch((err) => {
+    //   console.error(`requestPermissionsFromUser failed, code is ${err.code}, message is ${err.message}`);
+    // })
+  }
+
+
+  static  jumpSetting() {
+
+  }
+}

@@ -81,6 +81,11 @@ export class HttpUrlUtils {
    * 我的收藏
    * 我的收藏
    */
    */
   static readonly APPOINTMENT_MyCollectionList_PATH: string = "/api/rmrb-interact/content/zh/c/interact";
   static readonly APPOINTMENT_MyCollectionList_PATH: string = "/api/rmrb-interact/content/zh/c/interact";
+
+  /**
+   * 个人中心  我的评论列表
+   */
+  static readonly MINE_COMMENT_LIST_DATA_PATH: string = "/api/rmrb-comment/comment/zh/c/myCommentList";
   /**
   /**
    * 早晚报列表
    * 早晚报列表
    * 根据页面id获取页面楼层列表
    * 根据页面id获取页面楼层列表
@@ -305,6 +310,11 @@ export class HttpUrlUtils {
     return url
     return url
   }
   }
 
 
+  static getMineCommentListDataUrl() {
+    let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH
+    return url
+  }
+
   static getYcgCommonHeaders(): HashMap<string, string> {
   static getYcgCommonHeaders(): HashMap<string, string> {
     let headers: HashMap<string, string> = new HashMap<string, string>()
     let headers: HashMap<string, string> = new HashMap<string, string>()
 
 

@@ -54,6 +54,8 @@ export function registerRouter() {
     // }
     // }
     if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
     if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
       return WDRouterPage.detailPlayShortVideoPage
       return WDRouterPage.detailPlayShortVideoPage
+    } else if (action.params?.detailPageType == 9 ) {
+      return WDRouterPage.multiPictureDetailPage
     }
     }
     return WDRouterPage.detailPlayVodPage
     return WDRouterPage.detailPlayVodPage
   })
   })

@@ -32,6 +32,8 @@ export class WDRouterPage {
   static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");
   static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");
   // 直播详情页
   // 直播详情页
   static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");
   static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");
+  // 多图(图集)详情页
+  static multiPictureDetailPage = new WDRouterPage("phone", "ets/pages/detail/MultiPictureDetailPage");
 
 
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
 
 
@@ -51,4 +53,16 @@ export class WDRouterPage {
   //我的收藏
   //我的收藏
   static myCollectionListPagePage = new WDRouterPage("wdComponent", "ets/components/page/MyCollectionListPage");
   static myCollectionListPagePage = new WDRouterPage("wdComponent", "ets/components/page/MyCollectionListPage");
   static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
   static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
+  //我的主页
+  static mineHomePage = new WDRouterPage("wdComponent", "ets/pages/MineHomePage");
+  // 隐私设置页
+  static privacySettingPage = new WDRouterPage("wdComponent", "ets/components/page/PrivacySettingPage");
+  // 关于页
+  static aboutPage = new WDRouterPage("wdComponent", "ets/components/page/SettingAboutPage");
+  // 设置页
+  static settingPage = new WDRouterPage("wdComponent", "ets/components/page/SettingPage");
+  // 账户与安全页
+  // static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
+  // 设置密码页、设置手机号页等等 (需要传参)
+  // static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
 }
 }

@@ -16,5 +16,6 @@ export interface Params {
   // 6.挂件详情页
   // 6.挂件详情页
   // 7.沉浸式竖屏详情页
   // 7.沉浸式竖屏详情页
   // 8.专辑竖屏详情页
   // 8.专辑竖屏详情页
+  // 9.多图（图集）详情页
   detailPageType?:number; // 详情页类型
   detailPageType?:number; // 详情页类型
 }
 }

-import { CompDTO } from 'wdBean';
+import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { BannerComponent } from './view/BannerComponent';
 import { BannerComponent } from './view/BannerComponent';
 import { LabelComponent } from './view/LabelComponent';
 import { LabelComponent } from './view/LabelComponent';
@@ -16,14 +16,78 @@ import {
 import {
 import {
   HorizontalStrokeCardThreeTwoRadioForOneComponent
   HorizontalStrokeCardThreeTwoRadioForOneComponent
 } from './view/HorizontalStrokeCardThreeTwoRadioForOneComponent';
 } from './view/HorizontalStrokeCardThreeTwoRadioForOneComponent';
+import {
+  HorizontalStrokeCardThreeTwoRadioForTwoComponent
+} from './view/HorizontalStrokeCardThreeTwoRadioForTwoComponent';
 import { AlbumCardComponent } from './view/AlbumCardComponent';
 import { AlbumCardComponent } from './view/AlbumCardComponent';
 
 
 /**
 /**
  * comp适配器.
  * comp适配器.
  */
  */
+@Preview
 @Component
 @Component
 export struct CompParser {
 export struct CompParser {
-  compDTO: CompDTO = {} as CompDTO;
+  @State compDTO: CompDTO = {
+    compStyle: '17',
+    imageScale: 3,
+    operDataList: [
+      {
+        title: 'title0',
+        description: "description0",
+        coverUrl: 'https://uatjdcdnphoto.aikan.pdnews' +
+          '.cn/sjbj-20231208/image/display/d4496925a1264a749975ae9b01a4ef46.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+        fullColumnImgUrls: [{
+          url: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240104/image/display/c4a9b526e0994d1bbd3ac8450f5cfc6c.jpg?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+        },{
+          url:'https://uatjdcdnphoto.aikan.pdnews' +
+            '.cn/sjbj-20231208/image/display/d4496925a1264a749975ae9b01a4ef46.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+        },{
+          url: 'https://uatjdcdnphoto.aikan.pdnews' +
+            '.cn/sjbj-20231208/image/display/d4496925a1264a749975ae9b01a4ef46.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+        }]
+      } as ContentDTO,
+      {
+        title: 'title1 title1 title1 title1 title1 title1 title1 title1 title1',
+        description: "description1",
+        coverUrl: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240104/image/display/c4a9b526e0994d1bbd3ac8450f5cfc6c.jpg?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+      } as ContentDTO,
+      {
+        title: 'title2',
+        description: "description2",
+        coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/sjbj-20231206/image/live/bbe6d821e92b48919d90c7dadfd1f05a.jpg?x-oss-process=image/resize,l_850/auto-orient,1/quality,q_95/format,jpg",
+      } as ContentDTO,
+      {
+        title: 'title3',
+        description: "description3",
+        coverUrl: 'https://cdnjdphoto.aikan.pdnews.cn/sjbj-20231109/image/live/102e6eb9356b4ef19405b04c1f6ff875.png?x-oss-process=image/resize,l_850/auto-orient,1/quality,q_95/format,jpg'
+      } as ContentDTO,
+      {
+        title: 'title4',
+        description: "description4",
+        coverUrl: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20231218/image/display/62bdbbb35dbd45689e00790c81f04c4b.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+      } as ContentDTO,
+      {
+        title: 'title5',
+        description: "description5",
+        coverUrl: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20231218/image/display/f79bbaa5a33b4bd88176071c4f797ff6.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+      } as ContentDTO,
+      {
+        title: 'title6',
+        description: "description6",
+        coverUrl: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20231218/image/display/2c1d917009584ce2bb4a35cbb3a860a0.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+      } as ContentDTO,
+      {
+        title: 'title7',
+        description: "description7",
+        coverUrl: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20231222/image/display/117dc516ca5c42d5843c0d32050c9fc6.jpeg?x-oss-process=image/resize,w_240/quality,q_90/format,jpg",
+      } as ContentDTO,
+      {
+        title: 'title8',
+        description: "description8",
+        coverUrl: "https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20231228/image/display/90a2db4077d44a1f887f068fc659d977.jpeg?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+      } as ContentDTO
+    ]
+  } as CompDTO
   compIndex: number = 0;
   compIndex: number = 0;
 
 
   build() {
   build() {

 import { NewspaperListBean, NewspaperListItemBean } from 'wdBean';
 import { NewspaperListBean, NewspaperListItemBean } from 'wdBean';
 import { NewspaperViewModel } from '../viewmodel/NewspaperViewModel';
 import { NewspaperViewModel } from '../viewmodel/NewspaperViewModel';
 import router from '@ohos.router';
 import router from '@ohos.router';
-import { Logger } from 'wdKit';
 import { ENewspaperItemComponent } from './ENewspaperItemComponent';
 import { ENewspaperItemComponent } from './ENewspaperItemComponent';
 import { ENewspaperListDialog } from '../dialog/ENewspaperListDialog';
 import { ENewspaperListDialog } from '../dialog/ENewspaperListDialog';
 import display from '@ohos.display';
 import display from '@ohos.display';
 import { ENewspaperCalendarDialog } from '../dialog/ENewspaperCalendarDialog';
 import { ENewspaperCalendarDialog } from '../dialog/ENewspaperCalendarDialog';
 import font from '@ohos.font';
 import font from '@ohos.font';
+import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog';
+import { RMCalendarBean } from './calendar/RMCalendarBean';
 
 
 @Component
 @Component
 export struct ENewspaperPageComponent {
 export struct ENewspaperPageComponent {
-  @State newspaperListBean: NewspaperListBean = {} as NewspaperListBean
-  @State currentPageNum: string = '01'
-  @State pageNumPopup: boolean = false
-  @State calendarPopup: boolean = false
-  @State calendarDateTitle: string = ''
+  private displayTool = display.getDefaultDisplaySync()
+  private screenWidth: number = 0
+  private picWidth: number = 0
   @State picHeight: number = 0
   @State picHeight: number = 0
+  @State newspaperListBean: NewspaperListBean = {} as NewspaperListBean
+  @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
+  @State pageDialogShow: boolean = false
+  @State calendarDialogShow: boolean = false
+  @State calendarDate: string = ''
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
+  @State swiperIndex: number = 0;
+
+  //watch监听报纸页码回调
+  onCurrentPageNumUpdated(): void {
+    console.log("ENewspaperPageComponent-onCurrentPageNumUpdated", "currentPageNum：", this.currentPageNum)
+    let _swiperIndex = Number.parseInt(this.currentPageNum)
+    console.log("ENewspaperPageComponent-onCurrentPageNumUpdated", "_swiperIndex：", _swiperIndex)
+    this.swiperIndex = _swiperIndex > 0 ? _swiperIndex - 1 : _swiperIndex
+  }
+
+  //日历选择弹框
   calendarDialogController: CustomDialogController = new CustomDialogController({
   calendarDialogController: CustomDialogController = new CustomDialogController({
-    builder: ENewspaperCalendarDialog(),
+    builder: ENewspaperCalendarDialog({
+      onDateChange: (date: RMCalendarBean) => {
+        console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date))
+        if (date.fullYear && date.month && date.date) {
+          this.calendarDate = `${date.fullYear}-${date.month > 9 ? date.month + 1 : '0' + (date.month + 1)}-${date.date > 9 ? date.date : '0' + date.date}`
+          this.getNewspaperTime()
+          this.getNewspaperList()
+        }
+      }
+    }),
     alignment: DialogAlignment.Top,
     alignment: DialogAlignment.Top,
     offset: { dx: 0, dy: 80 },
     offset: { dx: 0, dy: 80 },
     customStyle: true,
     customStyle: true,
-    // cornerRadius: 4
   })
   })
+  //图片版选择弹框
+  pageDialogController: CustomDialogController = new CustomDialogController({
+    builder: ENewspaperPageDialog({
+      dialogType: 0,
+      newspaperListBean: this.newspaperListBean,
+    }),
+    alignment: DialogAlignment.BottomStart,
+    offset: { dx: 0, dy: -90 },
+    customStyle: true,
+  })
+  //文字报纸弹框
   listDialogController: CustomDialogController = new CustomDialogController({
   listDialogController: CustomDialogController = new CustomDialogController({
-    builder: ENewspaperListDialog({ newspaperListBean: this.newspaperListBean,
-      currentPageNum: this.currentPageNum,
+    builder: ENewspaperListDialog({
+      newspaperListBean: this.newspaperListBean
     }),
     }),
-    alignment: DialogAlignment.Bottom
+    alignment: DialogAlignment.Bottom,
+    offset: { dx: 0, dy: 0 }
   })
   })
 
 
-  @Builder
-  popupBuilder() {
-    Row() {
-      GridRow({ columns: 5 }) {
-        ForEach(this.newspaperListBean.list, (item: NewspaperListItemBean, index) => {
-          GridCol() {
-            Row() {
-              Text(item.pageNum)
-                .fontSize($r('app.float.normal_text_size'))
-                .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222'))
-            }
-            .alignItems(VerticalAlign.Center)
-            .justifyContent(FlexAlign.Center)
-            .width(30)
-            .height(30)
-            .backgroundColor(this.currentPageNum != item.pageNum ? Color.White : $r('app.color.color_ED2800'))
-            .onClick((event: ClickEvent) => {
-              this.pageNumPopup = !this.pageNumPopup
-            })
-          }
-        })
-      }
-    }
-    .padding({ top: 20, bottom: 20 })
-    .margin({ left: 10 })
-    .width(260)
+  async aboutToAppear() {
+    //获取宽高尺寸
+    this.screenWidth = this.displayTool.width
+    this.picWidth = this.screenWidth - vp2px(52)
+    this.picHeight = this.picWidth * 566 / 378
+    //注册字体
+    font.registerFont({
+      familyName: 'BebasNeue_Regular',
+      familySrc: $rawfile('font/BebasNeue_Regular.otf')
+    })
+    this.getNewspaperTime()
+    this.getNewspaperList()
+  }
+
+  aboutToDisappear() {
+    // if (this.calendarDialogController) {
+    //   this.calendarDialogController = null
+    // }
+    // if (this.listDialogController) {
+    //   this.listDialogController = null
+    // }
   }
   }
 
 
   build() {
   build() {
@@ -65,19 +95,21 @@ export struct ENewspaperPageComponent {
         Image($r('app.media.icon_arrow_down'))
         Image($r('app.media.icon_arrow_down'))
           .height($r('app.float.top_arrow_size'))
           .height($r('app.float.top_arrow_size'))
           .width($r('app.float.top_arrow_size'))
           .width($r('app.float.top_arrow_size'))
-          .alignRules({ left: { anchor: "__container__", align: HorizontalAlign.Start },
-            center: { anchor: "__container__", align: VerticalAlign.Center } })
+          .alignRules({
+            left: { anchor: "__container__", align: HorizontalAlign.Start },
+            center: { anchor: "__container__", align: VerticalAlign.Center }
+          })
           .id('e_newspaper_back')
           .id('e_newspaper_back')
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
-            Logger.info("sfsfsd", "" + vp2px(10))
             router.back()
             router.back()
           })
           })
 
 
         Row() {
         Row() {
-          Text(this.calendarDateTitle)
+          Text(this.calendarDate)
             .fontSize($r('app.float.font_size_20'))
             .fontSize($r('app.float.font_size_20'))
             .fontColor($r('app.color.white'))
             .fontColor($r('app.color.white'))
             .fontFamily('BebasNeue_Regular')
             .fontFamily('BebasNeue_Regular')
+            .fontWeight(FontWeight.Bold)
 
 
           Image($r('app.media.icon_triangle'))
           Image($r('app.media.icon_triangle'))
             .width($r('app.float.border_radius_6'))
             .width($r('app.float.border_radius_6'))
@@ -85,12 +117,14 @@ export struct ENewspaperPageComponent {
             .margin({ left: 2, bottom: 5 })
             .margin({ left: 2, bottom: 5 })
         }
         }
         .alignItems(VerticalAlign.Bottom)
         .alignItems(VerticalAlign.Bottom)
-        .alignRules({ middle: { anchor: "__container__", align: HorizontalAlign.Center },
-          center: { anchor: "__container__", align: VerticalAlign.Center } })
+        .alignRules({
+          middle: { anchor: "__container__", align: HorizontalAlign.Center },
+          center: { anchor: "__container__", align: VerticalAlign.Center }
+        })
         .id('e_newspaper_date')
         .id('e_newspaper_date')
         .onClick(() => {
         .onClick(() => {
-          this.calendarPopup = !this.calendarPopup
-          if (this.calendarPopup) {
+          this.calendarDialogShow = !this.calendarDialogShow
+          if (this.calendarDialogShow) {
             this.calendarDialogController.open()
             this.calendarDialogController.open()
           } else {
           } else {
             this.calendarDialogController.close()
             this.calendarDialogController.close()
@@ -100,15 +134,19 @@ export struct ENewspaperPageComponent {
         Image($r('app.media.icon_share'))
         Image($r('app.media.icon_share'))
           .height($r('app.float.top_arrow_size'))
           .height($r('app.float.top_arrow_size'))
           .width($r('app.float.top_arrow_size'))
           .width($r('app.float.top_arrow_size'))
-          .alignRules({ right: { anchor: "__container__", align: HorizontalAlign.End },
-            center: { anchor: "__container__", align: VerticalAlign.Center } })
+          .alignRules({
+            right: { anchor: "__container__", align: HorizontalAlign.End },
+            center: { anchor: "__container__", align: VerticalAlign.Center }
+          })
           .id('e_newspaper_share')
           .id('e_newspaper_share')
       }
       }
       .margin({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
       .margin({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
       .height($r('app.float.top_bar_height'))
       .height($r('app.float.top_bar_height'))
-      .alignRules({ top: { anchor: '__container__', align: VerticalAlign.Top },
+      .alignRules({
+        top: { anchor: '__container__', align: VerticalAlign.Top },
         left: { anchor: '__container__', align: HorizontalAlign.Start },
         left: { anchor: '__container__', align: HorizontalAlign.Start },
-        right: { anchor: '__container__', align: HorizontalAlign.End } })
+        right: { anchor: '__container__', align: HorizontalAlign.End }
+      })
       .id('e_newspaper_top')
       .id('e_newspaper_top')
 
 
       if (this.newspaperListBean && this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
       if (this.newspaperListBean && this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
@@ -117,6 +155,7 @@ export struct ENewspaperPageComponent {
             ENewspaperItemComponent({ newspaperListItemBean: item })
             ENewspaperItemComponent({ newspaperListItemBean: item })
           })
           })
         }
         }
+        .index(this.swiperIndex)
         .width('100%')
         .width('100%')
         .height(px2vp(this.picHeight) + 32)
         .height(px2vp(this.picHeight) + 32)
         .vertical(true)
         .vertical(true)
@@ -126,19 +165,24 @@ export struct ENewspaperPageComponent {
         .displayCount(1)
         .displayCount(1)
         .margin({ top: 35, left: 10, right: 10 })
         .margin({ top: 35, left: 10, right: 10 })
         .id('e_newspaper_content')
         .id('e_newspaper_content')
-        .alignRules({ top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
-          middle: { anchor: "__container__", align: HorizontalAlign.Center } })
+        .alignRules({
+          top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
+          middle: { anchor: "__container__", align: HorizontalAlign.Center }
+        })
         .onChange((index: number) => {
         .onChange((index: number) => {
           this.currentPageNum = this.newspaperListBean?.list[index]?.pageNum
           this.currentPageNum = this.newspaperListBean?.list[index]?.pageNum
+          this.swiperIndex = index
         })
         })
 
 
         Image($r('app.media.newspaper_shadow'))
         Image($r('app.media.newspaper_shadow'))
           .height($r('app.float.vp_12'))
           .height($r('app.float.vp_12'))
           .margin({ left: 20, right: 20, top: -1 })
           .margin({ left: 20, right: 20, top: -1 })
           .objectFit(ImageFit.Contain)
           .objectFit(ImageFit.Contain)
-          .alignRules({ top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
+          .alignRules({
+            top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
             left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
             left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
-            right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End } })
+            right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
+          })
           .id('e_newspaper_shadow')
           .id('e_newspaper_shadow')
 
 
         Row() {
         Row() {
@@ -151,8 +195,10 @@ export struct ENewspaperPageComponent {
         }
         }
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
         .margin({ top: $r('app.float.margin_16') })
         .margin({ top: $r('app.float.margin_16') })
-        .alignRules({ top: { anchor: "e_newspaper_shadow", align: VerticalAlign.Bottom },
-          middle: { anchor: "__container__", align: HorizontalAlign.Center } })
+        .alignRules({
+          top: { anchor: "e_newspaper_shadow", align: VerticalAlign.Bottom },
+          middle: { anchor: "__container__", align: HorizontalAlign.Center }
+        })
         .id('e_newspaper_next')
         .id('e_newspaper_next')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
           this.swiperController.showNext()
           this.swiperController.showNext()
@@ -163,6 +209,7 @@ export struct ENewspaperPageComponent {
         Text(this.currentPageNum)
         Text(this.currentPageNum)
           .fontSize($r('app.float.font_size_36'))
           .fontSize($r('app.float.font_size_36'))
           .fontColor($r('app.color.white'))
           .fontColor($r('app.color.white'))
+          .fontFamily('BebasNeue_Regular')
         Text('版')
         Text('版')
           .fontSize($r('app.float.font_size_16'))
           .fontSize($r('app.float.font_size_16'))
           .fontColor($r('app.color.white'))
           .fontColor($r('app.color.white'))
@@ -175,18 +222,26 @@ export struct ENewspaperPageComponent {
       }
       }
       .alignItems(VerticalAlign.Bottom)
       .alignItems(VerticalAlign.Bottom)
       .margin({ left: $r('app.float.margin_16'), bottom: $r('app.float.top_tab_bar_height') })
       .margin({ left: $r('app.float.margin_16'), bottom: $r('app.float.top_tab_bar_height') })
-      .alignRules({ bottom: { anchor: '__container__', align: VerticalAlign.Bottom },
-        left: { anchor: '__container__', align: HorizontalAlign.Start } })
+      .alignRules({
+        bottom: { anchor: '__container__', align: VerticalAlign.Bottom },
+        left: { anchor: '__container__', align: HorizontalAlign.Start }
+      })
       .id('e_newspaper_page_num')
       .id('e_newspaper_page_num')
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
-        this.pageNumPopup = !this.pageNumPopup
-      })
-      .bindPopup(this.pageNumPopup, {
-        builder: this.popupBuilder,
-        placement: Placement.Top,
-        popupColor: Color.White
+        this.pageDialogShow = !this.pageDialogShow
+        if (this.pageDialogShow) {
+          this.pageDialogController.open()
+        } else {
+          this.pageDialogController.close()
+        }
       })
       })
 
 
+      // .bindPopup(this.pageNumPopup, {
+      //   builder: this.popupBuilder,
+      //   placement: Placement.Top,
+      //   popupColor: Color.White
+      // })
+
       Row() {
       Row() {
         Image($r('app.media.icon_read_paper'))
         Image($r('app.media.icon_read_paper'))
           .width($r('app.float.vp_20'))
           .width($r('app.float.vp_20'))
@@ -198,8 +253,10 @@ export struct ENewspaperPageComponent {
       }
       }
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .margin({ right: $r('app.float.margin_16'), bottom: $r('app.float.top_tab_bar_height') })
       .margin({ right: $r('app.float.margin_16'), bottom: $r('app.float.top_tab_bar_height') })
-      .alignRules({ bottom: { anchor: '__container__', align: VerticalAlign.Bottom },
-        right: { anchor: '__container__', align: HorizontalAlign.End } })
+      .alignRules({
+        bottom: { anchor: '__container__', align: VerticalAlign.Bottom },
+        right: { anchor: '__container__', align: HorizontalAlign.End }
+      })
       .id('e_newspaper_read')
       .id('e_newspaper_read')
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
         this.listDialogController.open()
         this.listDialogController.open()
@@ -211,23 +268,17 @@ export struct ENewspaperPageComponent {
     .id('e_newspaper_container')
     .id('e_newspaper_container')
   }
   }
 
 
-  async aboutToAppear() {
-    //注册字体
-    font.registerFont({
-      familyName: 'BebasNeue_Regular',
-      // familySrc: '/font/roboto_medium_numbers.ttf' // font文件夹与pages目录同级
-      familySrc: $rawfile('font/BebasNeue_Regular.otf')
-    })
-    let newspaperTimes = await NewspaperViewModel.getNewspaperTime()
+  private async getNewspaperTime() {
+    let newspaperTimes = await NewspaperViewModel.getNewspaperTime(this.calendarDate)
     if (newspaperTimes && newspaperTimes.length > 0) {
     if (newspaperTimes && newspaperTimes.length > 0) {
-      this.calendarDateTitle = newspaperTimes[0].date
+      this.calendarDate = newspaperTimes[0].date
+      this.currentPageNum = '01'
     }
     }
+  }
+
+  private async getNewspaperList() {
     try {
     try {
-      let displayTool = display.getDefaultDisplaySync()
-      let screenWidth = displayTool.width
-      let picWidth = screenWidth - vp2px(52)
-      this.picHeight = picWidth * 566 / 378
-      let listBean = await NewspaperViewModel.getNewspaperList(this.calendarDateTitle, picWidth + 'x' + this.picHeight)
+      let listBean = await NewspaperViewModel.getNewspaperList(this.calendarDate, this.picWidth + 'x' + this.picHeight)
       this.newspaperListBean = listBean;
       this.newspaperListBean = listBean;
     } catch (exception) {
     } catch (exception) {
 
 

 // import { FrontLinkObject, MorningEveningPaperDTO, PageInfoBean } from 'wdBean';
 // import { FrontLinkObject, MorningEveningPaperDTO, PageInfoBean } from 'wdBean';
-import { PageInfoBean } from 'wdBean';
+import { CompList, PageInfoBean } from 'wdBean';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
 import { MorningEveningViewModel } from '../../viewmodel/MorningEveningViewModel';
 import { MorningEveningViewModel } from '../../viewmodel/MorningEveningViewModel';
 import { AudioBarView } from './AudioBarView';
 import { AudioBarView } from './AudioBarView';
@@ -15,6 +15,9 @@ const PATTERN_DATE_CN_RN: string = 'yyyy年\nMM月dd日'; // 日期中包含包
 @Component
 @Component
 export struct MorningEveningPaperComponent {
 export struct MorningEveningPaperComponent {
   @State pageInfoBean: PageInfoBean = {} as PageInfoBean
   @State pageInfoBean: PageInfoBean = {} as PageInfoBean
+  // @State compInfoBean: CompInfoBean = {} as CompInfoBean
+  @State compListItem: CompList = {} as CompList
+  // @Provide compListItem: CompList = {} as CompList
   // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
   // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
   //   name: "新闻夜读",
   //   name: "新闻夜读",
   //   topicInfo: {
   //   topicInfo: {
@@ -31,7 +34,8 @@ export struct MorningEveningPaperComponent {
   //     topicId: "10000002068",
   //     topicId: "10000002068",
   //   }
   //   }
   // } as MorningEveningPaperDTO
   // } as MorningEveningPaperDTO
-  @State subTitle: string = ''
+  @Provide title: string = ''
+  @Provide subTitle: string = ''
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     console.info(TAG, `aboutToAppear`)
     console.info(TAG, `aboutToAppear`)
@@ -40,8 +44,9 @@ export struct MorningEveningPaperComponent {
     Logger.info(TAG, "currentTime = " + currentTime)
     Logger.info(TAG, "currentTime = " + currentTime)
     Logger.info(TAG, `currentTime = ${currentTime}`)
     Logger.info(TAG, `currentTime = ${currentTime}`)
     try {
     try {
-      let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("28927")
+      let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("28949")
       this.pageInfoBean = pageInfoBean;
       this.pageInfoBean = pageInfoBean;
+      this.title = this.pageInfoBean?.topicInfo?.title
       let dateTime = DateTimeUtils.parseDate(this.pageInfoBean?.topicInfo?.topicDate ?? '', DateTimeUtils.PATTERN_DATE_HYPHEN);
       let dateTime = DateTimeUtils.parseDate(this.pageInfoBean?.topicInfo?.topicDate ?? '', DateTimeUtils.PATTERN_DATE_HYPHEN);
       this.subTitle = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
       this.subTitle = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
       Logger.info(TAG, "pageInfoBean topicDate = " + this.pageInfoBean?.topicInfo?.topicDate)
       Logger.info(TAG, "pageInfoBean topicDate = " + this.pageInfoBean?.topicInfo?.topicDate)
@@ -50,7 +55,12 @@ export struct MorningEveningPaperComponent {
       Logger.info(TAG, "pageInfoBean dateTime = " + dateTime)
       Logger.info(TAG, "pageInfoBean dateTime = " + dateTime)
       Logger.info(TAG, "pageInfoBean subTitle = " + this.subTitle)
       Logger.info(TAG, "pageInfoBean subTitle = " + this.subTitle)
 
 
-      let compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "")
+      let compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "", pageInfoBean?.topicInfo?.topicId)
+      // this.compInfoBean = compInfoBean
+      if (compInfoBean?.compList[0]) {
+        this.compListItem = compInfoBean?.compList[0]
+      }
+
       Logger.info(TAG, "compInfoBean compStyle = " + compInfoBean.compList[0].compStyle)
       Logger.info(TAG, "compInfoBean compStyle = " + compInfoBean.compList[0].compStyle)
     } catch (exception) {
     } catch (exception) {
 
 
@@ -65,31 +75,33 @@ export struct MorningEveningPaperComponent {
           ListItem() {
           ListItem() {
             topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
             topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
           }
           }
-        }
 
 
-        ListItem() {
-          AudioBarView()
+          ListItem() {
+            AudioBarView()
+          }
         }
         }
 
 
         ListItem() {
         ListItem() {
-          SingleColumn999Component()
+          SingleColumn999Component({ compListItem: this.compListItem }).margin({ top: $r('app.float.top_bar_height') })
         }
         }
       }
       }
       // .backgroundColor('#FFF1F3F5')
       // .backgroundColor('#FFF1F3F5')
       // .backgroundColor(Color.Blue)
       // .backgroundColor(Color.Blue)
       .height('100%')
       .height('100%')
-      .margin({ left: 14, right: 14 })
 
 
-      PaperTitleComponent({
-        // title: this.morningEveningPaperDTO?.topicInfo?.title ?? "",
-        title: this.pageInfoBean?.topicInfo?.title ?? "",
-        // subtitle: this.morningEveningPaperDTO?.topicInfo?.topicDate ?? ''
-        subtitle: this.subTitle
-      })
+      // .margin({ left: 12, right: 12 })
+
+      PaperTitleComponent()// PaperTitleComponent({
+        //   // title: this.morningEveningPaperDTO?.topicInfo?.title ?? "",
+        //   title: this.title  ?? "",
+        //   // subtitle: this.morningEveningPaperDTO?.topicInfo?.topicDate ?? ''
+        //   subtitle: this.subTitle
+        // })
         .margin({ left: 14, right: 14 })
         .margin({ left: 14, right: 14 })
     }
     }
     .width('100%')
     .width('100%')
     // .backgroundColor('#000080')
     // .backgroundColor('#000080')
-    .backgroundColor(Color.Black)
+    // .backgroundColor(Color.Black)
+    .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
   }
   }
 }
 }

@@ -3,11 +3,11 @@ import router from '@ohos.router';
 /**
 /**
  * 早晚报页面标题bar
  * 早晚报页面标题bar
  */
  */
-@Entry
+// @Entry
 @Component
 @Component
 export struct PaperTitleComponent {
 export struct PaperTitleComponent {
-  @State title?: string = 'title'
-  @State subtitle?: string = 'subtitle'
+  @Consume title?: string
+  @Consume subTitle?: string
 
 
   aboutToAppear() {
   aboutToAppear() {
   }
   }
@@ -31,7 +31,7 @@ export struct PaperTitleComponent {
           .fontColor($r('app.color.white'))
           .fontColor($r('app.color.white'))
           .maxLines(1)
           .maxLines(1)
 
 
-        Text(this.subtitle ?? '')// Text('2024年\n1月16日')
+        Text(this.subTitle ?? '')// Text('2024年\n1月16日')
           // .width(50)
           // .width(50)
           .margin({ left: 5 })
           .margin({ left: 5 })
           .fontSize(12)
           .fontSize(12)
@@ -61,6 +61,7 @@ export struct PaperTitleComponent {
           // console.info(TAG, "img_close")
           // console.info(TAG, "img_close")
           router.back()
           router.back()
         })
         })
+        .margin({ right: 16 })
 
 
       Image($r('app.media.icon_share'))
       Image($r('app.media.icon_share'))
         .height($r('app.float.top_arrow_size'))
         .height($r('app.float.top_arrow_size'))
@@ -69,9 +70,11 @@ export struct PaperTitleComponent {
           right: { anchor: "img_close", align: HorizontalAlign.Start },
           right: { anchor: "img_close", align: HorizontalAlign.Start },
           center: { anchor: "__container__", align: VerticalAlign.Center } })
           center: { anchor: "__container__", align: VerticalAlign.Center } })
         .id('img_share')
         .id('img_share')
+        .margin({ right: 13 })
     }
     }
     // .margin({ left: 14, right: 14 })
     // .margin({ left: 14, right: 14 })
     .height($r('app.float.top_bar_height'))
     .height($r('app.float.top_bar_height'))
-    .backgroundColor(Color.Black)
+
+    // .backgroundColor(Color.Black)
   }
   }
 }
 }

-import { CompDTO, ContentDTO, VideoInfoDTO, } from 'wdBean';
+import { CompList, ContentDTO } from 'wdBean';
 import { BreakpointConstants } from 'wdConstant';
 import { BreakpointConstants } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { PaperSingleColumn999CardView } from '../page/CardView';
 import { PaperSingleColumn999CardView } from '../page/CardView';
@@ -11,67 +11,71 @@ const TAG = 'SingleColumn999Component';
  */
  */
 @Component
 @Component
 export struct SingleColumn999Component {
 export struct SingleColumn999Component {
+  // @Consume compListItem?: CompList
+  @Prop compListItem?: CompList
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_XS;
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_XS;
-  @State compDTO: CompDTO = {
-    compStyle: 'compStyle3',
-    operDataList: [
-      {
-        newsTitle: '时政微观察丨从外贸“成绩单”看中国经济新亮色',
-        description: "description0",
-        coverUrl: 'https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/a9028e7011bb440e94ba7c63d80b39b7.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg'
-      } as ContentDTO,
-      {
-        newsTitle: '画好强国建设、民族复兴的最大同心圆',
-        description: "description1",
-        coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/sjbj-20240116/image/display/80351784d4da4fc08b8987ba45a7647f.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
-      } as ContentDTO,
-      {
-        newsTitle: '绿色“一带一路”十周年创新理念与实践案例',
-        description: "description2",
-        newsSummary: "共建“一带一路”倡议提出10年多来，在各方共同努力下，共建“一带一路”绿色发展取得积极进展，理念引领不断增强，交流机制不断完善，务实合作不断深化。",
-        coverUrl: "",
-      } as ContentDTO,
-      {
-        newsTitle: '瞭望 | 在深海聆听“幽灵粒子”',
-        description: "description3",
-        coverUrl: 'https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/b77a3577594d4d24b84e7b2b20e38e41.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg'
-      } as ContentDTO,
-      {
-        newsTitle: '一图读懂｜未来三年，长三角示范区安排了这些重大项目',
-        description: "description4",
-        coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/8d54ef1cbbe14ef08d6ab38f07867e4c.jpeg?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
-      } as ContentDTO,
-      {
-        newsTitle: '一头江豚的自述',
-        description: "description5",
-        newsSummary: "我是生活在长江里的一头江豚，是长江中唯一的水生哺乳动物，更是国家一级保护动物。但曾几何时，我和我的江中小伙伴出现了生存危机……直到有一天，我突然发现，打渔人变成护渔人，江水变清澈了，长江逐渐恢复了生机，我的家族数量上升到了1249头。当长江之水再一次悠悠流淌，我们相拥在清澈波光中起舞。长江，我的家园。",
-        coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/sjbj-20240116/image/display/2ec7bccff2324b05ac4b6503d868a381.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
-        visitorComment: 10,
-        videoInfo: {
-          // clarity: 0,
-          // resolutionHeight: 0,
-          // resolutionWidth: 0,
-          videoDuration: 229,
-          videoLandScape: 1,
-          // videoType: 0,
-          videoUrl: "https://cdnjdout.aikan.pdnews.cn/zhbj-20240116/vod/content/output/c72f4170db2c4d34befa453f60d39a69_opt.mp4",
-          firstFrameImageUri: ""
-        } as VideoInfoDTO
-      } as ContentDTO,
-      {
-        newsTitle: '遇见习近平丨北京正在书写历史',
-        description: "description6",
-        coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/7c54d59b63844464a261dcbba82c7aed.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
-      } as ContentDTO
-    ]
-  } as CompDTO
+
+  // @State compDTO: CompDTO = {
+  //   compStyle: 'compStyle3',
+  //   operDataList: [
+  //     {
+  //       newsTitle: '时政微观察丨从外贸“成绩单”看中国经济新亮色',
+  //       description: "description0",
+  //       coverUrl: 'https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/a9028e7011bb440e94ba7c63d80b39b7.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg'
+  //     } as ContentDTO,
+  //     {
+  //       newsTitle: '画好强国建设、民族复兴的最大同心圆',
+  //       description: "description1",
+  //       coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/sjbj-20240116/image/display/80351784d4da4fc08b8987ba45a7647f.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+  //     } as ContentDTO,
+  //     {
+  //       newsTitle: '绿色“一带一路”十周年创新理念与实践案例',
+  //       description: "description2",
+  //       newsSummary: "共建“一带一路”倡议提出10年多来，在各方共同努力下，共建“一带一路”绿色发展取得积极进展，理念引领不断增强，交流机制不断完善，务实合作不断深化。",
+  //       coverUrl: "",
+  //     } as ContentDTO,
+  //     {
+  //       newsTitle: '瞭望 | 在深海聆听“幽灵粒子”',
+  //       description: "description3",
+  //       coverUrl: 'https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/b77a3577594d4d24b84e7b2b20e38e41.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg'
+  //     } as ContentDTO,
+  //     {
+  //       newsTitle: '一图读懂｜未来三年，长三角示范区安排了这些重大项目',
+  //       description: "description4",
+  //       coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/8d54ef1cbbe14ef08d6ab38f07867e4c.jpeg?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+  //     } as ContentDTO,
+  //     {
+  //       newsTitle: '一头江豚的自述',
+  //       description: "description5",
+  //       newsSummary: "我是生活在长江里的一头江豚，是长江中唯一的水生哺乳动物，更是国家一级保护动物。但曾几何时，我和我的江中小伙伴出现了生存危机……直到有一天，我突然发现，打渔人变成护渔人，江水变清澈了，长江逐渐恢复了生机，我的家族数量上升到了1249头。当长江之水再一次悠悠流淌，我们相拥在清澈波光中起舞。长江，我的家园。",
+  //       coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/sjbj-20240116/image/display/2ec7bccff2324b05ac4b6503d868a381.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+  //       visitorComment: 10,
+  //       videoInfo: {
+  //         // clarity: 0,
+  //         // resolutionHeight: 0,
+  //         // resolutionWidth: 0,
+  //         videoDuration: 229,
+  //         videoLandScape: 1,
+  //         // videoType: 0,
+  //         videoUrl: "https://cdnjdout.aikan.pdnews.cn/zhbj-20240116/vod/content/output/c72f4170db2c4d34befa453f60d39a69_opt.mp4",
+  //         firstFrameImageUri: ""
+  //       } as VideoInfoDTO
+  //     } as ContentDTO,
+  //     {
+  //       newsTitle: '遇见习近平丨北京正在书写历史',
+  //       description: "description6",
+  //       coverUrl: "https://cdnjdphoto.aikan.pdnews.cn/zhbj-20240116/image/content/7c54d59b63844464a261dcbba82c7aed.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg",
+  //     } as ContentDTO
+  //   ]
+  // } as CompDTO
 
 
   watchCurrentBreakpoint() {
   watchCurrentBreakpoint() {
     Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
     Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    Logger.info(TAG, `aboutToAppear, beanList:${this.compDTO?.operDataList?.length}, currentBreakpoint:${this.currentBreakpoint}`);
+    // Logger.info(TAG, `aboutToAppear, beanList:${this.compDTO?.operDataList?.length}, currentBreakpoint:${this.currentBreakpoint}`);
+    Logger.info(TAG, `aboutToAppear, beanList:${this.compListItem?.operDataList?.length}, currentBreakpoint:${this.currentBreakpoint}`);
   }
   }
 
 
   aboutToDisappear() {
   aboutToDisappear() {
@@ -106,16 +110,18 @@ export struct SingleColumn999Component {
   }
   }
 
 
   build() {
   build() {
-    if (this.compDTO && this.compDTO?.operDataList?.length > 0) {
+    // if (this.compDTO && this.compDTO?.operDataList?.length > 0) {
+    if (this.compListItem && this.compListItem?.operDataList?.length > 0) {
       List({ space: 2, initialIndex: 0 }) {
       List({ space: 2, initialIndex: 0 }) {
         // ListItemGroup({
         // ListItemGroup({
         //   // footer: this.itemFooter("")
         //   // footer: this.itemFooter("")
         // }) {
         // }) {
-          ForEach(this.compDTO?.operDataList, (item: ContentDTO, index: number) => {
-            ListItem() {
-              this.buildPaperItem(item, index)
-            }
-          }, (item: ContentDTO, index: number) => JSON.stringify(item))
+        // ForEach(this.compDTO?.operDataList, (item: ContentDTO, index: number) => {
+        ForEach(this.compListItem?.operDataList, (item: ContentDTO, index: number) => {
+          ListItem() {
+            this.buildPaperItem(item, index)
+          }
+        }, (item: ContentDTO, index: number) => JSON.stringify(item))
         // }
         // }
         // .divider({ strokeWidth: 1, color: '#EFEFEF' }) // 每行之间的分界线
         // .divider({ strokeWidth: 1, color: '#EFEFEF' }) // 每行之间的分界线
 
 

 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
+import { WDRouterRule, WDRouterPage } from 'wdRouter'
+import { Action, Params } from 'wdBean';
+import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
 
 
 @Component
 @Component
-export default struct MinePageMoreFunctionUI{
-  @Link moreData:MinePageMoreFunctionModel[]
+export default struct MinePageMoreFunctionUI {
+  @Link moreData: MinePageMoreFunctionModel[]
 
 
-  build(){
-    Column(){
-      Column(){
+  build() {
+    Column() {
+      Column() {
         Text(`更多功能`)
         Text(`更多功能`)
           .width('456lpx')
           .width('456lpx')
           .height('38lpx')
           .height('38lpx')
           .fontColor($r('app.color.color_666666'))
           .fontColor($r('app.color.color_666666'))
           .fontSize('29lpx')
           .fontSize('29lpx')
-          .margin({left:"31lpx"})
+          .margin({ left: "31lpx" })
           .fontWeight(600)
           .fontWeight(600)
       }.height('92lpx')
       }.height('92lpx')
       .width('100%')
       .width('100%')
@@ -23,17 +26,17 @@ export default struct MinePageMoreFunctionUI{
         .width('100%')
         .width('100%')
         .height('1lpx')
         .height('1lpx')
 
 
-      List(){
-        ForEach(this.moreData,(item:MinePageMoreFunctionModel,index:number)=>{
-          ListItem(){
-            Column(){
-              Column(){
-                Row(){
-                  if(item.imgSrc){
+      List() {
+        ForEach(this.moreData, (item: MinePageMoreFunctionModel, index: number) => {
+          ListItem() {
+            Column() {
+              Column() {
+                Row() {
+                  if (item.imgSrc) {
                     Image(item.imgSrc)
                     Image(item.imgSrc)
                       .width('38lpx')
                       .width('38lpx')
                       .height('38lpx')
                       .height('38lpx')
-                      .margin({right:'15lpx'})
+                      .margin({ right: '15lpx' })
                   }
                   }
                   Text(`${item.msg}`)
                   Text(`${item.msg}`)
                     .width('456lpx')
                     .width('456lpx')
@@ -47,27 +50,36 @@ export default struct MinePageMoreFunctionUI{
                     .width('27lpx')
                     .width('27lpx')
                     .height('27lpx')
                     .height('27lpx')
                     .objectFit(ImageFit.Auto)
                     .objectFit(ImageFit.Auto)
-                    .margin({left:'81lpx',right:'29lpx'})
+                    .margin({ left: '81lpx', right: '29lpx' })
                 }.alignItems(VerticalAlign.Center)
                 }.alignItems(VerticalAlign.Center)
                 .justifyContent(FlexAlign.Center)
                 .justifyContent(FlexAlign.Center)
               }.height('108lpx')
               }.height('108lpx')
               .justifyContent(FlexAlign.Center)
               .justifyContent(FlexAlign.Center)
               .alignItems(HorizontalAlign.Start)
               .alignItems(HorizontalAlign.Start)
-              .padding({left:'27lpx'})
+              .padding({ left: '27lpx' })
 
 
-              if(index != this.moreData.length -1 ){
+              if (index != this.moreData.length - 1) {
                 Text().backgroundColor($r('app.color.color_F5F5F5'))
                 Text().backgroundColor($r('app.color.color_F5F5F5'))
                   .width('612lpx')
                   .width('612lpx')
                   .height('1lpx')
                   .height('1lpx')
               }
               }
             }
             }
           }
           }
-          .onClick(()=>{
-            console.log(index+"")
-            if (index == 3) {
-              // RouteManager.jumpNewPage("pages/SettingPage")
-            } else  {
-              // RouteManager.jumpNewPage("pages/PrivacySettingPage")
+          .onClick(() => {
+            console.log(index + "")
+            if (index == 0) {
+              // WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+            } else if (index == 1) {
+              // WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+            } else if (index == 2) {
+
+            } else if (index == 3) { //设置
+              let params: Params = {
+                pageID: 'mainSetting'
+              }
+              WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
+            }else if (index == 4) { // 关于
+              WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
             }
             }
           })
           })
           .height('117lpx')
           .height('117lpx')
@@ -78,6 +90,6 @@ export default struct MinePageMoreFunctionUI{
     }
     }
     .backgroundColor($r('app.color.white'))
     .backgroundColor($r('app.color.white'))
     .borderRadius(8)
     .borderRadius(8)
-    .margin({left:'23lpx',right:'23lpx',top:"19lpx"})
+    .margin({ left: '23lpx', right: '23lpx', top: "19lpx" })
   }
   }
 }
 }

-import { Logger, StringUtils } from 'wdKit'
+import { Logger } from 'wdKit'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 
 
 @Component
 @Component
@@ -22,7 +22,7 @@ export default struct MinePageUserSimpleInfoUI {
           .backgroundColor($r('app.color.main_red'))
           .backgroundColor($r('app.color.main_red'))
           .width('110lpx')
           .width('110lpx')
           .height('110lpx')
           .height('110lpx')
-        Image($r('app.media.mine_head_icon'))
+        Image($r('app.media.default_head'))
           .width('108lpx')
           .width('108lpx')
           .height('108lpx')
           .height('108lpx')
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
@@ -33,6 +33,8 @@ export default struct MinePageUserSimpleInfoUI {
       .onClick(()=>{
       .onClick(()=>{
         if(!this.isLogin){
         if(!this.isLogin){
           WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
           WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+        }else {
+          WDRouterRule.jumpWithPage(WDRouterPage.mineHomePage)
         }
         }
       })
       })
 
 

@@ -43,7 +43,7 @@ export struct FollowListDetailUI{
               ListHasNoMoreDataUI()
               ListHasNoMoreDataUI()
             }
             }
           }
           }
-        }.cachedCount(7)
+        }.cachedCount(10)
         .padding({left:'31lpx',right:'31lpx'})
         .padding({left:'31lpx',right:'31lpx'})
         .layoutWeight(1)
         .layoutWeight(1)
         .scrollBar(BarState.Off)
         .scrollBar(BarState.Off)

+import { LazyDataSource, StringUtils } from 'wdKit';
+import MinePageDatasModel from '../../../model/MinePageDatasModel';
+import { CommentListItem } from '../../../viewmodel/CommentListItem';
+import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
+import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
+import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
+
+const TAG = "HomePageBottomComponent"
+@Component
+export struct HomePageBottomComponent{
+  @State style:number = 0; //0 评论 ，1  关注
+  @State data_follow: LazyDataSource<FollowListDetailItem> = new LazyDataSource();
+  @State data_comment: LazyDataSource<CommentListItem> = new LazyDataSource();
+  @State isLoading:boolean = false
+  @State hasMore:boolean = true
+  curPageNum:number = 1;
+  @State count:number = 0;
+
+  aboutToAppear(){
+    this.getNewPageData()
+  }
+
+  build(){
+    Column(){
+      Divider().width('100%')
+        .height('2lpx')
+        .strokeWidth('1lpx')
+        .backgroundColor($r('app.color.color_EDEDED'))
+
+      if(this.count === 0){
+        ListHasNoMoreDataUI({style:2})
+          .height('100%')
+      }else{
+        if(this.style === 1){
+          List({ space: 3 }) {
+
+            ListItem() {
+              Row(){
+                Text("关注更多人民号")
+                  .fontWeight('400lpx')
+                  .fontColor($r('app.color.color_222222'))
+                  .lineHeight('38lpx')
+                  .fontSize('27lpx')
+                  .textAlign(TextAlign.Center)
+                  .margin({right:'4lpx'})
+                Image($r('app.media.arrow_icon_right'))
+                  .objectFit(ImageFit.Auto)
+                  .width('27lpx')
+                  .height('27lpx')
+              }.height('69lpx')
+              .width('659lpx')
+              .alignItems(VerticalAlign.Center)
+              .justifyContent(FlexAlign.Center)
+              .backgroundColor($r('app.color.color_F5F5F5'))
+              .margin({top:'31lpx',bottom:'4lpx'})
+            }
+
+            LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
+              ListItem() {
+                ChildFollowComponent({data: item})
+              }
+              .onClick(() => {
+              })
+            }, (item: FollowListDetailItem, index: number) => index.toString())
+
+            //没有更多数据  显示提示
+            if(!this.hasMore){
+              ListItem(){
+                ListHasNoMoreDataUI()
+              }
+            }
+          }.cachedCount(15)
+          .padding({left:'31lpx',right:'31lpx'})
+          .layoutWeight(1)
+          .scrollBar(BarState.Off)
+          .edgeEffect(EdgeEffect.None)
+          .nestedScroll({
+            scrollForward: NestedScrollMode.PARENT_FIRST,
+            scrollBackward: NestedScrollMode.SELF_FIRST
+          })
+          .onReachEnd(()=>{
+            console.log(TAG,"触底了");
+            if(!this.isLoading){
+              this.isLoading = true
+              //加载分页数据
+              this.getNewPageData()
+            }
+          })
+        }else if(this.style === 0){
+          List({ space: 3 }) {
+            LazyForEach(this.data_comment, (item: CommentListItem, index: number = 0) => {
+              ListItem() {
+                ChildCommentComponent({data: item})
+              }
+              .onClick(() => {
+              })
+            }, (item: CommentListItem, index: number) => index.toString())
+
+            //没有更多数据  显示提示
+            if(!this.hasMore){
+              ListItem(){
+                ListHasNoMoreDataUI()
+              }
+            }
+          }.cachedCount(15)
+          .layoutWeight(1)
+          .scrollBar(BarState.Off)
+          .edgeEffect(EdgeEffect.None)
+          .nestedScroll({
+            scrollForward: NestedScrollMode.PARENT_FIRST,
+            scrollBackward: NestedScrollMode.SELF_FIRST
+          })
+          .onReachEnd(()=>{
+            console.log(TAG,"触底了");
+            if(!this.isLoading){
+              this.isLoading = true
+              //加载分页数据
+              this.getNewPageData()
+            }
+          })
+        }
+      }
+    }
+    .width('100%')
+  }
+
+
+  @Styles
+  listStyle() {
+    .backgroundColor(Color.White)
+    .height(72)
+    .width("100%")
+    .borderRadius(12)
+  }
+
+  getNewPageData(){
+    this.isLoading = true
+    //我的关注列表
+    if (this.style === 1){
+      if(this.hasMore){
+        let object = new FollowListDetailRequestItem(20,this.curPageNum)
+
+        MinePageDatasModel.getMineFollowListData(object,getContext(this)).then((value)=>{
+          if (!this.data_follow || value.list.length == 0){
+            this.hasMore = false
+          }else{
+            value.list.forEach((value)=>{
+              this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum,value.introduction,value.attentionCreatorId,"1"))
+            })
+            this.data_follow.notifyDataReload()
+            this.count = this.data_follow.totalCount()
+            if (this.data_follow.totalCount() < value.totalCount) {
+              this.curPageNum++
+            }else {
+              this.hasMore = false
+            }
+          }
+          this.isLoading = false
+        }).catch((err:Error)=>{
+          console.log(TAG,"请求失败")
+          this.isLoading = false
+        })
+      }
+    }else if(this.style === 0){
+      if(this.hasMore){
+        let object = new FollowListDetailRequestItem(20,this.curPageNum)
+
+        MinePageDatasModel.getMineCommentListData(object,getContext(this)).then((value)=>{
+          if (!this.data_comment || value.list.length == 0){
+            this.hasMore = false
+          }else{
+            value.list.forEach((value)=>{
+              this.data_comment.push(new CommentListItem(value.fromUserHeader,value.fromUserName,value.targetTitle,value.createTime,value.commentContent))
+            })
+            this.data_comment.notifyDataReload()
+            this.count = this.data_comment.totalCount()
+            if (this.data_comment.totalCount() < value.totalCount) {
+              this.curPageNum++
+            }else {
+              this.hasMore = false
+            }
+          }
+          this.isLoading = false
+        }).catch((err:Error)=>{
+          console.log(TAG,"请求失败")
+          this.isLoading = false
+        })
+      }
+    }
+  }
+}
+
+@Component
+struct ChildFollowComponent {
+  @ObjectLink data: FollowListDetailItem
+
+  build() {
+    Column(){
+      Blank().height('27lpx')
+
+      Row() {
+        Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
+          .objectFit(ImageFit.Auto)
+          .width('92lpx')
+          .height('92lpx')
+          .margin({right:'15lpx'})
+
+        Column(){
+          Text(this.data.cnUserName)
+            .fontWeight('400lpx')
+            .fontSize('31lpx')
+            .lineHeight('38lpx')
+            .fontColor($r('app.color.color_222222'))
+          Text(`粉丝${this.data.cnFansNum}`)
+            .fontColor($r('app.color.color_B0B0B0'))
+            .fontSize('23lpx')
+            .maxLines(1)
+          Text(`${this.data.introduction}`)
+            .fontColor($r('app.color.color_B0B0B0'))
+            .fontSize('23lpx')
+            .maxLines(2)
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
+        }.layoutWeight(1)
+        .alignItems(HorizontalAlign.Start)
+
+        if(this.data.status == "1"){
+          Row(){
+            Text(`已关注`)
+              .fontColor($r('app.color.color_CCCCCC'))
+              .fontSize('23lpx')
+              .fontWeight('500lpx')
+              .lineHeight('35lpx')
+          }.backgroundColor($r('app.color.color_F5F5F5'))
+          .borderRadius('6lpx')
+          .borderColor($r('app.color.color_F5F5F5'))
+          .borderWidth('2lpx')
+          .justifyContent(FlexAlign.Center)
+          .width('100lpx')
+          .height('46lpx')
+          .margin({left:'4lpx',top:'23lpx'})
+          .onClick(()=>{
+            this.data.status = "0"
+          })
+        }else{
+          Row(){
+            Image($r('app.media.follow_icon'))
+              .margin({right:'4lpx'})
+              .width('23lpx')
+              .height('23lpx')
+            Text(`关注`)
+              .fontColor($r('app.color.color_ED2800'))
+              .fontSize('23lpx')
+              .fontWeight('500lpx')
+              .lineHeight('35lpx')
+          }.borderColor($r('app.color.color_1AED2800'))
+          .borderRadius('6lpx')
+          .borderWidth('2lpx')
+          .justifyContent(FlexAlign.Center)
+          .width('100lpx')
+          .height('46lpx')
+          .margin({left:'4lpx',top:'23lpx'})
+          .onClick(()=>{
+            this.data.status = "1"
+          })
+        }
+      }.alignItems(VerticalAlign.Top)
+      .width('100%')
+      .layoutWeight(1)
+
+      Divider().width('100%')
+        .height('2lpx')
+        .strokeWidth('1lpx')
+        .backgroundColor($r('app.color.color_EDEDED'))
+
+    }.height('146lpx')
+    .justifyContent(FlexAlign.Center)
+  }
+}
+
+@Component
+struct ChildCommentComponent {
+  @ObjectLink data: CommentListItem
+
+  build() {
+    Column(){
+      Row() {
+        Image(StringUtils.isEmpty(this.data.fromUserHeader)?$r('app.media.default_head'):this.data.fromUserHeader)
+          .objectFit(ImageFit.Auto)
+          .width('69lpx')
+          .height('69lpx')
+          .margin({right:'15lpx'})
+
+        Column(){
+          Text(this.data.fromUserName)
+            .fontSize('25lpx')
+            .lineHeight('35lpx')
+            .fontWeight('600lpx')
+            .fontColor($r('app.color.color_222222'))
+            .margin({bottom:'6lpx'})
+            .maxLines(1)
+          Text(`${this.data.createTime}`)
+            .fontColor($r('app.color.color_B0B0B0'))
+            .fontSize('23lpx')
+            .lineHeight('31lpx')
+            .fontWeight('400lpx')
+            .maxLines(1)
+        }.layoutWeight(1)
+        .alignItems(HorizontalAlign.Start)
+      }
+      .margin({bottom:'10lpx'})
+      .width('100%')
+      .height('108lpx')
+      .padding({left:'31lpx',right:'31lpx'})
+
+      Row(){
+        Text(this.data.commentContent)
+          .maxLines(3)
+          .textOverflow({ overflow: TextOverflow.Ellipsis })
+          .fontWeight('400lpx')
+          .fontSize('31lpx')
+          .lineHeight('46lpx')
+          .fontColor($r('app.color.color_222222'))
+          .margin({bottom:'10lpx'})
+      }.padding({left:'31lpx',right:'31lpx'})
+      .width('100%')
+
+      Row(){
+        Text(this.data.targetTitle)
+          .fontWeight('400lpx')
+          .fontColor($r('app.color.color_222222'))
+          .lineHeight('38lpx')
+          .fontSize('27lpx')
+          .textAlign(TextAlign.Center)
+          .margin({right:'4lpx'})
+          .maxLines(3)
+          .width('616lpx')
+        Image($r('app.media.arrow_icon_right'))
+          .objectFit(ImageFit.Auto)
+          .width('27lpx')
+          .height('27lpx')
+      }
+      .padding({top:'17lpx',bottom:'17lpx',left:'23lpx',right:'23lpx'})
+      .width('662lpx')
+      .backgroundColor($r('app.color.color_F5F5F5'))
+      .margin({top:'19lpx',bottom:'31lpx'})
+
+      Divider().width('100%')
+        .height('12lpx')
+        .strokeWidth('12lpx')
+        .backgroundColor($r('app.color.color_F5F5F5'))
+
+    }
+    .justifyContent(FlexAlign.Center)
+  }
+}

@@ -3,7 +3,6 @@ import { CommonConstants, ConfigConstants, ScreenType } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { CompUtils } from '../../utils/CompUtils';
 import { CompUtils } from '../../utils/CompUtils';
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
-import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 
 
 const TAG: string = 'CardView';
 const TAG: string = 'CardView';
@@ -400,7 +399,8 @@ export struct PaperSingleColumn999CardView {
         .fontWeight(FontWeight.Bold)
         .fontWeight(FontWeight.Bold)
         .alignSelf(ItemAlign.Start)
         .alignSelf(ItemAlign.Start)
         .maxLines(3)
         .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .margin({ left: 22, right: 22, top: 28 })
       if (this.item?.coverUrl) {
       if (this.item?.coverUrl) {
         Stack({ alignContent: Alignment.BottomEnd }) {
         Stack({ alignContent: Alignment.BottomEnd }) {
           Image(this.item?.coverUrl)
           Image(this.item?.coverUrl)
@@ -418,7 +418,7 @@ export struct PaperSingleColumn999CardView {
                 .fitOriginalSize(true)
                 .fitOriginalSize(true)
             }.width(CommonConstants.FULL_PARENT)
             }.width(CommonConstants.FULL_PARENT)
           }
           }
-        }
+        }.margin({ left: 22, right: 22 })
       }
       }
       if (this.item?.newsSummary) {
       if (this.item?.newsSummary) {
         Text(this.item?.newsSummary)
         Text(this.item?.newsSummary)
@@ -426,23 +426,26 @@ export struct PaperSingleColumn999CardView {
           .padding({ top: 10 })
           .padding({ top: 10 })
           .alignSelf(ItemAlign.Start)
           .alignSelf(ItemAlign.Start)
           .maxLines(3)
           .maxLines(3)
-          .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+          .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+          .margin({ left: 22, right: 22 })
       }
       }
       if (this.item?.visitorComment) {
       if (this.item?.visitorComment) {
         Row() {
         Row() {
           Text(this.item?.visitorComment + "评")
           Text(this.item?.visitorComment + "评")
             .fontSize(12)
             .fontSize(12)
             .fontColor(Color.Gray)
             .fontColor(Color.Gray)
+            .margin({ left: 22 })
           Image($r('app.media.icon_share'))
           Image($r('app.media.icon_share'))
             .width(16)
             .width(16)
             .height(16)
             .height(16)
-            .margin(10)
+            .margin({ left: 10, right: 22, top: 10, bottom: 10 })
             .backgroundColor(Color.Brown)
             .backgroundColor(Color.Brown)
         }.width(CommonConstants.FULL_PARENT)
         }.width(CommonConstants.FULL_PARENT)
         .justifyContent(FlexAlign.SpaceBetween)
         .justifyContent(FlexAlign.SpaceBetween)
       }
       }
     }
     }
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
-    .margin({ bottom: 5 })
+    .margin({ bottom: 5, left: 12, right: 12 })
+    .borderRadius(4)
   }
   }
 }
 }

@@ -19,7 +19,7 @@ const TAG = 'MinePageComponent';
 export struct MinePageComponent {
 export struct MinePageComponent {
   //是否是创作者
   //是否是创作者
   @State isCreator:boolean = false
   @State isCreator:boolean = false
-  @State isLogin:boolean = false
+  @State isLogin:boolean = false   //默认  false  测试放开
   @State userName:string = "登陆注册"
   @State userName:string = "登陆注册"
   @State personalData:MinePagePersonalFunctionsItem[] = []
   @State personalData:MinePagePersonalFunctionsItem[] = []
   @State creatorData:MinePageCreatorFunctionsItem[] = []
   @State creatorData:MinePageCreatorFunctionsItem[] = []

+
+import { PrivacySettingComponents } from '../setting/PrivacySettingComponents';
+@Entry
+@Component
+struct PrivacySettingPage {
+  build() {
+    Column(){
+      PrivacySettingComponents()
+    }
+  }
+}

+import { AboutPageUI } from '../setting/AboutPageUI';
+
+@Entry
+@Component
+struct SettingAboutPage {
+  build() {
+    Column(){
+      AboutPageUI()
+    }
+  }
+}

+import ArrayList from '@ohos.util.ArrayList'
+import { MineSettingComponent } from '../setting/MineSettingComponent';
+import { AccountAndSecurityLayout } from '../setting/AccountAndSecurityLayout';
+import router from '@ohos.router';
+import { Action, Params } from 'wdBean';
+
+@Entry
+@Component
+struct SettingPage {
+  @State message: string = 'Hello World 02'
+  @State pageType: string = 'mainSetting';
+  @State params:Params =  router.getParams() as Params;
+
+  onPageShow() {
+
+      this.pageType = this.params.pageID;
+
+  }
+
+  build() {
+    Column() {
+      if (this.pageType == 'mainSetting') {
+        MineSettingComponent()
+      } else  {
+        AccountAndSecurityLayout()
+      }
+    }.setFullWidth()
+  }
+
+  // 私有方法
+  @Styles setFullWidth(){
+    .width('100%')
+  }
+}
+
+export { SettingPage };
+
+/*
+
+* */

+const TAG = 'AboutPageUI';
+
+@Component
+export  struct AboutPageUI {
+  @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议'];
+  @State message: string = '京ICP备16066560号-6A   Copyright © 人民日报客户端\nall rights reserved.'
+  @State version: string = '版本号：v8.0.1.1'
+
+
+  build() {
+    Navigation() {
+      //滑动区域
+      this.aboutUi()
+    }.titleMode(NavigationTitleMode.Mini)
+    .title('关于')
+  }
+
+  @Builder aboutUi()  {
+    Column() {
+      Image($r('app.media.setting_about_logo'))
+        .width('278lpx')
+        .height('154lpx')
+        .margin({top:'173lpx',bottom:'154lpx'})
+
+      // Row(){
+      //
+      // }.backgroundColor(Color.Yellow)
+      // .width('100%')
+      // .height('97lpx')
+
+      // Row(){
+      //
+      // }.backgroundColor(Color.Yellow)
+      // .width('100%')
+      // .height('97lpx')
+
+
+
+
+      List(){
+        ForEach(this.listData, (item:string, index : number) =>{
+          ListItem() {
+            this.getArrowCell(item, index)
+          }
+        })
+      }.divider({
+        strokeWidth: 1,
+        startMargin: '29lpx',
+        endMargin: '29lpx',
+        color: '#EDEDED'
+      })
+
+      Blank()
+
+      Image($r('app.media.app_icon'))
+        .width('192lpx')
+        .height('192lpx')
+
+      Text(this.version)
+        .fontSize('25lpx')
+        .textAlign(TextAlign.Center)
+        .fontColor($r("app.color.color_666666"))
+        .margin({bottom:'31lpx'})
+
+      Text(this.message)
+        .fontSize('19lpx')
+        .textAlign(TextAlign.Center)
+        .fontColor($r("app.color.color_999999"))
+        .margin({bottom:'35lpx'})
+    }
+    .width('100%')
+    .height('100%')
+  }
+
+
+
+  // 右文字+箭头cell
+  @Builder getArrowCell(item:string, index:number) {
+
+      Row() {
+        // 左侧标题
+          Text(`${item}`)
+            .fontColor('#666666')
+            .fontSize('31lpx')
+
+          Image($r('app.media.mine_user_arrow'))
+            .width('27lpx')
+            .height('27lpx')
+            .objectFit(ImageFit.Auto)
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.SpaceBetween)
+      .height('97lpx')
+      .width('100%')
+      .padding({left:'29lpx',right:'29lpx'})
+  }
+
+
+}
+
+

+
+import { BottomNavi, CommonConstants } from 'wdConstant';
+import { Logger } from 'wdKit';
+import { TopNavigationComponent } from '../page/TopNavigationComponent';
+// import { BottomNavDTO } from '../../repository/bean/BottomNavDTO';
+// import { UIUtils } from '../../repository/UIUtils';
+// import { MinePageComponent } from './MinePageComponent';
+import PageViewModel from '../../viewmodel/PageViewModel';
+import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
+import MineSettingDatasModel from '../../model/MineSettingDatasModel';
+// import MineMainSettingFunctionItem from '../../model/MineSettingDatasModel';
+// import { MineMainSettingFunctionItem } from '../setting/MineSettingDatasModel'
+
+import storageStatistics from "@ohos.file.storageStatistics";
+import { BusinessError } from '@ohos.base';
+import ArrayList from '@ohos.util.ArrayList';
+import router from '@ohos.router';
+
+
+@Component
+export struct AccountAndSecurityLayout {
+  @State listData: Array<MineMainSettingFunctionItem> = new Array;
+  @State privacySwitch: boolean = false
+  @State cacheSice: number = 0
+
+  aboutToAppear() {
+    // 获取设置页面数据
+    this.getAccountAndSecurityData()
+  }
+
+  getAccountAndSecurityData() {
+    this.listData = MineSettingDatasModel.getAccountAndSecuritySettingData()
+  }
+
+  build() {
+    Navigation() {
+      //滑动区域
+      this.settingList()
+    }.titleMode(NavigationTitleMode.Mini)
+    .title('账号与安全')
+  }
+
+  // 页面布局
+  @Builder settingList() {
+    Stack({ alignContent: Alignment.Bottom }) {
+      Column() {
+        List() {
+          ForEach(this.listData, (item: MineMainSettingFunctionItem, index: number) => {
+            ListItem() {
+              if (item.type == 0) {
+                Column() {
+                  this.getArrowCell(item)
+                }.padding({ left: '27lpx' }).height('117lpx').justifyContent(FlexAlign.Center)
+              } else if (item.type == 1) {
+                Column() {
+                  this.getSwitchCell(item)
+                }.padding({ left: '27lpx' }).height('117lpx').justifyContent(FlexAlign.Center)
+              } else {
+                Column().width('100%').height('15lpx').backgroundColor(0xf0f0f0)
+              }
+            }
+            .onClick(() => {
+              console.log(index + "")
+              if (index == 1) {
+                router.pushUrl({
+                  url:"pages/SettingPasswordPage",
+                  params : {'currentType' : 4}
+                })
+              }
+            })
+
+          })
+        }
+        .divider({
+          strokeWidth: 1,
+          startMargin: 15,
+          endMargin: 10,
+          color: '#f0f0f0'
+        })
+        .onScrollFrameBegin((offset, state) => {
+          return { offsetRemain: 0 }
+        })
+      }.height("100%")
+
+      Column() {
+        Button('退出登录',{ stateEffect: true }).width('90%').height('80lpx').backgroundColor('#da3e22').fontColor('#fff').margin('20lpx').onClick(()=>{
+          AlertDialog.show({
+            title: '🥟id : ' + "button",
+            message: '标题：' + '退出登录',
+            confirm: {
+              value: "OK",
+              action: () => {
+
+              },
+            }
+          })
+        })
+      }
+
+    }
+  }
+
+  @Builder itemHead(text: string) {
+    // 列表分组的头部组件，对应联系人分组A、B等位置的组件
+    if (text.length > 0) {
+      Row().width('100%').height('20lpx').backgroundColor(0xf0f0f0)
+    }
+  }
+
+  // 右侧开关cell
+  @Builder getSwitchCell(item: MineMainSettingFunctionItem) {
+    Column() {
+      Row() {
+        // 左侧logo和标题
+        Row() {
+          // 判断有没有图片
+          if (item.imgSrc) {
+            Image(item.imgSrc).height('38lpx').margin({ right: '5lpx' })
+            Text(`${item.title}`).margin({ top: '8lpx' }).height('38lpx').fontColor('#333333').fontSize('29lpx')
+          } else {
+            Text(`${item.title}`).margin({ top: '8lpx' }).height('38lpx').fontColor('#333333').fontSize('29lpx')
+          }
+        }.width('60%')
+
+        // 右侧文案和右箭头
+        Row() {
+          Toggle({ type: ToggleType.Switch, isOn: item.switchState })
+            .height('50lpx')
+            .margin({ left: '81lpx', right: '29lpx' })
+            .selectedColor(Color.Pink)
+            .onChange((isOn: boolean) => {
+              this.privacySwitch = isOn;
+            })
+        }.width('40%')
+        .margin({ right: '29lpx' })
+        .justifyContent(FlexAlign.End)
+
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.SpaceBetween)
+    }.height('54lpx')
+  }
+
+  // 右文字+箭头cell
+  @Builder getArrowCell(item: MineMainSettingFunctionItem) {
+    Column() {
+      Row() {
+        // 左侧logo和标题
+        Row() {
+          // 判断有没有图片
+          if (item.imgSrc) {
+            Image(item.imgSrc)
+              .height('38lpx')
+              .margin({ right: '5lpx' })
+          }
+          Text(`${item.title}`)
+            .margin({ top: '8lpx' })
+            .height('38lpx')
+            .fontColor('#333333')
+            .fontSize('29lpx')
+        }.width('60%')
+
+        // 右侧文案和右箭头
+        Row() {
+          Text(item.subTitle ? item.subTitle : '')
+            .fontColor('#999999')
+            .maxLines(1)
+          Image($r('app.media.mine_user_arrow'))
+            .width('27lpx')
+            .height('27lpx')
+            .objectFit(ImageFit.Auto)
+          Column().width('29lpx')
+        }.width('40%')
+        .margin({ right: '29lpx' })
+        .justifyContent(FlexAlign.End)
+
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.SpaceBetween)
+
+    }
+    .height('54lpx')
+  }
+}

+import { BottomNavi, CommonConstants } from 'wdConstant';
+import { Logger } from 'wdKit';
+import PageViewModel from '../../viewmodel/PageViewModel';
+import storageStatistics from "@ohos.file.storageStatistics";
+import { BusinessError } from '@ohos.base';
+import router from '@ohos.router';
+import { WDRouterPage, WDRouterRule } from 'wdRouter';
+import { Params } from 'wdBean';
+
+
+@Component
+export struct MineSettingComponent {
+  @State listData: Array<string | Array<string>> = new Array();
+  @State privacySwitch: boolean = false
+  @State cacheSice: number = 0
+
+  aboutToAppear() {
+    // 获取设置页面数据
+    this.getSettingPageData()
+
+    // 获取缓存数据
+    storageStatistics.getCurrentBundleStats((err: BusinessError, bundleStats: storageStatistics.BundleStats) => {
+      if (err) {
+        console.error(`Invoke getCurrentBundleStats failed, code is ${err.code}, message is ${err.message}`);
+      } else {
+        this.cacheSice = bundleStats.appSize / 1024.00 / 1024.00;
+      }
+    });
+  }
+
+  getSettingPageData() {
+    let listArr = [['账户与安全', '接收推送', '隐私设罝', '仅WiFi网络加载图片', 'WiFi网络情况下自动播放视频', '开户播放器悬浮窗'], ['清除缓存', '去评分']];
+    this.listData = listArr;
+  }
+
+  build() {
+    Navigation() {
+      //滑动区域
+      this.settingList()
+    }.titleMode(NavigationTitleMode.Mini)
+    .title('设置')
+  }
+
+  // 页面布局
+  @Builder settingList() {
+    Column() {
+      List() {
+        // 循环渲染ListItemGroup，contactsGroups为多个分组联系人contacts和标题title的数据集合
+        ForEach(this.listData, (item: Array<string>, index: number) => {
+          ListItemGroup({ header: index === 0 ? this.itemHead("") : this.itemHead("1") }) {
+            // 循环渲染ListItem
+            ForEach(item, (subItem: string, subIndex: number) => {
+              ListItem() {
+                if (subIndex == 6) {
+                  this.getArrowCell(subItem, subIndex, index)
+                } else if (subIndex == 1 || subIndex == 3 || subIndex == 4 || subIndex == 5) {
+                  this.getSwitchCell(subItem, subIndex)
+                } else {
+                  this.getArrowCell(subItem, subIndex, index)
+                }
+
+              }.padding({ left: '27lpx' })
+              .onClick(() => {
+
+                // // 在Home页面中
+                // let paramsInfo: object = {
+                //   pageId: 123,
+                //   pageType:'AccountAndSecurityLayout'
+                // };
+                console.log(subIndex + "")
+                if (subIndex == 0) {
+
+                  let params: Params = {
+                    pageID: 'AccountAndSecurityLayout'
+                  }
+                  WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
+                }else if (subIndex == 2) {
+                  WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage)
+                }
+
+              })
+              .height('117lpx')
+            })
+          }
+          .divider({
+            strokeWidth: 1,
+            startMargin: 15,
+            endMargin: 10,
+            color: '#f0f0f0'
+          })
+        })
+      }.onScrollFrameBegin((offset, state) => {
+        return { offsetRemain: 0 }
+      })
+    }
+    .backgroundColor(Color.White)
+    .borderRadius(8)
+  }
+
+  @Builder itemHead(text: string) {
+    // 列表分组的头部组件，对应联系人分组A、B等位置的组件
+    if (text.length > 0) {
+      Row().width('100%').height('20lpx').backgroundColor(0xf0f0f0)
+    }
+  }
+
+  // 右侧开关cell
+  @Builder getSwitchCell(item:string, index:number) {
+    Column() {
+      Row() {
+        // 左侧logo和标题
+        Row() {
+          // 判断有没有图片
+          if (0) {
+            Image('https://pic.rmb.bdstatic.com/e182cf67c341d1128d2a6cc05886bf62.jpeg@s_0,h_2000')
+              .height('38lpx')
+              .margin({ right: '5lpx' })
+
+            Text(`${item}`)
+              .margin({ top: '8lpx' })
+              .height('38lpx')
+              .fontColor('#333333')
+              .fontSize('29lpx')
+          } else {
+            Text(`${item}`)
+              .margin({ top: '8lpx' })
+              .height('38lpx')
+              .fontColor('#333333')
+              .fontSize('29lpx')
+          }
+        }.width('60%')
+
+        // 右侧文案和右箭头
+        Row() {
+          Toggle({ type: ToggleType.Switch, isOn: false })
+            .height('50lpx')
+            .margin({ left: '81lpx', right: '29lpx' })
+            .selectedColor(Color.Pink)
+            .onChange((isOn: boolean) => {
+              this.privacySwitch = isOn;
+            })
+        }.width('40%')
+        .margin({ right: '29lpx' })
+        .justifyContent(FlexAlign.End)
+
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.SpaceBetween)
+    }.height('54lpx')
+  }
+
+  // 右文字+箭头cell
+  @Builder getArrowCell(item:string, index:number, mainIndex:number) {
+    Column() {
+
+      Row() {
+        // 左侧logo和标题
+        Row() {
+          // 判断有没有图片
+          if (this.privacySwitch) {
+            Image('https://pic.rmb.bdstatic.com/e182cf67c341d1128d2a6cc05886bf62.jpeg@s_0,h_2000')
+              .height('38lpx')
+              .margin({ right: '5lpx' })
+          }
+          Text(`${item}`)
+            .margin({ top: '8lpx' })
+            .height('38lpx')
+            .fontColor('#333333')
+            .fontSize('29lpx')
+        }.width('60%')
+
+        // 右侧文案和右箭头
+        Row() {
+          Text((index == 0 && mainIndex != 0) ? this.cacheSice.toFixed(2) + 'MB' : '')
+            .fontColor('#999999')
+            .maxLines(1)
+          Image($r('app.media.mine_user_arrow'))
+            .width('27lpx')
+            .height('27lpx')
+            .objectFit(ImageFit.Auto)
+          Column().width('29lpx')
+        }.width('40%')
+        .margin({ right: '29lpx' })
+        .justifyContent(FlexAlign.End)
+
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.SpaceBetween)
+
+    }
+    .height('54lpx')
+  }
+}

+import dataPreferences from '@ohos.data.preferences';
+import { PermissionUtil } from 'wdKit'
+import { SPHelper } from 'wdKit'
+import hilog from '@ohos.hilog';
+import { PrivacySettingModel } from '../../model/PrivacySettingModel'
+
+const TAG = 'PrivacySettingComponents';
+
+@Component
+export struct PrivacySettingComponents {
+  @State listData: Array<PrivacySettingModel> = [new PrivacySettingModel('开启个性推荐', false, 'ohos.permission.READ_MEDIA'), new PrivacySettingModel('相册权限', false, 'ohos.permission.READ_MEDIA'), new PrivacySettingModel('相机权限', false, 'ohos.permission.CAMERA'), new PrivacySettingModel('定位权限', false, 'ohos.permission.LOCATION'), new PrivacySettingModel('麦克风权限', false, 'ohos.permission.MICROPHONE')];
+  @State tips: string = '设置前可查阅'
+  @State privacyTips: string = '《隐私政策》'
+
+  aboutToAppear() {
+    // 获取权限=
+    // SPHelper.default.save('sdf','sdf');
+    // this.initListData();
+    this.getPermissionStatus();
+    // RefreshStatus;
+
+  }
+
+  async getPermissionStatus() {
+    const permissionUtil = new PermissionUtil();
+    for (const element of this.listData) {
+      if (element.privacyName = '开启个性推荐') {
+        continue;
+      }
+      const result = await permissionUtil.checkPermissions(element.permissionKey);
+      element.permission = result;
+    }
+  }
+
+  build() {
+    Navigation() {
+      //滑动区域
+      this.PrivacySettingComponentsUI()
+
+    }.titleMode(NavigationTitleMode.Mini)
+    .title('隐私设置')
+    .backgroundColor('#F8F8F8')
+  }
+
+  @Builder PrivacySettingComponentsUI() {
+    Column() {
+
+      List({ space: '23lpx' }) {
+        ForEach(this.listData, (item: PrivacySettingModel, index:number) => {
+          ListItem() {
+            if (index == 0) {
+              getTuiJianCell({ item:item, index:index });
+            } else {
+              getArrowCell({ item:item, index:index });
+            }
+          }.onClick(() => {
+            if (index != 0) {
+              if (!item.permission) {
+                //跳转权限设置
+                const permissionUtil = new PermissionUtil();
+                PermissionUtil.reqPermissionsFromUser([item.permissionKey]);
+              }
+            }
+          })
+        })
+      }
+      .padding({ left: '29lpx', right: '29lpx' })
+      .margin({ top: '38lpx' })
+
+      Row() {
+        Text(this.tips)
+          .fontSize('25lpx')
+          .textAlign(TextAlign.Start)
+          .fontColor($r("app.color.color_666666"))
+          .margin({ left: '29lpx', top: '46lpx' })
+        // .backgroundColor(Color.Orange)
+        Text(this.privacyTips)
+          .fontSize('25lpx')
+          .textAlign(TextAlign.Start)
+          .fontColor('#ED2800')
+          .margin({ top: '46lpx' })
+          .onClick(() => {
+            //跳转隐私政策
+          })
+      }
+
+    }
+    .width('100%')
+    .height('100%')
+    .backgroundColor('#F8F8F8')
+    .alignItems(HorizontalAlign.Start)
+  }
+}
+
+
+@Component
+struct getArrowCell {
+  @ObjectLink item: PrivacySettingModel;
+  index:number = 0;
+  // 右文字+箭头cell
+  // @Builder getArrowCell(item:PrivacySettingModel, index) {
+  build() {
+    Row() {
+      // 左侧标题
+      Text(this.item.privacyName)
+        .fontColor('#666666')
+        .fontSize('31lpx')
+
+      Row() {
+        Text(this.item.permission ? '已开启' : '去设置')
+          .fontColor(this.item.permission ? '#666666' : '#CCCCCC')
+          .fontSize('31lpx')
+          .margin({ right: '8lpx' })
+
+        Image($r('app.media.mine_user_arrow'))
+          .width('27lpx')
+          .height('27lpx')
+          .objectFit(ImageFit.Auto)
+      }
+
+    }
+    .alignItems(VerticalAlign.Center)
+    .justifyContent(FlexAlign.SpaceBetween)
+    .height('97lpx')
+    .width('100%')
+    .padding({ left: '29lpx', right: '29lpx' })
+    .backgroundColor('#FFFFFF')
+    .borderRadius('8lpx')
+  }
+}
+
+@Component
+struct getTuiJianCell {
+  @ObjectLink item: PrivacySettingModel;
+  index:number = 0;
+  build() {
+    Column() {
+
+      Row() {
+        // 左侧标题
+        Text(this.item.privacyName)
+          .fontColor('#666666')
+          .fontSize('31lpx')
+
+        Row() {
+          Toggle({ type: ToggleType.Switch, isOn: this.item.permission })
+            .height('58lpx')
+            .width('96lpx')
+              // .selectedColor(Color.Pink)
+            .onChange((isOn: boolean) => {
+              // this.privacySwitch = isOn;
+            })
+        }
+
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.SpaceBetween)
+      .height('97lpx')
+      .width('100%')
+
+
+      Blank()
+        .backgroundColor('#EDEDED')
+        .height('1lpx')
+
+      Text('关闭后，将无法看到个性化推荐的服务')
+        .fontColor('#999999')
+        .fontSize('23lpx')
+        .margin({ right: '8lpx' })
+        .height('69lpx')
+
+    }
+    .alignItems(HorizontalAlign.Start)
+    .backgroundColor('#FFFFFF')
+    .borderRadius('8lpx')
+    .padding({ left: '29lpx', right: '29lpx' })
+  }
+}

-import { CompDTO } from 'wdBean'
+import { Action, CompDTO, Params } from 'wdBean';
 import { DateTimeUtils, Logger } from 'wdKit';
 import { DateTimeUtils, Logger } from 'wdKit';
+import { WDRouterRule } from 'wdRouter';
 
 
 const TAG = 'AlbumCardComponent';
 const TAG = 'AlbumCardComponent';
 
 
@@ -97,6 +98,15 @@ export struct AlbumCardComponent {
       }
       }
       .width(343)
       .width(343)
       .height(154)
       .height(154)
+      .onClick((event: ClickEvent) => {
+        let taskAction: Action = {
+          type: 'JUMP_DETAIL_PAGE',
+          params: {
+            detailPageType: 9
+          } as Params,
+        };
+        WDRouterRule.jumpWithAction(taskAction)
+      })
 
 
       Row() {
       Row() {
         if (this.compDTO.operDataList[0].source) {
         if (this.compDTO.operDataList[0].source) {

@@ -4,16 +4,20 @@ import { RMCalendarBean } from '../components/calendar/RMCalendarBean'
 @CustomDialog
 @CustomDialog
 export struct ENewspaperCalendarDialog {
 export struct ENewspaperCalendarDialog {
   calendarDialogController?: CustomDialogController
   calendarDialogController?: CustomDialogController
+  // 选择变化监听，
+  onDateChange?: (date: RMCalendarBean) => void
 
 
   build() {
   build() {
     RMCalendar({
     RMCalendar({
       // 开始日期
       // 开始日期
       startDate: new Date(2023, 8, 1),
       startDate: new Date(2023, 8, 1),
       // 截止日期
       // 截止日期
-      endDate: new Date(2024, 2, 20),
+      endDate: new Date(),
       // 日期选择变化监听
       // 日期选择变化监听
-      onDateChange: (date1: RMCalendarBean) => {
-        console.log("onDateChange", "date1：", JSON.stringify(date1))
+      onDateChange: (date: RMCalendarBean) => {
+        if (this.onDateChange) {
+          this.onDateChange(date)
+        }
         if (this.calendarDialogController) {
         if (this.calendarDialogController) {
           this.calendarDialogController.close()
           this.calendarDialogController.close()
         }
         }

 import { NewspaperListBean, NewspaperListItemBean, NewspaperPositionItemBean } from 'wdBean'
 import { NewspaperListBean, NewspaperListItemBean, NewspaperPositionItemBean } from 'wdBean'
+import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog'
 
 
+/**
+ * 读报纸半屏弹窗
+ * 弹窗嵌套参考资料（https://developer.harmonyos.com/cn/docs/documentation/doc-references-V2/ts-methods-custom-dialog-box-0000001580345722-V2）
+ */
 @CustomDialog
 @CustomDialog
 export struct ENewspaperListDialog {
 export struct ENewspaperListDialog {
-  @State currentPageNum: string = '01'
-  controller: CustomDialogController
+  @Consume @Watch('onCurrentPageNumUpdated') currentPageNum: string
+  @State pageDialogShow: boolean = false
+  @State scrollIndex: number = 0
   newspaperListBean: NewspaperListBean = {} as NewspaperListBean
   newspaperListBean: NewspaperListBean = {} as NewspaperListBean
+  private listScroller: Scroller = new Scroller();
+  //文字版选择弹框
+  pageListDialogController: CustomDialogController = new CustomDialogController({
+    builder: ENewspaperPageDialog({
+      dialogType: 1,
+      newspaperListBean: this.newspaperListBean,
+    }),
+    alignment: DialogAlignment.TopStart,
+    offset: { dx: 0, dy: 214 },
+    customStyle: true,
+  })
+  //页面半屏弹窗（实现在上个组件）若尝试在CustomDialog中传入多个其他的Controller，
+  // 以实现在CustomDialog中打开另一个或另一些CustomDialog，
+  // 那么此处需要将指向自己的controller放在所有controller的后面
+  listDialogController: CustomDialogController
+
+  //watch监听报纸页码回调
+  onCurrentPageNumUpdated(): void {
+    console.log("ENewspaperListDialog-onCurrentPageNumUpdated", "currentPageNum：", this.currentPageNum)
+    let _scrollIndex = Number.parseInt(this.currentPageNum)
+    console.log("ENewspaperListDialog-onCurrentPageNumUpdated", "_scrollIndex：", _scrollIndex)
+    this.scrollIndex = _scrollIndex > 0 ? _scrollIndex - 1 : _scrollIndex
+    this.listScroller.scrollToIndex(this.scrollIndex)
+  }
+
+  aboutToAppear(): void {
+    console.log("ENewspaperListDialog-aboutToAppear", "currentPageNum：", this.currentPageNum)
+    let _scrollIndex = Number.parseInt(this.currentPageNum)
+    console.log("ENewspaperListDialog-aboutToAppear", "_scrollIndex：", _scrollIndex)
+    this.scrollIndex = _scrollIndex > 0 ? _scrollIndex - 1 : _scrollIndex
+    // this.listScroller.scrollToIndex(this.scrollIndex)
+  }
+
+  aboutToDisappear() {
+    // if (this.pageListDialogController) {
+    //   this.pageListDialogController = null
+    // }
+  }
 
 
   build() {
   build() {
     Column() {
     Column() {
+      Row()
+        .width(43)
+        .height(4)
+        .backgroundColor('#EDEDED')
+        .margin({
+          top: 10,
+          bottom: 10
+        })
       Row() {
       Row() {
         Text(this.currentPageNum)
         Text(this.currentPageNum)
           .fontSize($r('app.float.font_size_36'))
           .fontSize($r('app.float.font_size_36'))
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
+          .fontFamily('BebasNeue_Regular')
         Text('版')
         Text('版')
           .fontSize($r('app.float.font_size_16'))
           .fontSize($r('app.float.font_size_16'))
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
@@ -23,8 +76,16 @@ export struct ENewspaperListDialog {
           .margin({ left: 2, bottom: 6 })
           .margin({ left: 2, bottom: 6 })
       }
       }
       .alignItems(VerticalAlign.Bottom)
       .alignItems(VerticalAlign.Bottom)
-      .margin({ top: 25, left: 15 })
+      .margin({ left: 15 })
       .alignSelf(ItemAlign.Start)
       .alignSelf(ItemAlign.Start)
+      .onClick(() => {
+        this.pageDialogShow = !this.pageDialogShow
+        if (this.pageDialogShow) {
+          this.pageListDialogController.open()
+        } else {
+          this.pageListDialogController.close()
+        }
+      })
 
 
       Image($r('app.media.line'))
       Image($r('app.media.line'))
         .width('100%')
         .width('100%')
@@ -32,73 +93,85 @@ export struct ENewspaperListDialog {
         .margin({ top: 20, left: 16, right: 16 })
         .margin({ top: 20, left: 16, right: 16 })
         .objectFit(ImageFit.Contain)
         .objectFit(ImageFit.Contain)
 
 
-      List() {
+      List({ scroller: this.listScroller, initialIndex: this.scrollIndex }) {
         ForEach(this.newspaperListBean?.list, (item: NewspaperListItemBean, index: number) => {
         ForEach(this.newspaperListBean?.list, (item: NewspaperListItemBean, index: number) => {
-          ForEach(item.items, (positionItem: NewspaperPositionItemBean, itemIndex: number) => {
-            ListItem() {
-              Column(){
-                if (itemIndex == 0) {
-                  Text(item.pageNum + item.pageName)
-                    .fontSize($r('app.float.font_size_14'))
-                    .fontColor($r('app.color.color_ED2800'))
-                    .margin({ top: 16 })
-                    .maxLines(1)
-                }
-
-                if (positionItem.shortTitle) {
-                  Text(positionItem.shortTitle)
-                    .fontSize($r('app.float.font_size_14'))
-                    .fontColor($r('app.color.color_222222'))
-                    .margin({ top: 16 })
-                    .maxLines(2)
-                }
-
-                if (positionItem.title) {
-                  Text(positionItem.title)
-                    .fontSize($r('app.float.font_size_17'))
-                    .fontColor($r('app.color.color_222222'))
-                    .margin({ top: 16 })
-                    .maxLines(2)
+          ListItem() {
+            List() {
+              ForEach(item.items, (positionItem: NewspaperPositionItemBean, itemIndex: number) => {
+                ListItem() {
+                  Column() {
+                    if (itemIndex == 0) {
+                      Text(item.pageNum + item.pageName)
+                        .fontSize($r('app.float.font_size_14'))
+                        .fontColor($r('app.color.color_ED2800'))
+                        .fontWeight(600)
+                        .margin({ top: 16, bottom: 16 })
+                        .maxLines(1)
+                    }
+
+                    if (positionItem.shortTitle) {
+                      Text(positionItem.shortTitle)
+                        .fontSize($r('app.float.font_size_14'))
+                        .fontColor($r('app.color.color_222222'))
+                        .fontWeight(600)
+                        .maxLines(2)
+                    }
+
+                    if (positionItem.title) {
+                      Text(positionItem.title)
+                        .fontSize($r('app.float.font_size_17'))
+                        .fontColor($r('app.color.color_222222'))
+                        .margin({ top: 8 })
+                        .maxLines(2)
+                    }
+
+                    if (positionItem.downTitle) {
+                      Text(positionItem.downTitle)
+                        .fontSize($r('app.float.font_size_14'))
+                        .fontColor($r('app.color.color_222222'))
+                        .fontWeight(600)
+                        .margin({ top: 8 })
+                        .maxLines(2)
+                    }
+
+                    if (positionItem.newsTxt) {
+                      Text(positionItem.newsTxt)
+                        .fontSize($r('app.float.font_size_14'))
+                        .fontColor($r('app.color.color_999999'))
+                        .margin({ top: 15, bottom: 15 })
+                        .maxLines(5)
+                    }
+                  }
+                  .alignItems(HorizontalAlign.Start)
                 }
                 }
 
 
-                if (positionItem.downTitle) {
-                  Text(positionItem.downTitle)
-                    .fontSize($r('app.float.font_size_14'))
-                    .fontColor($r('app.color.color_222222'))
-                    .margin({ top: 16 })
-                    .maxLines(2)
-                }
-
-                if (positionItem.newsTxt) {
-                  Text(positionItem.newsTxt)
-                    .fontSize($r('app.float.font_size_14'))
-                    .fontColor($r('app.color.color_999999'))
-                    .margin({ top: 16, bottom: 16 })
-                    .maxLines(5)
-                }
-              }
-              .alignItems(HorizontalAlign.Start)
+              })
             }
             }
-
-          })
-
+          }
         })
         })
-
       }
       }
       .width('100%')
       .width('100%')
-      .margin({ top: 16, left: 16, right: 16 })
+      .padding({ left: 15, right: 15 })
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
       .divider({
       .divider({
-        strokeWidth: 1,
+        strokeWidth: 0.5,
         color: '#EDEDED'
         color: '#EDEDED'
       })
       })
       .onScrollIndex((firstIndex: number) => {
       .onScrollIndex((firstIndex: number) => {
-        this.updateCurrentPageNum(firstIndex)
+        console.log('firstIndex', firstIndex)
+      })
+      .onScrollIndex((firstIndex: number, lastIndex: number, centerIndex: number) => {
+        console.info('first' + firstIndex)
+        console.info('last' + lastIndex)
+        console.info('center' + centerIndex)
+        // this.updateCurrentPageNum(firstIndex)
+        this.currentPageNum = `${centerIndex < 9 ? '0' + (centerIndex + 1) : centerIndex + 1}`
+      })
+      .onScroll((scrollOffset: number, scrollState: ScrollState) => {
+        console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset)
       })
       })
-
     }
     }
     .width('100%')
     .width('100%')
-    .height(674)
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
 
 
   }
   }
@@ -107,20 +180,19 @@ export struct ENewspaperListDialog {
     if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
     if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
       let index = 0;
       let index = 0;
       for (let itemBean of this.newspaperListBean.list) {
       for (let itemBean of this.newspaperListBean.list) {
-        if (itemBean.items && itemBean.items.length > 0){
-          for (let item of itemBean.items){
+        if (itemBean.items && itemBean.items.length > 0) {
+          for (let item of itemBean.items) {
             index++
             index++
-            if (index == firstIndex){
+            if (index == firstIndex) {
               this.currentPageNum = itemBean.pageNum
               this.currentPageNum = itemBean.pageNum
               return
               return
             }
             }
-
           }
           }
         }
         }
       }
       }
     }
     }
 
 
-   }
+  }
 }
 }
 
 
 
 

+import { NewspaperListBean, NewspaperListItemBean } from 'wdBean/Index'
+
+/**
+ * 期刊日期选择弹窗
+ */
+@CustomDialog
+export struct ENewspaperPageDialog {
+  dialogType: number = 0 //0：图片版，1：文字版
+  pageDialogController?: CustomDialogController
+  @Consume @Watch('onCurrentPageNumUpdated') currentPageNum: string
+  @Prop newspaperListBean: NewspaperListBean = {} as NewspaperListBean
+
+  onCurrentPageNumUpdated(): void {
+    console.log("ENewspaperListDialog-onCurrentPageNumUpdated", "currentPageNum：", this.currentPageNum)
+  }
+
+  build() {
+    Column() {
+      if (this.dialogType == 1) {
+        Image($r("app.media.iv_e_news_pager_calendar_arrow_up"))
+          .width(18).height(8.5)
+          .margin({ left: 31 })
+      }
+      Stack() {
+        GridRow({ columns: 5, gutter: { x: 15, y: 15 } }) {
+          ForEach(this.newspaperListBean.list, (item: NewspaperListItemBean, index) => {
+            GridCol() {
+              Row() {
+                Text(item.pageNum)
+                  .fontSize($r('app.float.normal_text_size'))
+                  .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222'))
+                  .fontFamily('BebasNeue_Regular')
+              }
+              .alignItems(VerticalAlign.Center)
+              .justifyContent(FlexAlign.Center)
+              .width(30)
+              .height(30)
+              .backgroundColor(this.currentPageNum != item.pageNum ? Color.White : $r('app.color.color_ED2800'))
+              .onClick((event: ClickEvent) => {
+                this.currentPageNum = item.pageNum
+                if (this.pageDialogController) {
+                  this.pageDialogController.close()
+                }
+              })
+            }
+          })
+        }
+      }
+      .padding(20)
+      .width(260)
+      .borderRadius(4)
+      .backgroundColor(Color.White)
+
+      if (this.dialogType == 0) {
+        Image($r("app.media.iv_e_news_pager_calendar_arrow_down"))
+          .width(18).height(8.5)
+          .margin({ left: 31 })
+      }
+    }
+    .margin({ left: 10 })
+    .alignItems(HorizontalAlign.Start)
+  }
+}

@@ -12,6 +12,7 @@ import { FollowListItem } from '../viewmodel/FollowListItem';
 import { MineFollowListItem } from '../viewmodel/MineFollowListItem';
 import { MineFollowListItem } from '../viewmodel/MineFollowListItem';
 import { QueryListIsFollowedItem } from '../viewmodel/QueryListIsFollowedItem';
 import { QueryListIsFollowedItem } from '../viewmodel/QueryListIsFollowedItem';
 import { FollowListStatusRequestItem } from '../viewmodel/FollowListStatusRequestItem';
 import { FollowListStatusRequestItem } from '../viewmodel/FollowListStatusRequestItem';
+import { MineCommentListDetailItem } from '../viewmodel/MineCommentListDetailItem';
 
 
 const TAG = "MinePageDatasModel"
 const TAG = "MinePageDatasModel"
 
 
@@ -295,6 +296,48 @@ class MinePageDatasModel{
   }
   }
 
 
 
 
+  /**
+   * 我的评论列表
+   * @param params
+   * @param context
+   * @returns
+   */
+  getMineCommentListData(params:FollowListDetailRequestItem,context: Context): Promise<MineCommentListDetailItem> {
+    return new Promise<MineCommentListDetailItem>((success, error) => {
+      Logger.info(TAG, `getAppointmentList start`);
+      this.fetchMineCommentListData(params).then((navResDTO: ResponseDTO<MineCommentListDetailItem>) => {
+        if (!navResDTO || navResDTO.code != 0) {
+          success(this.getMineCommentListDataLocal(context))
+          return
+        }
+        Logger.info(TAG, "getAppointmentList then,AppointmentResDTO.timeStamp:" + navResDTO.timestamp);
+        let navigationBean = navResDTO.data as MineCommentListDetailItem
+        success(navigationBean);
+      }).catch((err: Error) => {
+        Logger.error(TAG, `fetchAppointmentListDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
+        success(this.getMineCommentListDataLocal(context))
+      })
+    })
+  }
+
+  fetchMineCommentListData(object:FollowListDetailRequestItem) {
+    let url = HttpUrlUtils.getMineCommentListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}`
+    let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders();
+    return WDHttp.get<ResponseDTO<MineCommentListDetailItem>>(url, headers)
+  };
+
+  async getMineCommentListDataLocal(context: Context): Promise<MineCommentListDetailItem> {
+    Logger.info(TAG, `getMineFollowListDataLocal start`);
+    let compRes: ResponseDTO<MineCommentListDetailItem> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<MineCommentListDetailItem>>(context,'mine_comment_list_data.json' );
+    if (!compRes || !compRes.data) {
+      Logger.info(TAG, `getMineFollowListDataLocal compRes  is empty`);
+      return new MineCommentListDetailItem()
+    }
+    Logger.info(TAG, `getMineFollowListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
+    return compRes.data
+  }
+
+
 }
 }
 
 
 const minePageDatasModel = MinePageDatasModel.getInstance()
 const minePageDatasModel = MinePageDatasModel.getInstance()

+
+import HashMap from '@ohos.util.HashMap';
+import { ResponseDTO, WDHttp } from 'wdNetwork';
+import { Logger } from 'wdKit';
+import { MineMainSettingFunctionItem } from '../viewmodel/MineMainSettingFunctionItem';
+
+
+const TAG = "MineSettingDatasModel"
+
+/**
+ * 我的设置页面 所有数据 获取封装类
+ */
+class MineSettingDatasModel{
+  private static instance: MineSettingDatasModel;
+  mainSettingData:Array<MineMainSettingFunctionItem> = []
+  accountAndSecurityData:Array<MineMainSettingFunctionItem> = []
+
+  private constructor() { }
+
+  /**
+   * 单例模式
+   * @returns
+   */
+  public static getInstance(): MineSettingDatasModel {
+    if (!MineSettingDatasModel.instance) {
+      MineSettingDatasModel.instance = new MineSettingDatasModel();
+    }
+    return MineSettingDatasModel.instance;
+  }
+
+
+
+
+  /**
+   * 评论 关注 收藏 等7个数据
+   * 包含名字和图标
+   */
+   getMineMainSettingFunctionItemData():MineMainSettingFunctionItem[]{
+    if(this.mainSettingData.length === 7){
+      return this.mainSettingData
+    }
+    this.mainSettingData = []
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '账户与安全', '18888888888', 0, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '接收推送', null, 1, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '仅WiFi网络加载图片', null, 1, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'WiFi网络情况下自动播放视频', null, 1, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开户播放器悬浮窗', null, 1, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清除缓存', '32MB', 0, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '去评分', null, 0, false))
+
+    return this.mainSettingData
+  }
+
+  /**
+   * 评论 关注 收藏 等7个数据
+   * 包含名字和图标
+   */
+  getAccountAndSecuritySettingData():MineMainSettingFunctionItem[]{
+    if(this.accountAndSecurityData.length === 7){
+      return this.accountAndSecurityData
+    }
+    this.accountAndSecurityData = []
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '更换手机号', '18888888888', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '设置密码', null, 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_qqicon'), '绑定QQ', '立即绑定', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_wechaticon'), '绑定微信', '立即绑定', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_weiboicon'), '绑定新浪微博', '立即绑定', 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_appleicon'), 'Apple ID', null, 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
+
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '注销账号', null, 0, false))
+
+    return this.accountAndSecurityData
+  }
+
+
+
+  //  网络请求设置数据
+  fetchAppointmentListData(pageSize:string,pageNum:string) {
+    // let url = HttpUrlUtils.getAppointmentListDataUrl()+ `?pageSize=${pageSize}&pageNum=${pageNum}`
+    // let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders();
+    // return WDHttp.get<ResponseDTO<MineAppointmentListItem>>(url, headers)
+  };
+
+  // getAppointmentListData(pageSize:string,pageNum:string): Promise<MineAppointmentListItem> {
+  //   return new Promise<MineAppointmentListItem>((success, error) => {
+  //     Logger.info(TAG, `getAppointmentList start`);
+  //     this.fetchAppointmentListData(pageSize,pageNum).then((navResDTO: ResponseDTO<MineAppointmentListItem>) => {
+  //       if (!navResDTO) {
+  //         error("page data invalid");
+  //         return
+  //       }
+  //       Logger.info(TAG, "getAppointmentList then,AppointmentResDTO.timeStamp:" + navResDTO.timestamp);
+  //       let navigationBean = navResDTO.data
+  //       success(navigationBean);
+  //     }).catch((err: Error) => {
+  //       Logger.error(TAG, `fetchAppointmentListDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
+  //       error(err);
+  //     })
+  //   })
+  // }
+
+}
+
+const mineSettingDatasModel = MineSettingDatasModel.getInstance()
+export default mineSettingDatasModel as MineSettingDatasModel
+// export default MineMainSettingFunctionItem as MineMainSettingFunctionItem

+import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
+@Observed
+export class PrivacySettingModel{
+  privacyName: string
+  permission: boolean
+  permissionKey: Permissions
+
+  constructor(privacyName: string, permission: boolean, permissionKey: Permissions) {
+    this.privacyName = privacyName;
+    this.permission = permission;
+    this.permissionKey = permissionKey;
+  }
+}

+import router from '@ohos.router'
+import { HomePageBottomComponent } from '../components/mine/home/HomePageBottomComponent';
+
+@Entry
+@Component
+struct MineHomePage {
+  @State tileOpacity: number = 0;
+  firstPositionY:number = 0;
+  @State isHasIntroduction: boolean = true
+  @State desc:string = "点击添加简介，让大家认识你" //text 搞两个样式，如果三行，就显示 另外一个text  没有显示高度的
+  fontColor: string = '#999999'
+  selectedFontColor: string = '#000000'
+  @State currentIndex: number = 0
+  private controller: TabsController = new TabsController()
+  isChangeToUserEdit = false;
+
+
+  build() {
+    Stack({ alignContent: Alignment.Top }){
+      Image($r('app.media.title_bg'))
+        .width('100%')
+        .height('355lpx')
+        .objectFit(ImageFit.Cover)
+
+      Column(){
+        Stack({ alignContent: Alignment.Top }){
+          this.MineHomeTitleTransparent()
+          this.MineHomeTitleWhite()
+        }
+
+        Scroll() {
+          Column() {
+            //用户信息区域
+              Row() {
+               Image($r('app.media.default_head'))
+                  .width('115lpx')
+                  .height('115lpx')
+                  .objectFit(ImageFit.Cover)
+                  .borderRadius(50)
+
+                Column() {
+                  Row() {
+                    Text("人民日报6G")
+                      .fontColor($r('app.color.white'))
+                      .maxLines(1)
+                      .textOverflow({ overflow: TextOverflow.Ellipsis })
+                      .fontSize('38lpx')
+                      .lineHeight('50lpx')
+                      .fontWeight('500lpx')
+
+                    Text("等级8")
+                      .textAlign(TextAlign.Center)
+                      .fontColor($r('app.color.color_ED2800'))
+                      .backgroundColor($r('app.color.white'))
+                      .fontSize('19lpx')
+                      .width('96lpx')
+                      .height('35lpx')
+                      .margin({ left: '10lpx' })
+                    Blank()
+                  }.width('507lpx')
+
+                  Row() {
+                    Row() {
+                      Text("3.6万")
+                        .textStyle()
+                      Text("阅读")
+                        .textStyle2()
+                    }
+                    .margin({ right: '15lpx' })
+
+                    Divider()
+                      .height('19lpx')
+                      .width('2lpx')
+                      .color($r('app.color.white'))
+                      .vertical(true)
+                      .opacity(0.4)
+                    Row() {
+                      Text("6242")
+                        .textStyle()
+                      Text("评论")
+                        .textStyle2()
+                    }.margin({ right: '15lpx', left: '15lpx' })
+
+                    Divider()
+                      .height('19lpx')
+                      .width('2lpx')
+                      .color($r('app.color.white'))
+                      .vertical(true)
+                      .opacity(0.4)
+                    Row() {
+                      Text("86")
+                        .textStyle()
+                      Text("关注")
+                        .textStyle2()
+                    }.margin({ left: '15lpx' })
+                  }.margin({ top: '23lpx' })
+                }.alignItems(HorizontalAlign.Start)
+                .margin({ left: '32lpx' })
+              }
+              .onAreaChange((oldValue: Area, newValue: Area) => {
+                if (this.firstPositionY === 0) {
+                  this.firstPositionY = newValue.globalPosition.y as number
+                }else{
+                  let persent = (this.firstPositionY - Number(newValue.globalPosition.y)) / (this.firstPositionY * 0.3)
+                  if(persent > 1){
+                    persent = 1
+                  }
+                  this.tileOpacity = persent
+                }
+              })
+              .backgroundColor($r('app.color.color_transparent'))
+              .height('184lpx')
+              .width('100%')
+              .padding({ left: '35lpx' })
+            //用户简介区域
+            Column() {
+              Row() {
+                Text(this.desc)
+                  .fontSize('27lpx')
+                  .maxLines(3)
+                  .textOverflow({ overflow: TextOverflow.Ellipsis })
+                  .lineHeight('40lpx')
+                  .fontWeight('400lpx')
+                  .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999'))
+                  .textAlign(TextAlign.Start)
+
+                if(!this.isHasIntroduction){
+                  Image($r('app.media.user_info_edit_icon'))
+                    .width('27lpx')
+                    .height('27lpx')
+                    .objectFit(ImageFit.Auto)
+                }
+              }
+              Text("来到人民日报365天")
+                .fontSize('23lpx')
+                .lineHeight('25lpx')
+                .fontWeight('400lpx')
+                .fontColor($r('app.color.color_999999'))
+                .textAlign(TextAlign.Start)
+                .margin({ top: '15lpx' })
+
+            }.padding({ left: '31lpx',right:'31lpx',top:'19lpx',bottom:'31lpx'})
+            .alignItems(HorizontalAlign.Start)
+            .justifyContent(FlexAlign.Center)
+            .width('100%')
+            .backgroundColor($r('app.color.white'))
+            //间隔符
+
+            Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
+
+            //tab 页面
+            Tabs({controller: this.controller}) {
+              TabContent() {
+                HomePageBottomComponent({style:0})
+              }.tabBar(this.TabBuilder(0,"评论"))
+              TabContent() {
+                HomePageBottomComponent({style:1})
+              }.tabBar(this.TabBuilder(1,"关注"))
+            }
+            .backgroundColor($r('app.color.white'))
+            .animationDuration(0)
+            .onChange((index: number) => {
+              this.currentIndex = index
+            })
+            .vertical(false)
+            .height("100%")
+          }.width("100%")
+        }
+        .edgeEffect(EdgeEffect.None)
+        .scrollBar(BarState.Off)
+        .width('100%')
+        .height('100%')
+      }
+    }.width('100%')
+    .height('100%')
+
+  }
+  @Builder MineHomeTitleTransparent() {
+    RelativeContainer() {
+      //标题栏目
+      Image($r('app.media.icon_arrow_left_white') )
+        .width('46lpx')
+        .height('46lpx')
+        .objectFit(ImageFit.Auto)
+        .id("back_icon")
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          left: { anchor: "__container__", align: HorizontalAlign.Start }
+        })
+        .margin({ left: '31lpx' })
+        .onClick(() => {
+          router.back()
+        })
+
+      Text("编辑资料")
+        .height('42lpx')
+        .maxLines(1)
+        .id("rightText")
+        .fontSize('35lpx')
+        .fontWeight('400lpx')
+        .fontColor($r('app.color.white') )
+        .lineHeight('42lpx')
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          right: { anchor: "__container__", align: HorizontalAlign.End }
+        })
+        .margin({ right: '31lpx' })
+        .onClick(()=>{
+          this.editUserInfo()
+        })
+    }
+    .visibility(this.tileOpacity > 0 ? 1 : 0)
+    .height('84lpx')
+    .width('100%')
+    .backgroundColor($r('app.color.color_transparent'))
+  }
+
+
+  @Builder MineHomeTitleWhite() {
+    RelativeContainer() {
+      //标题栏目
+      Image($r('app.media.back_icon'))
+        .width('46lpx')
+        .height('46lpx')
+        .objectFit(ImageFit.Auto)
+        .id("back_icon")
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          left: { anchor: "__container__", align: HorizontalAlign.Start }
+        })
+        .margin({ left: '31lpx' })
+        .onClick(() => {
+          router.back()
+        })
+        Image($r('app.media.default_head'))
+          .width('60lpx')
+          .height('60lpx')
+          .objectFit(ImageFit.Auto)
+          .id("head_icon")
+          .alignRules({
+            center: { anchor: "__container__", align: VerticalAlign.Center },
+            left: { anchor: "back_icon", align: HorizontalAlign.End }
+          })
+          .margin({ left: '31lpx' })
+          .onClick(() => {
+            router.back()
+          })
+
+        Text("我的昵称")
+          .height('42lpx')
+          .maxLines(1)
+          .id("title")
+          .fontSize('35lpx')
+          .fontWeight('400lpx')
+          .fontColor($r('app.color.color_222222'))
+          .lineHeight('42lpx')
+          .alignRules({
+            center: { anchor: "__container__", align: VerticalAlign.Center },
+            left: { anchor: "head_icon", align: HorizontalAlign.End }
+          })
+          .margin({ left: '12lpx' })
+
+      Text("编辑资料")
+        .height('42lpx')
+        .maxLines(1)
+        .id("rightText")
+        .fontSize('35lpx')
+        .fontWeight('400lpx')
+        .fontColor($r('app.color.color_222222'))
+        .lineHeight('42lpx')
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          right: { anchor: "__container__", align: HorizontalAlign.End }
+        })
+        .margin({ right: '31lpx' })
+        .onClick(()=>{
+          this.editUserInfo()
+        })
+    }
+    .visibility(this.tileOpacity > 0 ? 0 : 1)
+    .height('84lpx')
+    .width('100%')
+    .backgroundColor($r('app.color.white'))
+    .opacity(this.tileOpacity )
+
+  }
+
+  @Builder TabBuilder(index: number, title: string) {
+    Stack(){
+      Text(title)
+        .height('38lpx')
+        .fontSize('33lpx')
+        .fontWeight(this.currentIndex === index ? 600 : 400)
+        .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
+        .lineHeight('38lpx')
+
+      if(this.currentIndex === index){
+        Divider()
+          .width('31lpx')
+          .height('4lpx')
+          .color('#ED2800')
+          .strokeWidth('4lpx')
+          .margin({top:'50lpx'})
+          .id("divTag")
+      }
+    }.onClick(()=>{
+      this.currentIndex = index
+      this.controller.changeIndex(this.currentIndex)
+    })
+    .height('100%')
+    .width('100%')
+    .margin({right:'9lpx'})
+  }
+
+  /**
+   * 跳转编辑资料(防止二次点击)
+   */
+  editUserInfo(){
+    if(!this.isChangeToUserEdit){
+      this.isChangeToUserEdit = true;
+      let c = setInterval(() => {
+        this.isChangeToUserEdit = false
+      }, 1000);
+
+      //route 跳转写这里 TODO
+    }
+  }
+
+}
+
+@Extend(Text) function textStyle() {
+  .fontColor($r('app.color.white'))
+  .textStyleDefault()
+  .margin({ right: '10lpx' })
+}
+
+@Extend(Text) function textStyle2() {
+  .textStyleDefault()
+  .fontColor($r('app.color.color_B2FFFFFF'))
+}
+
+@Extend(Text) function textStyleDefault() {
+  .textAlign(TextAlign.Start)
+  .fontSize('23lpx')
+  .fontWeight('400lpx')
+  .lineHeight('31lpx')
+}
+

 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { DateTimeUtils, Logger } from 'wdKit';
 import { DateTimeUtils, Logger } from 'wdKit';
-import { ContentDetailDTO, NavigationBodyDTO, PageDTO,InteractDataDTO, MorningEveningPaperDTO,
-  NewspaperTimeInfoBean,
+import {
+  CompInfoBean,
+  ContentDetailDTO,
+  InteractDataDTO,
+  MorningEveningPaperDTO,
+  NavigationBodyDTO,
   NewspaperListBean,
   NewspaperListBean,
-  PageInfoBean,
-  CompInfoBean
+  NewspaperTimeInfoBean,
+  PageDTO,
+  PageInfoBean
 } from 'wdBean';
 } from 'wdBean';
+
 const TAG = 'HttpRequest';
 const TAG = 'HttpRequest';
+
 export class PageRepository {
 export class PageRepository {
   static getBottomNavGroupUrl() {
   static getBottomNavGroupUrl() {
     // https: //pd-apis-uat.pdnews.cn/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup
     // https: //pd-apis-uat.pdnews.cn/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup
@@ -24,7 +31,7 @@ export class PageRepository {
       + "&refreshTime=" + DateTimeUtils.getTimeStamp()
       + "&refreshTime=" + DateTimeUtils.getTimeStamp()
       + "&pageId=" + pageId
       + "&pageId=" + pageId
     // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
     // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
-    Logger.info(TAG,"getPageInfoUrl url = "+url)
+    Logger.info(TAG, "getPageInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
@@ -42,29 +49,29 @@ export class PageRepository {
       + "&pageSize=" + pageSize
       + "&pageSize=" + pageSize
       + "&pageNum=" + currentPage;
       + "&pageNum=" + currentPage;
     // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
     // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
-    Logger.info(TAG,"getCompInfoUrl url = "+url)
+    Logger.info(TAG, "getCompInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
   static getDetailInfoUrl(relId: string, contentId: string, relType: string) {
   static getDetailInfoUrl(relId: string, contentId: string, relType: string) {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.DETAIL_PATH;
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.DETAIL_PATH;
     url = url + "?relId=" + relId
     url = url + "?relId=" + relId
-    + "&contentId=" + contentId
-    + "&relType=" + relType;
+      + "&contentId=" + contentId
+      + "&relType=" + relType;
     // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
     // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
-    Logger.info(TAG,"getDetailInfoUrl url = "+url)
+    Logger.info(TAG, "getDetailInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
   static getInteractDataUrl() {
   static getInteractDataUrl() {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH;
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH;
-    Logger.info(TAG,"getInteractDataUrl url = "+url)
+    Logger.info(TAG, "getInteractDataUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
-  static getNewspaperInfoUrl() {
-    let url = HttpUrlUtils.getHost() + HttpUrlUtils.E_NEWSPAPER_INFO_PATH;
-    Logger.info(TAG,"getNewspaperInfoUrl url = "+url)
+  static getNewspaperInfoUrl(date: string) {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.E_NEWSPAPER_INFO_PATH + "?date=" + date;
+    Logger.info(TAG, "getNewspaperInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
@@ -72,7 +79,7 @@ export class PageRepository {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.E_NEWSPAPER_LIST_PATH;
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.E_NEWSPAPER_LIST_PATH;
     url = url + "?date=" + date
     url = url + "?date=" + date
       + "&pagesSize=" + pageSize;
       + "&pagesSize=" + pageSize;
-    Logger.info(TAG,"getNewspaperListUrl url = "+url)
+    Logger.info(TAG, "getNewspaperListUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
@@ -82,7 +89,7 @@ export class PageRepository {
   static getMorningEveningPageInfoUrl(pageId: string) {
   static getMorningEveningPageInfoUrl(pageId: string) {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_PAGE_INFO_PATH;
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_PAGE_INFO_PATH;
     url = url + "?pageId=" + pageId;
     url = url + "?pageId=" + pageId;
-    Logger.info(TAG,"getMorningEveningPageInfoUrl url = "+url)
+    Logger.info(TAG, "getMorningEveningPageInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
@@ -99,11 +106,11 @@ export class PageRepository {
    * channelStrategy:频道策略
    * channelStrategy:频道策略
    * topicId:专题id
    * topicId:专题id
    * */
    * */
-  static getMorningEveningCompInfoUrl(pageId: number,groupId:number,refreshTime:string,pageNum:number,pageSize:number) {
+  static getMorningEveningCompInfoUrl(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number, pageSize: number) {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_COMP_INFO_PATH;
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_COMP_INFO_PATH;
-    url = url + "?loadStrategy=first_load&pageNum="+pageNum+"&refreshTime="+refreshTime+"&pageId="
-              +pageId+"&channelStrategy=2&groupId="+groupId+"&topicId=10000009445&pageSize="+pageSize;
-    Logger.info(TAG,"getMorningEveningCompInfoUrl url = "+url)
+    url = url + "?loadStrategy=first_load&pageNum=" + pageNum + "&refreshTime=" + refreshTime + "&pageId="
+      + pageId + "&channelStrategy=2&groupId=" + groupId + "&topicId=" + topicId + "&pageSize=" + pageSize;
+    Logger.info(TAG, "getMorningEveningCompInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
@@ -146,8 +153,8 @@ export class PageRepository {
     return WDHttp.post<ResponseDTO<InteractDataDTO[]>>(url, param, headers)
     return WDHttp.post<ResponseDTO<InteractDataDTO[]>>(url, param, headers)
   };
   };
 
 
-  static fetchNewspaperInfo() {
-    let url = PageRepository.getNewspaperInfoUrl()
+  static fetchNewspaperInfo(date: string) {
+    let url = PageRepository.getNewspaperInfoUrl(date)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     return WDHttp.get<ResponseDTO<NewspaperTimeInfoBean[]>>(url, headers)
     return WDHttp.get<ResponseDTO<NewspaperTimeInfoBean[]>>(url, headers)
   };
   };
@@ -170,8 +177,8 @@ export class PageRepository {
   /**
   /**
    * 获取早晚报compInfo
    * 获取早晚报compInfo
    * */
    * */
-  static fetchMorningEveningCompInfo(pageId: number,groupId:number,refreshTime:string,pageNum:number,pageSize:number) {
-    let url = PageRepository.getMorningEveningCompInfoUrl(pageId,groupId,refreshTime,pageNum,pageSize)
+  static fetchMorningEveningCompInfo(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number, pageSize: number) {
+    let url = PageRepository.getMorningEveningCompInfoUrl(pageId, groupId, refreshTime, topicId, pageNum, pageSize)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     return WDHttp.get<ResponseDTO<CompInfoBean>>(url, headers)
     return WDHttp.get<ResponseDTO<CompInfoBean>>(url, headers)
   };
   };

+
+
+@Observed
+export class CommentListItem{
+  fromUserHeader:string = ""
+  fromUserName:string = ""
+  commentContent:string = ""
+  targetTitle:string = ""
+  createTime:string = ""
+
+  constructor(fromUserHeader:string,fromUserName:string,targetTitle:string,createTime:string,commentContent:string ) {
+    this.fromUserHeader = fromUserHeader
+    this.fromUserName = fromUserName
+    this.commentContent = commentContent
+    this.targetTitle = targetTitle
+    this.createTime = createTime
+  }
+}

@@ -73,6 +73,7 @@ export class FollowListDetailItem{
   attentionUserName:string = ""
   attentionUserName:string = ""
   fansNum :number = 0
   fansNum :number = 0
 
 
+
   constructor(headPhotoUrl:string,cnUserName:string,cnFansNum:number,introduction:string,creatorId:string,status:string ) {
   constructor(headPhotoUrl:string,cnUserName:string,cnFansNum:number,introduction:string,creatorId:string,status:string ) {
     this.headPhotoUrl = headPhotoUrl
     this.headPhotoUrl = headPhotoUrl
     this.cnUserName = cnUserName
     this.cnUserName = cnUserName

+import { CommentListItem } from './CommentListItem'
+
+export class MineCommentListDetailItem{
+  list:CommentListItem[] = []
+
+  pageNum: number = 0
+  pageSize: number = 20
+  totalCount: number = 0
+
+  constructor(list?:CommentListItem[],pageNum?: number,pageSize?: number,totalCount?: number) {
+  }
+
+}

+
+@Observed
+export class MineMainSettingFunctionItem {
+  imgSrc?:Resource   // 图标
+  title?:string      // 标题
+  subTitle?:string   // 副标题
+  type?:number     // 数据类型 0默认箭头类型，1右侧switch按钮类型
+  switchState?:boolean // 右侧switch按钮状态
+
+
+  constructor(imgSrc:Resource|null,title:string|null,subTitle:string|null,type:number|null,switchState:boolean|null){
+    if (imgSrc) {
+      this.imgSrc = imgSrc
+    }
+    if (title) {
+      this.title = title
+    }
+    if (subTitle) {
+      this.subTitle = subTitle
+    }
+    if (type != null) {
+      this.type = type
+    }
+    if (switchState != null) {
+      this.switchState = switchState
+    }
+
+  }
+}

@@ -6,7 +6,6 @@ import { PageRepository } from '../repository/PageRepository';
 const TAG = 'MorningEveningViewModel'
 const TAG = 'MorningEveningViewModel'
 
 
 export class MorningEveningViewModel {
 export class MorningEveningViewModel {
-
   static async getMorningEveningPageInfo(pageId: string): Promise<PageInfoBean> {
   static async getMorningEveningPageInfo(pageId: string): Promise<PageInfoBean> {
     return new Promise<PageInfoBean>((success, error) => {
     return new Promise<PageInfoBean>((success, error) => {
       Logger.info(TAG, `getMorningEveningPageInfo pageInfo start`);
       Logger.info(TAG, `getMorningEveningPageInfo pageInfo start`);
@@ -31,27 +30,29 @@ export class MorningEveningViewModel {
     })
     })
   }
   }
 
 
-  static async getMorningEveningCompInfo(pageId: number,groupId:number,refreshTime:string,pageNum:number = 1,pageSize:number = 20): Promise<CompInfoBean> {
+  static async getMorningEveningCompInfo(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number = 1, pageSize: number = 20): Promise<CompInfoBean> {
     return new Promise<CompInfoBean>((success, error) => {
     return new Promise<CompInfoBean>((success, error) => {
       Logger.info(TAG, `getMorningEveningCompInfo pageInfo start`);
       Logger.info(TAG, `getMorningEveningCompInfo pageInfo start`);
-      PageRepository.fetchMorningEveningCompInfo(pageId,groupId,refreshTime,pageNum,pageSize).then((resDTO: ResponseDTO<CompInfoBean>) => {
-        if (!resDTO || !resDTO.data) {
-          Logger.error(TAG, 'getMorningEveningCompInfo then navResDTO is empty');
-          error('resDTO is empty');
-          return
-        }
-        if (resDTO.code != 0) {
-          Logger.error(TAG, `getMorningEveningCompInfo then code:${resDTO.code}, message:${resDTO.message}`);
-          error('resDTO Response Code is failure');
-          return
-        }
-        // let navResStr = JSON.stringify(navResDTO);
-        Logger.info(TAG, "getMorningEveningCompInfo then,navResDTO.timestamp:" + resDTO.timestamp);
-        success(resDTO.data);
-      }).catch((err: Error) => {
-        Logger.error(TAG, `getMorningEveningCompInfo catch, error.name : ${err.name},  error.message:${err.message}`);
-        error(err);
-      })
+      PageRepository.fetchMorningEveningCompInfo(pageId, groupId, refreshTime, topicId, pageNum, pageSize)
+        .then((resDTO: ResponseDTO<CompInfoBean>) => {
+          if (!resDTO || !resDTO.data) {
+            Logger.error(TAG, 'getMorningEveningCompInfo then navResDTO is empty');
+            error('resDTO is empty');
+            return
+          }
+          if (resDTO.code != 0) {
+            Logger.error(TAG, `getMorningEveningCompInfo then code:${resDTO.code}, message:${resDTO.message}`);
+            error('resDTO Response Code is failure');
+            return
+          }
+          // let navResStr = JSON.stringify(navResDTO);
+          Logger.info(TAG, "getMorningEveningCompInfo then,navResDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `getMorningEveningCompInfo catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
     })
     })
   }
   }
 }
 }

@@ -16,10 +16,10 @@ export class NewspaperViewModel {
     return newspaperTimeInfo.data
     return newspaperTimeInfo.data
   }
   }
 
 
-  static async getNewspaperTime(): Promise<NewspaperTimeInfoBean[]> {
+  static async getNewspaperTime(date: string): Promise<NewspaperTimeInfoBean[]> {
     return new Promise<NewspaperTimeInfoBean[]>((success, error) => {
     return new Promise<NewspaperTimeInfoBean[]>((success, error) => {
       Logger.info(TAG, `getNavData start`);
       Logger.info(TAG, `getNavData start`);
-      PageRepository.fetchNewspaperInfo().then((resDTO: ResponseDTO<NewspaperTimeInfoBean[]>) => {
+      PageRepository.fetchNewspaperInfo(date).then((resDTO: ResponseDTO<NewspaperTimeInfoBean[]>) => {
         if (!resDTO || !resDTO.data) {
         if (!resDTO || !resDTO.data) {
           Logger.error(TAG, 'getNewspaperTime then navResDTO is empty');
           Logger.error(TAG, 'getNewspaperTime then navResDTO is empty');
           error('resDTO is empty');
           error('resDTO is empty');
@@ -71,6 +71,4 @@ export class NewspaperViewModel {
     }
     }
     return newspaperListBean.data
     return newspaperListBean.data
   }
   }
-
-
 }
 }

@@ -81,27 +81,42 @@
       "value": "#994D00"
       "value": "#994D00"
     },
     },
     {
     {
-      "name":"color_B15900",
+      "name": "color_B15900",
       "value": "#B15900"
       "value": "#B15900"
     },
     },
     {
     {
       "name": "main_red",
       "name": "main_red",
       "value": "#E84026"
       "value": "#E84026"
-    },    {
-      "name":"color_4D000000",
+    },
+    {
+      "name": "color_4D000000",
       "value": "#4D000000"
       "value": "#4D000000"
     },
     },
     {
     {
-      "name":"color_CCCCCC",
+      "name": "color_CCCCCC",
       "value": "#CCCCCC"
       "value": "#CCCCCC"
     },
     },
     {
     {
-      "name":"color_EDEDED",
+      "name": "color_EDEDED",
       "value": "#EDEDED"
       "value": "#EDEDED"
     },
     },
     {
     {
       "name": "color_1AED2800",
       "name": "color_1AED2800",
       "value": "#1AED2800"
       "value": "#1AED2800"
+    },
+    {
+      "name": "color_B2FFFFFF",
+      "value": "#B2FFFFFF"
+    },
+    {
+      "name": "color_00304c",
+      "value": "#00304c"
+    },
+    {
+      "name": "color_transparent",
+      "value": "#00000000"
     }
     }
+
+
   ]
   ]
 }
 }

@@ -3,6 +3,10 @@
     "components/MorningEveningPaper/MorningEveningPaperComponent",
     "components/MorningEveningPaper/MorningEveningPaperComponent",
     "components/page/AppointmentListPage",
     "components/page/AppointmentListPage",
     "components/page/FollowListPage",
     "components/page/FollowListPage",
+    "pages/MineHomePage",
+    "components/page/SettingPage",
+    "components/page/SettingAboutPage",
+    "components/page/PrivacySettingPage",
     "components/page/EditUserInfoPage",
     "components/page/EditUserInfoPage",
     "components/page/EditUserNikeNamePage",
     "components/page/EditUserNikeNamePage",
     "components/page/EditUserIntroductionPage",
     "components/page/EditUserIntroductionPage",

@@ -7,10 +7,10 @@
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",
   "dependencies": {
   "dependencies": {
+    "wdPlayer": "file:../../features/wdPlayer",
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdNetwork": "file:../../commons/wdNetwork",
-    "wdPlayer": "file:../../features/wdPlayer"
+    "wdNetwork": "file:../../commons/wdNetwork"
   }
   }
 }
 }

 {
 {
+  "license": "Apache-2.0",
+  "devDependencies": {},
+  "author": "",
   "name": "wdlogin",
   "name": "wdlogin",
-  "version": "1.0.0",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
-  "author": "",
-  "license": "Apache-2.0",
+  "version": "1.0.0",
   "dependencies": {
   "dependencies": {
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",
@@ -13,4 +14,4 @@
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
     "wdNetwork": "file:../../commons/wdNetwork"
     "wdNetwork": "file:../../commons/wdNetwork"
   }
   }
-}
+}

@@ -35,15 +35,17 @@ struct ForgetPasswordPage {
         isCodeSend: $isCodeSend
         isCodeSend: $isCodeSend
       })
       })
       Row() {
       Row() {
-        Button("确认", { type: ButtonType.Normal })
+        Text("确认")
           .layoutWeight(1)
           .layoutWeight(1)
+          .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
           .borderRadius(4)
           .borderRadius(4)
-          .fontSize(16)
+          .fontSize(18)
+          .textAlign(TextAlign.Center)
           .fontWeight(FontWeight.Medium)
           .fontWeight(FontWeight.Medium)
           .margin({ top: 26 })
           .margin({ top: 26 })
           .height(44)
           .height(44)
-          .backgroundColor("#ED2800")
-          .opacity(this.isSubmit ? 1 : 0.6)
+          .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
+          .enabled(this.isSubmit ? true : false)
           .onClick(() => {
           .onClick(() => {
             this.checkVerifyCode()
             this.checkVerifyCode()
 
 

@@ -21,6 +21,7 @@ export struct LoginInputComponent {
     TextInput({ placeholder: "请输入手机号" })
     TextInput({ placeholder: "请输入手机号" })
       .fontSize(16)
       .fontSize(16)
       .height(48)
       .height(48)
+      .maxLength(11)
       .margin({ top: 36 })
       .margin({ top: 36 })
       .backgroundColor("#F5F5F5")
       .backgroundColor("#F5F5F5")
       .borderRadius(4)
       .borderRadius(4)
@@ -44,22 +45,19 @@ export struct LoginInputComponent {
         .fontColor("#222222")
         .fontColor("#222222")
         .backgroundColor("#00000000")
         .backgroundColor("#00000000")
         .borderRadius({ topLeft: 4, bottomLeft: 4 })
         .borderRadius({ topLeft: 4, bottomLeft: 4 })
-        .backgroundImage($r('app.media.login_code_bg_one'), ImageRepeat.NoRepeat)
-        .backgroundImageSize(ImageSize.Contain)
+        // .backgroundImage($r('app.media.login_code_bg_one'), ImageRepeat.NoRepeat)
+        // .backgroundImageSize(ImageSize.Contain)
         .onChange((value) => {
         .onChange((value) => {
           this.codeContent = value
           this.codeContent = value
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 6)
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 6)
         })
         })
 
 
       Text(this.isCodeSend ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新发送')
       Text(this.isCodeSend ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新发送')
-        .backgroundImage($r('app.media.login_code_bg'), ImageRepeat.NoRepeat)
-        .backgroundImageSize(ImageSize.Cover)
-        .fontColor('#ED2800')
+        .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
         .width(110)
         .width(110)
         .fontSize(14)
         .fontSize(14)
-        .fontWeight(this.codeBtnState ? FontWeight.Bold : FontWeight.Normal)
+        .fontWeight( FontWeight.Bold)
         .height(48)
         .height(48)
-        .enabled(this.codeBtnState)// .align(Alignment.End)
         .textAlign(TextAlign.Center)
         .textAlign(TextAlign.Center)
         .onClick(() => {
         .onClick(() => {
           if (this.phoneContent.length < 11) {
           if (this.phoneContent.length < 11) {
@@ -80,7 +78,12 @@ export struct LoginInputComponent {
         })
         })
 
 
 
 
-    }.margin({ top: 12 }).height(48).alignItems(VerticalAlign.Center).justifyContent(FlexAlign.Start)
+    }.margin({ top: 12 })
+    .height(48)
+    .alignItems(VerticalAlign.Center)
+    .justifyContent(FlexAlign.Start)
+    .backgroundImage($r('app.media.code_login_bg'))
+    .backgroundImageSize({width:'100%',height:48})
 
 
   }
   }
 }
 }

@@ -24,7 +24,6 @@ function isEmpty(obj: undefined | string | null): boolean {
 
 
 const TAG = "LoginPage"
 const TAG = "LoginPage"
 
 
-@Preview
 @Entry
 @Entry
 @Component
 @Component
 struct LoginPage {
 struct LoginPage {
@@ -106,32 +105,32 @@ struct LoginPage {
           Text() {
           Text() {
             Span("我已阅读并同意").fontColor("#999999").fontSize(12)
             Span("我已阅读并同意").fontColor("#999999").fontSize(12)
             Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
             Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
-              //todo 协议
               let bean={contentId:"1",pageID:""} as Params
               let bean={contentId:"1",pageID:""} as Params
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
             })
             })
             Span("及").fontColor("#999999").fontSize(12)
             Span("及").fontColor("#999999").fontSize(12)
             Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => {
             Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => {
-              //todo 协议
               let bean={contentId:"2",pageID:""} as Params
               let bean={contentId:"2",pageID:""} as Params
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
             })
             })
           }
           }
-        }.margin({ top: 28 }).alignItems(VerticalAlign.Center)
+        }.margin({ top: 48 }).alignItems(VerticalAlign.Center)
 
 
         Row() {
         Row() {
-          Button("登录", { type: ButtonType.Normal })
+          Text("登录")
             .borderRadius(4)
             .borderRadius(4)
-            .fontSize(20)
+            .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
+            .fontSize(18)
             .fontWeight(FontWeight.Medium)
             .fontWeight(FontWeight.Medium)
             .margin({ top: 20 })
             .margin({ top: 20 })
             .height(44)
             .height(44)
-            .opacity(this.isSubmit ? 1 : 0.6)
-            .enabled(this.isSubmit ? true : false)
+            .textAlign(TextAlign.Center)
             .width("100%")
             .width("100%")
-            .backgroundColor("#ED2800")
+            .backgroundColor(this.isSubmit?"#FFED2800":"#99ED2800")
             .onClick(() => {
             .onClick(() => {
-              //todo 登录
+              if(!this.isSubmit){
+                return
+              }
               this.loginSubmit()
               this.loginSubmit()
 
 
             })
             })
@@ -181,6 +180,7 @@ struct LoginPage {
     Column() {
     Column() {
       TextInput({ placeholder: "请输入账号", controller: this.phoneController })
       TextInput({ placeholder: "请输入账号", controller: this.phoneController })
         .fontSize(16)
         .fontSize(16)
+        .maxLength(11)
         .height(48)
         .height(48)
         .backgroundColor("#F5F5F5")
         .backgroundColor("#F5F5F5")
         .borderRadius(4)
         .borderRadius(4)
@@ -327,7 +327,6 @@ struct LoginPage {
   //登录
   //登录
   loginSubmit() {
   loginSubmit() {
     Logger.debug(TAG, "loginSubmit " + this.checkCodePage)
     Logger.debug(TAG, "loginSubmit " + this.checkCodePage)
-    //todo 判断是验证码登录还是密码登录
     if (this.checkCodePage) {
     if (this.checkCodePage) {
       if (isEmpty(this.phoneContent)) {
       if (isEmpty(this.phoneContent)) {
         Logger.debug(TAG, "手机号为空")
         Logger.debug(TAG, "手机号为空")

+import ArrayList from '@ohos.util.ArrayList';
+import promptAction from '@ohos.promptAction';
+
+export default class AccoutPageDataModel {
+  // 页面数据
+  compType: number // 0：标题 / 1：密码输入框 / 2：验证码输入框 / 3:desc描述 / 4:按钮 / 5：logo / 6:子标题 7:手机号输入框 7:空白
+  compLogo: string
+  compTitle: string
+  // compSubTitle: string
+  compDesc: string
+  compButtonTitle: string
+  inputPlacholder: string
+  inputTag: number
+
+  constructor(compType: number, compTitle: string, compLogo: string, compDesc: string, compButtonTitle: string, inputPlacholder: string, inputTag: number) {
+    this.compType = compType
+    this.compTitle = compTitle
+    this.compLogo = compLogo
+    this.compDesc = compDesc
+    this.compButtonTitle = compButtonTitle
+    this.inputPlacholder = inputPlacholder
+    this.inputTag = inputTag
+  }
+}
+
+@Component
+export struct SettingPasswordLayout {
+  @State listData: Array<AccoutPageDataModel> = new Array(); // 页面配置数据
+  @State btnStatus: boolean = false
+  password01: string = '';
+  password02: string = '';
+  passwordOri: string = '';
+
+  aboutToAppear() {
+    this.getPageListData(4)
+  }
+
+  getPageListData(pageId:number) {
+    switch (pageId) {
+      case 0:
+      // 验证/更换手机号
+        this.listData.push(new AccoutPageDataModel(0, '更换手机号', '', '', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(7, '', '', '', '', '请输入手机号', 10010))
+        this.listData.push(new AccoutPageDataModel(2, '', '', '', '', '验证码', 10088))
+        this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
+        break;
+
+      case 1:
+      // 设置密码
+        this.listData.push(new AccoutPageDataModel(0, '设置密码', '', '', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入密码', 10086))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '再次输入密码', 10087))
+        this.listData.push(new AccoutPageDataModel(4, '', '', '提示:密码长度6-20位，需答谢字母、小写字母、数字、特殊字符中组合三种及三种以上组成', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(5, '', '', '', '确认', '', 0))
+        break;
+
+      case 2:
+      // 修改密码
+        this.listData.push(new AccoutPageDataModel(0, '修改密码', '', '', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入原密码', 10010))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入新密码', 10086))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请再请输入原密码', 10087))
+        this.listData.push(new AccoutPageDataModel(3, '', '', '提示:密码长度6-20位，需答谢字母、小写字母、数字、特殊字符中组合三种及三种以上组成', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
+        this.listData.push(new AccoutPageDataModel(3, '', '', '忘记密码', '', '', 0))
+        break;
+
+      case 3:
+      // 绑定手机号
+        this.listData.push(new AccoutPageDataModel(0, '绑定手机号', '', '', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(7, '', '', '', '', '请输入手机号', 10010))
+        this.listData.push(new AccoutPageDataModel(2, '', '', '', '', '验证码', 10088))
+        this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
+        break;
+
+      case 4:
+      // 有logo的
+        this.listData.push(new AccoutPageDataModel(5, '', 'https://img-blog.csdnimg.cn/24f43f4d626d428891ebb2adb5c2c2e9.png?x-oss-process=image/watermark,type_ZHJvaWRzYW5zZmFsbGJhY2s,shadow_50,text_Q1NETiBA5YyX5aSn5Z-55paH5byg6ICB5biI,size_20,color_FFFFFF,t_70,g_se,x_16', '', '', '' , 0))
+        this.listData.push(new AccoutPageDataModel(0, '修改密码', '', '', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入原密码', 10010))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入新密码', 10086))
+        this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请再请输入原密码', 10087))
+        this.listData.push(new AccoutPageDataModel(2, '', '', '', '', '验证码', 10088))
+        this.listData.push(new AccoutPageDataModel(3, '', '', '提示:密码长度6-20位，需答谢字母、小写字母、数字、特殊字符中组合三种及三种以上组成', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
+        this.listData.push(new AccoutPageDataModel(3, '', '', '忘记密码', '', '', 0))
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  build() {
+    Navigation() {
+      this.settingList() //滑动区域
+    }.titleMode(NavigationTitleMode.Mini)
+    .title('')
+  }
+
+  // 页面布局
+  @Builder settingList() {
+    Column() {
+      List() {
+        ForEach(this.listData, (item: AccoutPageDataModel, index: number) => {
+          ListItem() {
+            if (item.compType == 0) {
+              this.getTitleCell(item, HorizontalAlign.Start)
+            } else if (item.compType == 1) {
+              this.getPasswordCell(item)
+            } else if (item.compType == 2) {
+              this.getCodeCell(item)
+            } else if (item.compType == 3) {
+              if (index == this.listData.length - 1) {
+                this.getDescCell(item, HorizontalAlign.Center)
+              } else {
+                this.getDescCell(item, HorizontalAlign.Start)
+              }
+            } else if (item.compType == 4) {
+              this.getButtonCell(item)
+            } else if (item.compType == 5) {
+              this.getLogoCell(item)
+            } else if (item.compType == 7) {
+              this.getPhoneCell(item)
+            } else {
+              Text('' + item.compType)
+            }
+          }
+        })
+      }
+      // .divider({
+      //   strokeWidth: 1,
+      //   startMargin: 15,
+      //   endMargin: 10,
+      //   color: '#f0f0f0'
+      // })
+    }.width('100%').padding('30lpx')
+  }
+
+  /***************************** UI元素 ******************************************/
+
+  // 标题
+  @Builder getTitleCell(item: AccoutPageDataModel, alignTitle: HorizontalAlign) {
+    Column() {
+      Text(item.compTitle).fontWeight(FontWeight.Bold).fontSize(20).maxLines(1)
+    }
+    .width('100%')
+    .height('75lpx')
+    .alignItems(alignTitle)
+  }
+
+  // 密码输入框
+  @Builder getPasswordCell(item: AccoutPageDataModel) {
+    Row() {
+      Row() {
+        TextInput({ placeholder: item.inputPlacholder })
+          .type(InputType.Password)
+          .backgroundColor('#00000000')
+          .onChange((value: string) => {
+            this.inputTextChange(value, item.inputTag)
+          })
+          .onSubmit((EnterKeyType) => {
+            promptAction.showToast({ message: 'submit' })
+          })
+      }
+      .alignItems(VerticalAlign.Center)
+      .height('80lpx')
+      .backgroundColor('#f5f5f5')
+      .borderRadius('4vp')
+    }
+    .width('100%')
+    .height('110lpx')
+    .backgroundColor(0xffffff0)
+    .alignItems(VerticalAlign.Center)
+  }
+
+  // 手机号输入框
+  @Builder getPhoneCell(item: AccoutPageDataModel) {
+    Row() {
+      Row() {
+        TextInput({ placeholder: item.inputPlacholder })
+          .backgroundColor('#00000000')
+          .onChange((value: string) => {
+            this.inputTextChange(value, item.inputTag)
+          })
+          .onSubmit((EnterKeyType) => {
+            promptAction.showToast({ message: 'submit' })
+          })
+      }
+      .alignItems(VerticalAlign.Center)
+      .height('80lpx')
+      .backgroundColor('#f5f5f5')
+      .borderRadius('4vp')
+    }
+    .width('100%')
+    .height('110lpx')
+    .backgroundColor(0xffffff0)
+    .alignItems(VerticalAlign.Center)
+  }
+
+  // 验证码码输入框
+  @Builder getCodeCell(item: AccoutPageDataModel) {
+    Row() {
+      Stack() {
+        Image($r('app.media.get_code_bg')).width('100%').borderRadius('4vp')
+        Row() {
+          TextInput({ placeholder: item.inputPlacholder })
+            .backgroundColor('#00000000')
+            .width('67.28%')
+            .onChange((value: string) => {
+              this.inputTextChange(value, item.inputTag)
+            })
+          Button('发送验证码')
+            .width('32.71%')
+            .backgroundColor('#00000000')
+            .fontColor('#da3e22')
+        }
+        .width('100%')
+      }.height('80lpx')
+    }
+    .width('100%')
+    .height('110lpx')
+    .backgroundColor(0xffffff0)
+    .alignItems(VerticalAlign.Center)
+  }
+
+  // desc
+  @Builder getDescCell(item: AccoutPageDataModel, alignTitle: HorizontalAlign) {
+    Column() {
+      Text(item.compDesc).fontSize(12).maxLines(3).fontColor(0x999999).padding({top:'10lpx'})
+        .onClick(()=>{
+          if (item.compDesc == '忘记密码') {
+            promptAction.showToast({ message: '密码不符合密码规范' })
+          }
+        })
+    }
+    .width('100%')
+    .height('85lpx')
+    .alignItems(alignTitle)
+  }
+
+  // 按钮
+  @Builder getButtonCell(item: AccoutPageDataModel) {
+    Row() {
+      Button(item.compButtonTitle, { type: ButtonType.Normal, stateEffect: true })
+        .width('100%')
+        .height('80lpx')
+        .backgroundColor(this.btnStatus ? '#da3e22' : '#e5856d')
+        .fontColor('#fff')
+        .borderRadius('4vp')
+        .onClick(() => {
+          this.buttonClick()
+        })
+    }
+    .padding({top:'25lpx'})
+    .alignItems(VerticalAlign.Center)
+    .width('100%')
+    .height('120lpx')
+  }
+
+  // 标题
+  @Builder getLogoCell(item: AccoutPageDataModel) {
+    Column() {
+      Image(item.compLogo).height('150lpx').width('150lpx')
+    }
+    .width('100%')
+    .height('200lpx')
+  }
+
+  /***************************** 事件处理 ******************************************/
+  // 提交按钮点击事件
+  buttonClick() {
+    if (this.btnStatus) {
+      // 需要+手机号校验
+      if (this.password01.length < 6 || this.password01.length > 20) {
+        promptAction.showToast({ message: '密码不符合密码规范' })
+        return
+      }
+
+      promptAction.showToast({ message: '请求接口' })
+    }
+  }
+
+  // 输入框数据变动：输入数据处理
+  inputTextChange(text: string, tag: number) {
+    if (tag == 10086) {
+      this.password01 = text;
+    } else if (tag == 10087) {
+      this.password02 = text;
+    } else {
+      this.passwordOri = text;
+    }
+
+    if (this.password01) {
+      if (this.password01 == this.password02 && this.password01.length >= 6 && this.password01.length <= 20) {
+        this.btnStatus = true;
+      } else {
+        this.btnStatus = false;
+      }
+    }
+  }
+}

+import { SettingPasswordLayout } from './SettingPasswordLayout';
+
+@Entry
+@Component
+struct SettingPasswordPage {
+  @State message: string = 'Hello World'
+
+  build() {
+    Row() {
+      Column() {
+        SettingPasswordLayout()
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}

@@ -3,6 +3,7 @@
     "pages/Index",
     "pages/Index",
     "pages/login/LoginPage",
     "pages/login/LoginPage",
     "pages/login/ForgetPasswordPage",
     "pages/login/ForgetPasswordPage",
-    "pages/login/LoginProtocolWebview"
+    "pages/login/LoginProtocolWebview",
+    "pages/login/SettingPasswordPage"
   ]
   ]
 }
 }

+)x."
Mb

+RH>8S\

+1'PbW gpM

+Kq	)̒c

 {
 {
-  "name": "sight_harmony",
-  "version": "1.0.0",
-  "description": "Please describe the basic information.",
-  "main": "",
-  "author": "",
   "license": "",
   "license": "",
-  "dependencies": {
-  },
   "devDependencies": {
   "devDependencies": {
     "@ohos/hypium": "1.0.16"
     "@ohos/hypium": "1.0.16"
-  }
+  },
+  "author": "",
+  "name": "sight_harmony",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
 }
 }

@@ -15,4 +15,4 @@
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
     "wdNetwork": "file:../../commons/wdNetwork"
     "wdNetwork": "file:../../commons/wdNetwork"
   }
   }
-}
+}

 import { ENewspaperPageComponent } from 'wdComponent';
 import { ENewspaperPageComponent } from 'wdComponent';
-import { Logger } from 'wdKit'
+import { Logger } from 'wdKit';
+import common from '@ohos.app.ability.common';
+import window from '@ohos.window';
 
 
 const TAG = 'ENewspaper';
 const TAG = 'ENewspaper';
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct ENewspaper {
 struct ENewspaper {
+  // 获取UIAbility上下文
+  context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
+
+  async setSystemBar(color: string) {
+    // 获取当前应用窗口
+    let windowClass: window.Window = await window.getLastWindow(this.context)
+    // 将状态栏和导航栏的背景色设置为跟应用窗口相同的颜色
+    await windowClass.setWindowSystemBarProperties({
+      navigationBarColor: color,
+      statusBarColor: color,
+      // navigationBarContentColor: "#00FF00",
+      // statusBarContentColor: "#00FF00"
+    })
+  }
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -13,7 +29,7 @@ struct ENewspaper {
     }
     }
   }
   }
 
 
-  pageTransition(){
+  pageTransition() {
     // 定义页面进入时的效果，从底侧滑入
     // 定义页面进入时的效果，从底侧滑入
     PageTransitionEnter({ type: RouteType.None, duration: 300 })
     PageTransitionEnter({ type: RouteType.None, duration: 300 })
       .slide(SlideEffect.Bottom)
       .slide(SlideEffect.Bottom)
@@ -31,10 +47,12 @@ struct ENewspaper {
   }
   }
 
 
   onPageShow() {
   onPageShow() {
+    this.setSystemBar('#80000000')
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
   }
   }
 
 
   onPageHide() {
   onPageHide() {
+    this.setSystemBar('#FFFFFFFF')
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');
   }
   }
 
 

+@Entry
+@Component
+struct MultiPictureDetailPage {
+  @State message: string = 'Hello World';
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}

@@ -4,6 +4,7 @@
     "pages/web/DefaultWebPage",
     "pages/web/DefaultWebPage",
     "pages/ENewspaper",
     "pages/ENewspaper",
     "pages/ImageAndTextDetailPage",
     "pages/ImageAndTextDetailPage",
-    "pages/MorningEveningPaperPage"
+    "pages/MorningEveningPaperPage",
+    "pages/detail/MultiPictureDetailPage"
   ]
   ]
 }
 }

+{
+  "code": "0",
+  "data": {
+    "hasNext": 0,
+    "list": [
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "车得修，歌也得唱不唱心里那口气儿就没了你哥我以前心里也有这股劲儿那时候我想的是什么想的是每天什么时候开始现在心里这股劲儿泄了我想的是每天什么时候结束心里有这股劲儿的时候你哥也摇滚过现在这股劲儿没了我天天想的都是这个是这个但你不能这样只要咱们继续唱大吉他就还在不唱就真的没了——《缝纫机乐队》",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-21 13:37:13",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 303323,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 303323,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "http://sitcontentjdcdn.aikan.pdnews.cn/zhbj-20231012/image/content/7f1a342a809d4276aa975ba9e7fe2313.png",
+          "shareSummary": "这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注这是",
+          "shareTitle": "这是一个开始、请持续关注这是一个开始、请",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000633703-500000008559"
+        },
+        "targetId": "30000633703",
+        "targetRelId": "500000008559",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注这是一个开始、请持续关注",
+        "targetType": 8,
+        "topicType": null,
+        "uuid": "a1944aa3-e598-44ea-b2c5-45a4fe0ba91f"
+      },
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "我们都很好",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-14 17:56:14",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 403449,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 403449,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "",
+          "shareSummary": "人民日报，有品质的新闻",
+          "shareTitle": "丝路之美",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000654108-500000017213"
+        },
+        "targetId": "30000654108",
+        "targetRelId": "500000017213",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "丝路之美",
+        "targetType": 8,
+        "topicType": null,
+        "uuid": "1706ec91-8fb3-4704-bde3-fb454386e419"
+      },
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "大家好",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-14 17:56:04",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 403448,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 403448,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "http://sitcontentjdcdn.aikan.pdnews.cn/zhbj-20231012/image/content/b7170ff0d0954b389e7e9f8c3c1d777a.png",
+          "shareSummary": "人民日报，有品质的新闻",
+          "shareTitle": "展示发",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000633589-500000008382"
+        },
+        "targetId": "30000633589",
+        "targetRelId": "500000008382",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "展示发",
+        "targetType": 13,
+        "topicType": null,
+        "uuid": "17c5a8d9-622c-4b7a-bcd2-afc792fb8fb7"
+      },
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "你好",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-14 17:55:55",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 403447,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 403447,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "http://sitcontentjdcdn.aikan.pdnews.cn/zhbj-20231103/image/content/046db0ef912f43dda639009e2b78a774.png",
+          "shareSummary": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然-导读",
+          "shareTitle": "复测-坐船观鸟，骑行散步，通州125处湿",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000637972-500000010900"
+        },
+        "targetId": "30000637972",
+        "targetRelId": "500000010900",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然",
+        "targetType": 8,
+        "topicType": null,
+        "uuid": "f809d73f-a66c-4dd6-a4cf-99e3a9c9621e"
+      },
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "你好",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-14 17:55:55",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 403447,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 403447,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "http://sitcontentjdcdn.aikan.pdnews.cn/zhbj-20231103/image/content/046db0ef912f43dda639009e2b78a774.png",
+          "shareSummary": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然-导读",
+          "shareTitle": "复测-坐船观鸟，骑行散步，通州125处湿",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000637972-500000010900"
+        },
+        "targetId": "30000637972",
+        "targetRelId": "500000010900",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然",
+        "targetType": 8,
+        "topicType": null,
+        "uuid": "f809d73f-a66c-4dd6-a4cf-99e3a9c9621e"
+      },
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "你好",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-14 17:55:55",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 403447,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 403447,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "http://sitcontentjdcdn.aikan.pdnews.cn/zhbj-20231103/image/content/046db0ef912f43dda639009e2b78a774.png",
+          "shareSummary": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然-导读",
+          "shareTitle": "复测-坐船观鸟，骑行散步，通州125处湿",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000637972-500000010900"
+        },
+        "targetId": "30000637972",
+        "targetRelId": "500000010900",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然",
+        "targetType": 8,
+        "topicType": null,
+        "uuid": "f809d73f-a66c-4dd6-a4cf-99e3a9c9621e"
+      },
+      {
+        "avatarFrame": "",
+        "checkStatus": 0,
+        "commentContent": "你好",
+        "commentContentSensitive": "",
+        "commentLevel": 1,
+        "commentPics": "",
+        "commentSensitive": "",
+        "commentType": "2",
+        "createTime": "2024-03-14 17:55:55",
+        "fromCreatorId": "",
+        "fromDeviceId": "",
+        "fromUserHeader": "https://sitcontentjdcdn.aikan.pdnews.cn//img/user/2024031215/48d5bd53227d436b9faa937b3ac14600.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg",
+        "fromUserId": "567387477063621",
+        "fromUserName": "人民日报网友aPrtq5",
+        "fromUserType": 1,
+        "h5Url": "",
+        "id": 403447,
+        "keyArticle": 0,
+        "likeNum": 0,
+        "parentCommentVo": null,
+        "parentId": -1,
+        "rootCommentId": 403447,
+        "sensitiveExist": 0,
+        "sensitiveShow": 1,
+        "shareInfo": {
+          "shareCoverUrl": "http://sitcontentjdcdn.aikan.pdnews.cn/zhbj-20231103/image/content/046db0ef912f43dda639009e2b78a774.png",
+          "shareSummary": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然-导读",
+          "shareTitle": "复测-坐船观鸟，骑行散步，通州125处湿",
+          "shareUrl": "https://pd-people-sit.pdnews.cn/column/30000637972-500000010900"
+        },
+        "targetId": "30000637972",
+        "targetRelId": "500000010900",
+        "targetRelObjectId": "2002",
+        "targetRelType": 1,
+        "targetStatus": 0,
+        "targetTitle": "复测-坐船观鸟，骑行散步，通州125处湿地邀您亲近自然",
+        "targetType": 8,
+        "topicType": null,
+        "uuid": "f809d73f-a66c-4dd6-a4cf-99e3a9c9621e"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 20,
+    "totalCommentNum": 4,
+    "totalCount": 4
+  },
+  "message": "Success",
+  "meta": null,
+  "requestId": "",
+  "success": true,
+  "timestamp": 1711092987342
+}