From 665caad3d37aa57349975374582f3a611efc91bf Mon Sep 17 00:00:00 2001 From: EasyGuohf <163991322+EasyGuohf@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:13:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=8E=BB=E7=82=B9=E5=87=BB=E8=B6=85=E9=93=BE=E6=8E=A5=202?= =?UTF-8?q?=E3=80=81=E4=B8=A4=E7=BA=A7=E5=8D=8A=E6=A8=A1=E6=80=81=E9=80=82?= =?UTF-8?q?=E9=85=8DPC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/constants/CommonConstants.ets | 9 ++++++++- entry/src/main/ets/pages/Privacy.ets | 8 -------- entry/src/main/ets/pages/TwoLevelPageSheet.ets | 8 ++++++++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/entry/src/main/ets/common/constants/CommonConstants.ets b/entry/src/main/ets/common/constants/CommonConstants.ets index 688004c..18d746a 100644 --- a/entry/src/main/ets/common/constants/CommonConstants.ets +++ b/entry/src/main/ets/common/constants/CommonConstants.ets @@ -123,7 +123,14 @@ export class CommonConstants { * Breakpoint sm. */ public static readonly BREAK_POINT_SM: string = 'sm'; - + /** + * Breakpoint sm. + */ + public static readonly BREAK_POINT_MD: string = 'md'; + /** + * Breakpoint sm. + */ + public static readonly BREAK_POINT_LG: string = 'lg'; /** * MD and LG width. diff --git a/entry/src/main/ets/pages/Privacy.ets b/entry/src/main/ets/pages/Privacy.ets index 4194654..b35407a 100644 --- a/entry/src/main/ets/pages/Privacy.ets +++ b/entry/src/main/ets/pages/Privacy.ets @@ -124,14 +124,6 @@ struct PrivacyDialog { type: TextDecorationType.Underline, color: $r('sys.color.font_emphasize') }) - .onClick(() => { - if (this.dialogController != undefined) { - this.dialogController.close() - } - router.pushUrl({ - url: 'pages/Details' - }) - }) Span($r('app.string.word2')) } .fontSize($r('sys.float.Body_L')) diff --git a/entry/src/main/ets/pages/TwoLevelPageSheet.ets b/entry/src/main/ets/pages/TwoLevelPageSheet.ets index af113b2..0edefba 100644 --- a/entry/src/main/ets/pages/TwoLevelPageSheet.ets +++ b/entry/src/main/ets/pages/TwoLevelPageSheet.ets @@ -65,6 +65,10 @@ struct TwoLevelPageSheet { this.isShow = false; }) } + .margin({ + bottom: this.curBp === CommonConstants.BREAK_POINT_LG && px2vp(this.bottomRectHeight) === 0 ? + $r('sys.float.padding_level12') : $r('sys.float.padding_level6') + }) } .justifyContent(FlexAlign.SpaceBetween) .width(CommonConstants.FULL_PERCENT) @@ -94,6 +98,10 @@ struct TwoLevelPageSheet { .width(this.curBp === 'sm' ? CommonConstants.FULL_PERCENT : CommonConstants.WIDTH_MD_LG) .height($r('app.integer.button_height_small')) .backgroundColor($r('sys.color.brand')) + .margin({ + bottom: this.curBp === CommonConstants.BREAK_POINT_LG && px2vp(this.bottomRectHeight) === 0 ? + $r('sys.float.padding_level12') : $r('sys.float.padding_level6') + }) .onClick(() => { this.isShow = false; this.isShow2 = false; -- Gitee