Merge remote-tracking branch 'origin/main'

zhenghy
Commit f697def177989fc031ef2ee062db0c548ea05aa5 f697def1 2 parents dfc7bfd3 706d805c
Showing 4 changed files with 22 additions and 13 deletions
sight_harmony/features/wdComponent/src/main/ets/components/reserveMore/ReserveMorePage.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchHistoryComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/setting/AccountAndSecurityLayout.ets
sight_harmony/products/phone/src/main/ets/pages/column/ColumnPage.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/reserveMore/ReserveMorePage.ets
View file @f697def
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/reserveMore/ReserveMorePage.ets
View file @f697def
@@ -129,7 +129,7 @@ struct ReserveMorePage {
       Stack() {
         Image(item.fullColumnImgUrls[0]?.url)
           .width('100%')
-          .height(196)
+          .objectFit(ImageFit.Contain)
           .borderRadius(4)
         this.LiveImage()
@@ -283,7 +283,7 @@ struct ReserveMorePage {
         .fontWeight(400)
         .fontColor(Color.White)
     }
-    .backgroundColor('#4D000000')
+    .backgroundColor(Color.Transparent)
     .margin({ right: 8, bottom: 8 })
   }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchHistoryComponent.ets
View file @f697def
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchHistoryComponent.ets
View file @f697def
@@ -16,7 +16,7 @@ export struct SearchHistoryComponent{
       confirm: () => {
         this.onAccept()
       },
-      title: "确认清空历史记录",
+      title: "确认清空历史记录？",
       tipShow:false,
       leftTextColor:$r('app.color.color_648DF2')
     }),
--- a/sight_harmony/features/wdComponent/src/main/ets/components/setting/AccountAndSecurityLayout.ets
View file @f697def
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/setting/AccountAndSecurityLayout.ets
View file @f697def
@@ -234,7 +234,9 @@ export struct AccountAndSecurityLayout {
         RelativeContainer() {
           Text('注销账号')
             .fontColor('#FF333333')
-            .fontSize(18)
+            .fontSize("35lpx")
+            .fontWeight(400)
+            .lineHeight("50lpx")
             .textAlign(TextAlign.Center)
             .height(44)
             .alignRules({
@@ -265,51 +267,52 @@ export struct AccountAndSecurityLayout {
         Text('为保证您的账号安全，在您提交的注销申请生效前，需同时满足以下几个条件：')
           .fontColor('#FF222222')
-          .fontSize(16)
           .fontWeight(600)
-          .padding({ top:17,left: 16, right: 16 })
+          .lineHeight("42lpx")
+          .fontSize("31lpx")
+          .padding({ top:17,left: "31lpx", right: "31lpx" })
           .width('100%')
         Text('1. 账号处于安全状态')
           .fontColor('#FF222222')
           .fontSize(16)
           .fontWeight(600)
-          .padding({ top: 24, left: 16 })
+          .padding({ top: 24, left: "62lpx" })
           .width('100%')
         Text('账号处于正常使用状态，无被盗风险。')
           .fontColor('#FF666666')
           .fontSize(14)
           .fontWeight(400)
-          .padding({ top: 8, left: 16 })
+          .padding({ top: 8, left: "62lpx" })
           .width('100%')
         Text('2. 账号权限解除')
           .fontColor('#FF222222')
           .fontSize(16)
           .fontWeight(600)
-          .padding({ top: 24, left: 16 })
+          .padding({ top: 24, left: "62lpx" })
           .width('100%')
         Text('账号已解除与其他产品的授权登录或绑定关系。')
           .fontColor('#FF666666')
           .fontSize(14)
           .fontWeight(400)
-          .padding({ top: 8, left: 16 })
+          .padding({ top: 8, left: "62lpx" })
           .width('100%')
         Text('3. 账号无任何纠纷，包括举报投诉')
           .fontColor('#FF222222')
           .fontSize(16)
           .fontWeight(600)
-          .padding({ top: 24, left: 16 })
+          .padding({ top: 24, left: "62lpx" })
           .width('100%')
         Text('请注意：注销后7天内不能再次注册人民日报客户端，需要等到账号冷静期结束才能再次登录注册')
           .fontColor('#FFED2800')
           .fontSize(14)
           .fontWeight(400)
-          .padding({ top: 32, left: 16, right: 16 })
+          .padding({ top: 32, left: "31lpx", right: "31lpx" })
           .width('100%')
       }.alignRules({
--- a/sight_harmony/products/phone/src/main/ets/pages/column/ColumnPage.ets
View file @f697def
+++ b/sight_harmony/products/phone/src/main/ets/pages/column/ColumnPage.ets
View file @f697def
@@ -2,6 +2,7 @@ import { PageComponent } from 'wdComponent/Index';
 import { HashMap } from '@kit.ArkTS';
 import { router } from '@kit.ArkUI';
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
+import { CustomTitleUI } from 'wdComponent/src/main/ets/components/reusable/CustomTitleUI';
 const TAG = 'ColumnPage';
@@ -15,21 +16,26 @@ export struct ColumnPage {
   @State param: AssignChannelParam = router.getParams() as AssignChannelParam
   pageId: string = "";
   channelId: string = "";
+  pageName: string = ''
   aboutToAppear() {
     this.pageId = this.param.pageId
     this.channelId = this.param.channelId
+    this.pageName = this.param.pageName
   }
   build() {
     Column() {
+      CustomTitleUI({ titleName: this.pageName })
       PageComponent({
         currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
         navIndex: this.currentTopNavSelectedIndex,
         pageId: this.pageId,
         channelId: this.channelId,
       });
-    }
+    }.height('100%')
+    .width('100%')
+    .backgroundColor($r('app.color.white'))
   }
 }