Merge remote-tracking branch 'origin/main'

@@ -21,7 +21,7 @@ export default struct MinePageUserSimpleInfoUI {
       ///已登录状态，先获取本地数据
       ///已登录状态，先获取本地数据
       this.userName = SPHelper.default.getSync(SpConstants.USER_NAME,"") as string
       this.userName = SPHelper.default.getSync(SpConstants.USER_NAME,"") as string
       this.headPhotoUrl = SPHelper.default.getSync(SpConstants.USER_HEAD_PHOTO_URL,"") as string
       this.headPhotoUrl = SPHelper.default.getSync(SpConstants.USER_HEAD_PHOTO_URL,"") as string
-
+      this.userType = SPHelper.default.getSync(SpConstants.USER_Type,"") as string
       this.getUserInfo()
       this.getUserInfo()
     }else{
     }else{
       this.headPhotoUrl = ""
       this.headPhotoUrl = ""
@@ -33,8 +33,8 @@ export default struct MinePageUserSimpleInfoUI {
     Row(){
     Row(){
       //头像
       //头像
       Stack(){
       Stack(){
-        Image(this.headPhotoUrl==""?$r('app.media.default_head'):this.headPhotoUrl)
-          .alt($r('app.media.default_head'))
+        Image(this.headPhotoUrl)
+          .alt(this.userType === '1'?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
           .width(`${this.calcHeight(100)}lpx`)
           .width(`${this.calcHeight(100)}lpx`)
           .height(`${this.calcHeight(100)}lpx`)
           .height(`${this.calcHeight(100)}lpx`)
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)

@@ -37,7 +37,7 @@ export struct AppointmentListUI {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {
           if(this.isConnectNetwork){
           if(this.isConnectNetwork){
             EmptyComponent({ emptyType: 10 })
             EmptyComponent({ emptyType: 10 })
-              .height('100%')
+              .height('80%')
               .width('100%')
               .width('100%')
           }else{
           }else{
             EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
             EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {

@@ -47,7 +47,7 @@ struct MyCollectionListPage {
       },
       },
       title:this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏',
       title:this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏',
       tipShow: false ,
       tipShow: false ,
-      leftTextColor:$r('app.color.color_648DF2'),
+      leftTextColor:$r('app.color.color_333333')
     }),
     }),
     autoCancel: true,
     autoCancel: true,
     alignment: DialogAlignment.Center,
     alignment: DialogAlignment.Center,

@@ -49,7 +49,7 @@ export struct MineSettingComponent {
       title: "清理缓存",
       title: "清理缓存",
       tipValue:"是否确认清理此App的缓存",
       tipValue:"是否确认清理此App的缓存",
       tipShow:true,
       tipShow:true,
-      leftTextColor:$r('app.color.color_648DF2')
+      leftTextColor:$r('app.color.color_333333')
     }),
     }),
     autoCancel: true,
     autoCancel: true,
     alignment: DialogAlignment.Center,
     alignment: DialogAlignment.Center,

@@ -129,7 +129,7 @@ export struct EmptyComponent {
         .fontWeight(FontWeight.Normal)
         .fontWeight(FontWeight.Normal)
         .opacity(this.TEXT_OPACITY)
         .opacity(this.TEXT_OPACITY)
         .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
         .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
-        .fontColor(this.emptyType !== 15 ? '#FFCCCCCC' : '#999999')
+        .fontColor('#666666')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
           Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`);
           Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`);
         })
         })

@@ -26,7 +26,7 @@ struct DefaultWebPage {
           isPageEnd: $isPageEnd
           isPageEnd: $isPageEnd
         })
         })
       }.layoutWeight(1)
       }.layoutWeight(1)
-      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
+
 
 
       Row() {
       Row() {
         Button({ type: ButtonType.Normal }) {
         Button({ type: ButtonType.Normal }) {