From e8d6ff30cbb4a6d0770dcb3c720d92eb7454b7c0 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 2 Mar 2023 18:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E8=89=B2=E5=8D=A1=E4=B8=8E?=
 =?UTF-8?q?=E5=89=AA=E6=A0=B7=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navBar/index.module.scss        | 4 ++++
 src/pages/colorCardOrder/index.module.scss     | 1 +
 src/pages/colorCardOrder/index.tsx             | 1 +
 src/pages/cutSampleListOrder/index.module.scss | 1 +
 src/pages/cutSampleListOrder/index.tsx         | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/navBar/index.module.scss b/src/components/navBar/index.module.scss
index 8cafbeb..3b2529a 100644
--- a/src/components/navBar/index.module.scss
+++ b/src/components/navBar/index.module.scss
@@ -3,6 +3,10 @@
   background-color: #fff;
   height: auto;
   flex-shrink: 0;
+  position: fixed;
+  width: 100%;
+  top: 0;
+  z-index: 9999;
 }
 .navBar {
   display: flex;
diff --git a/src/pages/colorCardOrder/index.module.scss b/src/pages/colorCardOrder/index.module.scss
index 438b652..bdf1c04 100644
--- a/src/pages/colorCardOrder/index.module.scss
+++ b/src/pages/colorCardOrder/index.module.scss
@@ -2,6 +2,7 @@
   min-height: 100vh;
   background-color: #f7f7f7ff;
   padding-bottom: 180px;
+  padding-top: 190px;
   .backIcon {
     transform: rotate(180deg);
   }
diff --git a/src/pages/colorCardOrder/index.tsx b/src/pages/colorCardOrder/index.tsx
index df02b35..d5ed7f2 100644
--- a/src/pages/colorCardOrder/index.tsx
+++ b/src/pages/colorCardOrder/index.tsx
@@ -163,6 +163,7 @@ export default () => {
       </View>
     } title="领取色卡"
     ></NavBar>
+
     <View className={styles.remark}>
       <Address onSelect={getAddress} defaultValue={addressInfo} />
     </View>
diff --git a/src/pages/cutSampleListOrder/index.module.scss b/src/pages/cutSampleListOrder/index.module.scss
index 8bd7a72..167240e 100644
--- a/src/pages/cutSampleListOrder/index.module.scss
+++ b/src/pages/cutSampleListOrder/index.module.scss
@@ -2,6 +2,7 @@
   min-height: 100vh;
   background-color: #f7f7f7ff;
   padding-bottom: 180px;
+  padding-top: 190px;
   .backIcon {
     transform: rotate(180deg);
   }
diff --git a/src/pages/cutSampleListOrder/index.tsx b/src/pages/cutSampleListOrder/index.tsx
index 76abb97..c270ded 100644
--- a/src/pages/cutSampleListOrder/index.tsx
+++ b/src/pages/cutSampleListOrder/index.tsx
@@ -229,7 +229,7 @@ export default () => {
       <View className={styles.card_header}>{formatHashTag(item.code, item.name)}</View>
       <View className={styles.card_list}>
         {item.colors?.map((citem, cindex) =>
-          <ProductCard bottomStatus={(item.colors?.length - 1) !== cindex} key={citem.id} value={citem} onDelData={onDelData(item)} onChangeNum={onChangeNum} />,
+          <ProductCard bottomStatus={((item.colors?.length - 1) !== cindex) || ((list?.length - 1) === index)} key={citem.id} value={citem} onDelData={onDelData(item)} onChangeNum={onChangeNum} />,
         )}
         {(list?.length - 1 === index) && <View className={styles.express_btn}>快递到付</View>}
       </View>