diff --git a/App.vue b/App.vue index aab2510..e8e9027 100644 --- a/App.vue +++ b/App.vue @@ -13,6 +13,23 @@ diff --git a/components/gmy-float-touch/gmy-float-touch.vue b/components/gmy-float-touch/gmy-float-touch.vue index 2ff174d..92a2c45 100644 --- a/components/gmy-float-touch/gmy-float-touch.vue +++ b/components/gmy-float-touch/gmy-float-touch.vue @@ -186,4 +186,21 @@ right: 20upx; transition: top 0.2s, right 0.2s, opacity 0.2s; } + + /* #ifdef H5 */ + // xuchao: 宽屏时页面列居中(375px),悬浮球及菜单同步锚定到列左缘,避免脱离页面 + @media screen and (min-width: 751px) { + .box { + left: calc(50vw - 184px) !important; + } + .menu0, .menu0R { + left: calc(50vw - 184px) !important; + right: auto !important; + } + .menu4, .menu4R { + left: calc(50vw - 134px) !important; + right: auto !important; + } + } + /* #endif */ diff --git a/pages.json b/pages.json index 0baf8a7..9498e90 100644 --- a/pages.json +++ b/pages.json @@ -69,6 +69,9 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "质惠游", "navigationBarBackgroundColor": "#ffffff", - "backgroundColor": "#ffffff" + "backgroundColor": "#ffffff", + // xuchao: 宽屏适配 —— 窗口超过 750px 时 rpx 换算基准锁定为 375px(手机尺寸),不随屏幕拉大 + "rpxCalcMaxDeviceWidth": 750, + "rpxCalcBaseDeviceWidth": 375 } } diff --git a/pages/ticket/orderdetail.vue b/pages/ticket/orderdetail.vue index 669ef8d..eba6511 100644 --- a/pages/ticket/orderdetail.vue +++ b/pages/ticket/orderdetail.vue @@ -167,7 +167,7 @@ + style="width: 654rpx;position: fixed;height: 88rpx;line-height: 88rpx;background: #fff;bottom: 0rpx;left: 0rpx;right: 0rpx;margin: 0 auto;border-bottom: constant(safe-area-inset-bottom) solid #fff;border-bottom: env(safe-area-inset-bottom) solid #fff;"> 确定 @@ -488,6 +488,13 @@ background-color: #fff; position: fixed; bottom: 0rpx; + // xuchao: 视口水平居中(宽屏下与页面列对齐)+ 全面屏底部安全区 + left: 0rpx; + right: 0rpx; + margin-left: auto; + margin-right: auto; + border-bottom: constant(safe-area-inset-bottom) solid #fff; + border-bottom: env(safe-area-inset-bottom) solid #fff; gap: 20rpx; padding-right: 24rpx; justify-content: flex-end; diff --git a/pages/ticket/ordersure.vue b/pages/ticket/ordersure.vue index 9a4d7df..ae4253d 100644 --- a/pages/ticket/ordersure.vue +++ b/pages/ticket/ordersure.vue @@ -136,7 +136,7 @@ + style="width: 654rpx;position: fixed;height: 88rpx;line-height: 88rpx;background: #fff;bottom: 0rpx;left: 0rpx;right: 0rpx;margin: 0 auto;border-bottom: constant(safe-area-inset-bottom) solid #fff;border-bottom: env(safe-area-inset-bottom) solid #fff;"> 确定 @@ -559,7 +559,16 @@ background-color: #fff; height: 62px; position: fixed; - // bottom: 0rpx; + // xuchao: 改为底部锚定(原来用 JS 算 top,宽屏缩放后会错位),并给全面屏留出底部安全区 + top: auto !important; + bottom: 0; + // xuchao: 视口水平居中 —— 宽屏下与居中的页面列对齐 + left: 0rpx; + right: 0rpx; + margin-left: auto; + margin-right: auto; + border-bottom: constant(safe-area-inset-bottom) solid #fff; + border-bottom: env(safe-area-inset-bottom) solid #fff; padding: 14rpx 24rpx; } diff --git a/pages/ticket/person.vue b/pages/ticket/person.vue index 05aea0d..e980b14 100644 --- a/pages/ticket/person.vue +++ b/pages/ticket/person.vue @@ -208,8 +208,13 @@ color: #fff; font-size: 28rpx; background: linear-gradient(180deg, #FF9E49 0%, #ED3B1A 100%); - margin-left: 30rpx; + // xuchao: 视口水平居中(宽屏下与页面列对齐) + left: 0rpx; + right: 0rpx; + margin: 0 auto; position: fixed; - bottom: 25rpx; + // xuchao: 全面屏底部安全区 —— 悬浮按钮整体上移 + bottom: calc(25rpx + constant(safe-area-inset-bottom)); + bottom: calc(25rpx + env(safe-area-inset-bottom)); } \ No newline at end of file diff --git a/pages/ticket/select.vue b/pages/ticket/select.vue index 409888b..1207ae3 100644 --- a/pages/ticket/select.vue +++ b/pages/ticket/select.vue @@ -13,7 +13,7 @@ - + 完成