From afaad76fe336a6740ba0c367635340df650d7b1c Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Thu, 8 Sep 2022 18:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=88=20style:=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.module.scss             | 10 ++++++----
 .../orderStatusList/index.module.scss         |  2 +-
 src/pages/order/index.module.scss             |  5 ++++-
 src/pages/order/index.tsx                     | 19 ++++++++++++-------
 4 files changed, 23 insertions(+), 13 deletions(-)

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 (
     <View>
-      <Search placeholder='搜索商品/名称/颜色/订单号' showBtn={false} changeOnSearch={getSearchData} debounceTime={300} >
-        <View className={styles.flexBox} onClick={() => showSelctPopup()}>
-          <View className={classnames('iconfont', 'icon-shaixuan', !isDisabled ? styles.icon_shaixuan : styles.activeshaixuan)}></View>
-          <View className={classnames(isDisabled ? styles.shaixuan : styles.activeshai)}>筛选</View>
-        </View>
-      </Search>
-      <OrderStatusList list={statusList} onSelect={changeStatus} defaultId={-1} />
+      <View style={{ background: '#FFFFFF', paddingLeft: '20rpx', paddingBottom: '20rpx', position: 'sticky', top: '0', zIndex: '99' }}>
+        <Search placeholder='搜索商品/名称/颜色/订单号' showBtn={false} changeOnSearch={getSearchData} debounceTime={300} >
+          <View className={styles.flexBox} onClick={() => showSelctPopup()}>
+            <View className={classnames('iconfont', 'icon-shaixuan', !isDisabled ? styles.icon_shaixuan : styles.activeshaixuan)}></View>
+            <View className={classnames(isDisabled ? styles.shaixuan : styles.activeshai)}>筛选</View>
+          </View>
+        </Search>
+      </View>
+      <View style={{ background: '#FFFFFF', }}>
+        <OrderStatusList list={statusList} onSelect={changeStatus} defaultId={-1} />
+      </View>
       <View className={styles.order_list}>
         <InfiniteScroll
           statusMore={statusMore}
@@ -251,6 +255,7 @@ export default () => {
             )
           })}
         </InfiniteScroll>
+        <View className={styles.kongboxTwo}></View>
       </View>
       <Popup title={'筛选订单'} show={showPopup} onClose={() => closePopup()}>
         <View className={styles.popupBox}>