Merge branch 'zhongqi-chat'

mallApp/src/pages/goods/components/buy-foot.vue

@@ -48,18 +48,15 @@ export default {
 .app-footer {
     @include disFlex(center, space-between);
     position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
     z-index: 9999;
     background-color: #FFFFFF;
-    min-height: 160upx !important;
-    padding: 20upx 0;
-    padding-bottom: calc(24upx + constant(safe-area-inset-bottom));
-    padding-bottom: calc(24upx + env(safe-area-inset-bottom));
+    min-height: 168upx !important;
+    padding: 40upx 0;
+    padding-bottom: calc(2upx + constant(safe-area-inset-bottom)); /* iOS 11.0 */
+    padding-bottom: calc(2upx + env(safe-area-inset-bottom)); /* env(safe-area-inset-bottom) 是 iOS 设备底部安全区域的高度，用于适配刘海屏/全面屏手机，确保内容不被遮挡。在非刘海屏设备上值为0 */
     box-shadow: 0 -2upx 10upx rgba(0, 0, 0, 0.05);
     /* #ifdef MP */
-    bottom: 20upx;  /* 统一在小程序中上移20upx */
+    bottom: 0;
     /* #endif */
 
     .btn-left {

mallApp/src/pages/goods/detail.vue

@@ -402,12 +402,12 @@ export default {
 .app-content {
   height: 100%;
   /* #ifdef MP */
-  padding-bottom: calc(220upx + constant(safe-area-inset-bottom)); /* iOS 11.0 */
-  padding-bottom: calc(220upx + env(safe-area-inset-bottom)); /* iOS 11.2+ */
+  padding-bottom: calc(100upx + constant(safe-area-inset-bottom)); /* iOS 11.0 */
+  padding-bottom: calc(100upx + env(safe-area-inset-bottom)); /* iOS 11.2+ */
   /* #endif */
   /* #ifdef APP-PLUS */
-  padding-bottom: calc(200upx + constant(safe-area-inset-bottom)); /* iOS 11.0 */
-  padding-bottom: calc(200upx + env(safe-area-inset-bottom)); /* iOS 11.2+ */
+  padding-bottom: calc(100upx + constant(safe-area-inset-bottom)); /* iOS 11.0 */
+  padding-bottom: calc(100upx + env(safe-area-inset-bottom)); /* iOS 11.2+ */
   /* #endif */
   box-sizing: border-box;
   // 公共模块