diff --git a/src/pages/index/index.module.scss b/src/pages/index/index.module.scss index dabaed2..2d1bbd0 100644 --- a/src/pages/index/index.module.scss +++ b/src/pages/index/index.module.scss @@ -1,6 +1,6 @@ .main { background-color: $color_bg_one; - height: 100vh; + // height: 100vh; display: flex; flex-direction: column; @@ -30,8 +30,10 @@ } .products { - flex: 1; - height: 0; + padding-bottom: calc($customTabBarHeight + env(safe-area-inset-bottom)); + height: calc(100vh - $customTabBarHeight - env(safe-area-inset-bottom) - 100px); } -} \ No newline at end of file +} + +//246 \ No newline at end of file diff --git a/src/pages/order/components/orderStatusList/index.module.scss b/src/pages/order/components/orderStatusList/index.module.scss index a0dac2a..57d864e 100644 --- a/src/pages/order/components/orderStatusList/index.module.scss +++ b/src/pages/order/components/orderStatusList/index.module.scss @@ -1,7 +1,7 @@ .order_status_list{ font-size: $font_size; color: #000; - margin-top: 20px; + // margin-top: 20px; .order_status_item{ padding: 20px; box-sizing: border-box; diff --git a/src/pages/order/index.module.scss b/src/pages/order/index.module.scss index ea7a43a..e3d688d 100644 --- a/src/pages/order/index.module.scss +++ b/src/pages/order/index.module.scss @@ -246,11 +246,14 @@ .order_list { - height: calc(100vh - 160px); + height: calc(100vh - $customTabBarHeight + env(safe-area-inset-bottom) - 345px); background: #f7f7f7; .bigBpx { height: 200px; } + .kongboxTwo { + height: calc($customTabBarHeight + env(safe-area-inset-bottom)); + } } \ No newline at end of file diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 5be8903..0d672cc 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -229,13 +229,17 @@ export default () => { }, []) return ( - - showSelctPopup()}> - - 筛选 - - - + + + showSelctPopup()}> + + 筛选 + + + + + + { ) })} + closePopup()}>