diff --git a/entry/src/main/ets/common/constants/CommonConstants.ets b/entry/src/main/ets/common/constants/CommonConstants.ets index 688004c661459474a77d831e20507a208ca69344..18d746a4628d915d9fcd99bafa03befd938fc64b 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 4194654e198c9ccbbf0056f1b0da6dcfc0192199..b35407af27e7981965a06d38fc35e6c5423a94b0 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 af113b27ae3cede7ec14a72e41948e3df431e2f8..0edefbab796e23dc9cfa5be89aa6e995348c133c 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;