bug修复

features/Home/src/main/ets/components/HomeIconComp.ets

@@ -17,6 +17,8 @@ export struct HomeIconComp {
   @State patientName: string = '我的患者';
   @State videoIcon: string = '';
   @State videoName: string = '肝胆视频';
+  @State zixunIcon: string = '';
+  @State consultation: string = '公益咨询';
 
   aboutToAppear(): void {
     for (const icons of this.iconList) {
@@ -24,6 +26,8 @@ export struct HomeIconComp {
         this.patientIcon = icons.img;
       } else if (icons.name === '肝胆视频') {
         this.videoIcon = icons.img;
+      } else if (icons.name == '公益咨询') {
+        this.zixunIcon = icons.img
       }
     }
 
@@ -38,7 +42,7 @@ export struct HomeIconComp {
   build() {
     Row() {
       Grid() {
-        ForEach(this.iconList, (item: iconsModel) => {//[{ 'img': this.patientIcon, 'name': this.patientName },{ 'img': this.videoIcon, 'name': this.videoName}]
+        ForEach([{ 'img': this.patientIcon, 'name': this.patientName },{ 'img': this.videoIcon, 'name': this.videoName},{'img':this.zixunIcon,'name':this.consultation}], (item: iconsModel) => {//this.iconList
           GridItem(){
             Stack() {
               Column() {
@@ -56,24 +60,15 @@ export struct HomeIconComp {
             }.width('25%').alignContent(Alignment.TopEnd)
           }.margin({top:20,bottom:20})
           .onClick(async ()=>{
-            const patients = await patientDbManager.getAllPatients();
-            console.info(`添加了 ${patients.length} 个患者`);
-            promptAction.showToast({message:`添加了 ${patients.length} 个患者`})
             if(item.name=='公益咨询') {
               router.pushUrl({ url: 'pages/Netease/PublicConsultationPage' })
-            }
-            else if(item.name=='我的患者') {
+            } else if(item.name=='我的患者') {
               router.pushUrl({url:'pages/Netease/imTabPage'})
-            }
-
-
-            try {
-              const pushToken = pushService.getToken();
-              console.info("PushService", `Get push token successfully: ${pushToken}`)
-            } catch (err) {
-              // fail
-              let e: BusinessError = err as BusinessError;
-              console.error("PushService", 'Get push token catch error: ' + e.code + ' ' + e.message);
+            } else if (item.name == '肝胆视频') {
+              router.pushUrl({
+                url:'pages/VideoPage/VideoGandanPage',
+                params:{"page":"首页"}
+              })
             }
 
           })

features/Home/src/main/ets/components/HomeReplayVideoComp.ets

@@ -28,6 +28,7 @@ export struct HomeReplayVideoComp {
         .onClick(()=>{
           router.pushUrl({
             url:'pages/VideoPage/VideoGandanPage',
+            params:{"page":"首页"}
           })
         })
       }.height(50)

features/Home/src/main/ets/pages/VideoGandan.ets

@@ -7,10 +7,20 @@ import { getDisplayWindowWidth } from 'media-player-common'
 
 @Component
 export struct VideoGandan {
+  @State params:Record<string, string> = router.getParams() as Record<string, string>
+  @State isShowNaviLeft:boolean = false
+
+  aboutToAppear(): void {
+    if (this.params) {
+      if (this.params["page"] == '首页') {
+        this.isShowNaviLeft = true
+      }
+    }
+  }
 
   build() {
     Column() {
-      HdNav({ title: '肝胆视频', showRightIcon: true, showLeftIcon: false,showRightText:false,rightIcon:$r('app.media.selected_hospital_ws'),rightItemAction:()=>{
+      HdNav({ title: '肝胆视频', showRightIcon: true, showLeftIcon: this.isShowNaviLeft,showRightText:false,rightIcon:$r('app.media.selected_hospital_ws'),rightItemAction:()=>{
         router.pushUrl({
           url:'pages/SearchPage/VideoSearchPage',
           params:{'pageName':'视频'}

features/mypage/src/main/ets/view/MyPageSectionItem.ets

@@ -11,7 +11,9 @@ export struct MyPageSectionItem {
           .width(24).height(24)
           .objectFit(ImageFit.Auto)
         Text(this.sectionItem.title)
-          .fontSize(14)
+          .maxFontSize(14)
+          .minFontSize(6)
+          .maxLines(1)
           .fontColor('#333333')
           .margin({ top: 10 })
       }.width('100%')

features/netease/src/main/ets/view/PatientListComp.ets

@@ -241,9 +241,7 @@ export struct PatientListComp {
               .width('100%')
               .align(Alignment.Start)
               .onClick(() => {
-                router.pushUrl({
-                  url:'pages/PatientsPage/PatientPages'
-                })
+                HMRouterMgr.push({pageUrl:'PatientApplyPage',param:"我的患者"})
               })
               ListItem() {
                 Row() {
@@ -291,9 +289,7 @@ export struct PatientListComp {
               .width('100%')
               .align(Alignment.Start)
               .onClick(() => {
-                router.pushUrl({
-                  url:'pages/PatientsPage/PatientsGroupPage'
-                })
+                HMRouterMgr.push({pageUrl:'PatientsGroup',param:"我的患者"})
               })
               ForEach(this.regionDataGroupsList, (regionDataGroups: Groups, index) => {
 

features/patient/src/main/ets/components/AddAndEditRecordComp.ets

@@ -258,7 +258,7 @@ export struct AddAndEditRecordComp {
           }
           this.photos.push(...selectedUris);
           this.maxSelectNumber = 8 - this.photos.length
-          ChangeUtil.convertUrisOrUrlsToBase64(selectedUris).then(base64Array => {
+          ChangeUtil.convertUrisOrUrlsToBase64(this.photos).then(base64Array => {
             console.info('转换结果:', base64Array+'转换个数:'+base64Array.length)
             this.base64Array = base64Array
           }).catch((err:BusinessError) => {

features/patient/src/main/ets/components/PatientApplyPage.ets

@@ -8,6 +8,7 @@ import { BusinessError } from '@kit.BasicServicesKit';
 import { promptAction, router } from '@kit.ArkUI'
 import { patientDbManager, PatientData } from '@itcast/basic';
 import { PullToRefreshLayout, RefreshController } from 'refreshlib'
+import { HMRouter, HMRouterMgr } from '@hadss/hmrouter';
 
 interface extraData {
   expertUuid: string,
@@ -16,9 +17,11 @@ interface extraData {
   status: string
 }
 
+@HMRouter({ pageUrl: 'PatientApplyPage' })
 @Component
 export struct PatientApplyPage {
   public controller:RefreshController = new RefreshController();
+  private params: ESObject = HMRouterMgr.getCurrentParam()
   scroller = new Scroller();
   @State applyArray:applyListModel[] = [];
   @State historyArray:historyModel[] = [];
@@ -137,7 +140,10 @@ export struct PatientApplyPage {
 
   build() {
     Column(){
-      HdNav({ title: '新的患者', showRightIcon: false, hasBorder: true })
+      HdNav({ title: '新的患者', showRightIcon: false, hasBorder: true, isLeftAction:this.params?true:false,
+        leftItemAction:()=>{
+          HMRouterMgr.pop()
+        }, })
       PullToRefreshLayout({
         scroller:this.scroller,
         viewKey:"ListPage",

features/patient/src/main/ets/components/PatientCommonSettingComp.ets

@@ -146,6 +146,7 @@ export struct PatientCommonSettingComp {
         Column() {
             Row() {
               Image(BasicConstant.urlImage + this.itemList.photo)
+                .alt($r('app.media.userPhoto_default'))
                 .width(60)
                 .height(60)
                 .borderRadius(6)

features/patient/src/main/ets/components/PatientsGroup.ets

@@ -5,8 +5,9 @@ import { BasicConstant,hdHttp, HdResponse ,logger} from '@itcast/basic/Index'
 import { BusinessError } from '@kit.BasicServicesKit';
 import HashMap from '@ohos.util.HashMap';
 import { groupRequest,groupRequestCall,groupModel,patientListModel } from '../models/PatientsGroupModel'
-import { HMRouterMgr, HMRouterPathInfo, HMRouterPathCallback } from "@hadss/hmrouter"
+import { HMRouterMgr, HMRouterPathInfo, HMRouterPathCallback, HMRouter } from "@hadss/hmrouter"
 
+@HMRouter({ pageUrl: 'PatientsGroup' })
 @Component
 export struct PatientsGroup {
   @State groupSort: string = '分组排序'
@@ -20,7 +21,8 @@ export struct PatientsGroup {
   @State isMaiLanHidden:boolean = false;//麦兰项目是否显示
   @State group_sort:string = '0'
   @State list_sort:string = '0'
-  @State groupListArray: groupModel[] = [];
+  @State groupListArray: groupModel[] = []
+  private params: ESObject = HMRouterMgr.getCurrentParam()
 
   dialog: CustomDialogController = new CustomDialogController({
     builder: HdLoadingDialog({ message: '加载中...' }),
@@ -88,6 +90,10 @@ export struct PatientsGroup {
         hasBorder: true,
         rightText: '新建',
         showRightText: true,
+        isLeftAction:this.params?true:false,
+        leftItemAction:()=>{
+          HMRouterMgr.pop()
+        },
         rightItemAction: () => {
           HMRouterMgr.push({pageUrl:'BuildOrEditGroupPage',param:{"title":"新建分组"}})
           // router.pushUrl({