Merge remote-tracking branch 'origin/main'

@@ -27,7 +27,7 @@ struct EditUserInfoPage {
       }
     }),
     alignment: DialogAlignment.Bottom,
-    offset:{dx:0,dy:-20}
+    offset:{dx:0,dy:-20},
   })
 
   aboutToAppear() {
@@ -97,14 +97,14 @@ struct EditUserInfoPage {
       Row(){
         Text(r.title)
           .fontSize(15)
-          .fontColor(Color.Gray)
+          .fontColor('#666666')
         Blank()
 
         Text(r.subTitle)
           .textOverflow({overflow:TextOverflow.Ellipsis})
           .maxLines(1)
           .fontSize(14)
-          .fontColor(Color.Gray)
+          .fontColor(r.subTitle === '待完善'?'#999999':'#666666')
           .padding({right:10})
           .width('70%')
           .textAlign(TextAlign.End)

@@ -45,7 +45,7 @@ struct EditUserIntroductionPage {
       Divider()
         .margin(20)
 
-      Text('1、账号中（头像、昵称等）不允许含有违禁违规内容；\n2、最多60个字，只能输入中文、数字、英文字母。')
+      Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多60个字，只能输入中文、数字、英文字母。')
         .fontSize(13)
         .padding(12)
         .fontColor(Color.Gray).lineHeight(25)
@@ -54,6 +54,8 @@ struct EditUserIntroductionPage {
         .type(ButtonType.Normal)
         .width('90%')
         .backgroundColor('#ED2800')
+        .opacity(this.numCount === 0 ? 0.6 : 1)
+        .fontColor(this.numCount === 0 ? '#999999' : Color.White)
         .borderRadius(5)
         .margin(30)
         .onClick(()=>{

@@ -47,7 +47,7 @@ struct EditUserNikeNamePage {
       Divider()
         .margin(20)
 
-      Text('1、账号中（头像、昵称等）不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
+      Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
         .fontSize(13)
         .padding(12)
         .fontColor(Color.Gray).lineHeight(25)
@@ -56,6 +56,8 @@ struct EditUserNikeNamePage {
         .type(ButtonType.Normal)
         .width('90%')
         .backgroundColor('#ED2800')
+        .opacity(this.numCount === 0 ? 0.6 : 1)
+        .fontColor(this.numCount === 0 ? '#999999' : Color.White)
         .borderRadius(5)
         .margin(30)
         .onClick(()=>{

@@ -11,6 +11,7 @@ import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { BigPicCardComponent } from '../view/BigPicCardComponent';
 import { contentListItemParams } from '../../model/MyCollectionModel';
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
+import { MyCustomDialog } from '../reusable/MyCustomDialog'
 
 @Entry
 @Component
@@ -26,6 +27,19 @@ struct MyCollectionListPage {
   @State  currentPage: number = 1;
   private scroller: Scroller = new Scroller();
 
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: MyCustomDialog({
+      confirm: () => {
+        this.deleteDatas()
+      },
+      titleShow:false,
+      tipValue: this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏'
+    }),
+    autoCancel: true,
+    alignment: DialogAlignment.Center,
+    customStyle: true
+  })
+
   aboutToAppear(){
     this.getData()
   }
@@ -73,7 +87,7 @@ struct MyCollectionListPage {
               this.allSelectDatas(isAllSelect)
             },
             confirmCallback:()=>{
-              this.deleteDatas()
+              this.dialogController.open()
             }
           })
         }

@@ -9,7 +9,7 @@ export  struct AreaPickerDialog {
   @Provide currentSecondBean: AreaListManageModel = new AreaListManageModel('','','',[])
   @Provide currentThirdBean: AreaListManageModel = new AreaListManageModel('','','',[])
   controller: CustomDialogController
-  title: string  = '地区选择'
+  title: string  = '修改地区'
   @Provide dataSource: AreaListModel[] = []
   result: JSON[] = [];
   confirmCallback: (province:string,city:string,county:string,address:string) => void = () => {
@@ -33,7 +33,7 @@ export  struct AreaPickerDialog {
 
         Blank()
 
-        Button('确定',{type:ButtonType.Normal})
+        Button('提交',{type:ButtonType.Normal})
           .onClick(()=> {
             this.controller.close()
             this.confirmCallback(this.currentFirst.label,this.currentSecondBean.label,this.currentThirdBean.label,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);

@@ -28,9 +28,11 @@ export   struct  FirstLevelComponent  {
               this.currentFirst = EditInfoViewModel.getAreaListManageModel(this.dataSource[index as number])
             })
             .backgroundColor(Color.White)
-            .border({color:'#e2e2e2',width:{right:0.5}})
+            // .border({color:'#e2e2e2',width:{right:0.5}})
             .width('100%')
             .layoutWeight(1)
+            .selectedTextStyle({color:'#666666'})
+            .textStyle({color:'#999999'})
         }
       }
       .justifyContent(FlexAlign.Center)

@@ -21,9 +21,11 @@ export   struct  SecondLevelComponent  {
               this.currentSecondBean = EditInfoViewModel.getAreaListManageModel(this.currentFirst.children[index as number])
             })
             .backgroundColor(Color.White)
-            .border({color:'#e2e2e2',width:{right:0.5}})
+            // .border({color:'#e2e2e2',width:{right:0.5}})
             .width('100%')
             .layoutWeight(1)
+            .selectedTextStyle({color:'#666666'})
+            .textStyle({color:'#999999'})
         }
       }
       .justifyContent(FlexAlign.Center)

@@ -22,9 +22,11 @@ export   struct  ThirdLevelComponent  {
               this.currentThirdBean = EditInfoViewModel.getAreaListManageModel(this.currentSecondBean.children[index as number])
             })
             .backgroundColor(Color.White)
-            .border({color:'#e2e2e2',width:{right:0.5}})
+            // .border({color:'#e2e2e2',width:{right:0.5}})
             .width('100%')
             .layoutWeight(1)
+            .selectedTextStyle({color:'#666666'})
+            .textStyle({color:'#999999'})
         }
       }
       .justifyContent(FlexAlign.Center)

@@ -125,7 +125,7 @@ class EditInfoViewModel {
       this.BasePostRequest(item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname?HttpUrlUtils.APPOINTMENT_editUserDetail1_PATH:HttpUrlUtils.APPOINTMENT_editUserDetail_PATH,this.params)
         .then((navResDTO: ResponseDTO) => {
           if (navResDTO.code == 0) {
-            promptAction.showToast({ message: '修改成功' })
+            promptAction.showToast({ message: '您的资料已提交' })
             success(navResDTO)
           }else {
             promptAction.showToast({ message: navResDTO.message })

@@ -47,7 +47,7 @@ struct LaunchInterestsHobbiesPage {
         .width('100%')
         .height('61lpx')
         .margin({top:'84lpx'})
-      Text('完善信息，将为您推荐个性化的内容')
+      Text('完善信息,将为您推荐个性化的内容')
         .fontSize('27lpx')
         .textAlign(TextAlign.Center)
         .fontColor('#9E9E9E')
@@ -69,8 +69,8 @@ struct LaunchInterestsHobbiesPage {
                 Image('')
                   .width('100%')
                   .height('100%')
-                  .backgroundColor(Color.Gray)
-                  .opacity(item.choose?0.85:0)
+                  .backgroundColor(Color.Black)
+                  .opacity(item.choose?0.5:0)
                   .borderRadius(5)
               }
 
@@ -134,14 +134,14 @@ struct LaunchInterestsHobbiesPage {
           .width('662lpx')
           .height('84lpx')
           .backgroundColor(Color.White)
-          .opacity(this.selectCount == 0 ? 0.3 : 0)
+          .opacity(this.selectCount == 0 ? 0.6 : 0)
           .borderRadius('10lpx')
           .onClick(()=>{
             if (this.selectCount == 0) {
               promptAction.showToast({
                 message : '请先选择您感兴趣的内容哦',
                 duration: 2000,
-                bottom: '50%'
+                bottom: '50%',
               })
                return
             }