From 990b8a4f1d22132980af55fd41b6e09fef118819 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 2 Mar 2023 14:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E4=BF=AE=E5=A4=8Dui):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/counter/index.module.scss               |  4 ++--
 src/components/selectList/index.module.scss            |  3 ++-
 .../components/cutProductItem/index.module.scss        |  2 ++
 .../components/productItem/index.module.scss           |  2 ++
 .../colorCardOrder/components/remark/index.module.scss |  6 ++++++
 src/pages/colorCardOrder/components/remark/index.tsx   |  3 ++-
 .../components/orderInfo/index.module.scss             |  1 +
 .../components/remark/index.module.scss                |  3 +++
 .../components/productCard/index.tsx                   | 10 ++++++----
 .../components/remark/index.module.scss                |  3 +++
 src/pages/cutSampleListOrder/index.module.scss         |  5 +++++
 src/pages/cutSampleListOrder/index.tsx                 |  8 ++++----
 .../components/orderInfo/index.module.scss             |  2 ++
 .../components/productCard/index.tsx                   |  4 ++--
 .../components/remark/index.module.scss                |  3 +++
 15 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/components/counter/index.module.scss b/src/components/counter/index.module.scss
index bcdbe1b..527b3f3 100644
--- a/src/components/counter/index.module.scss
+++ b/src/components/counter/index.module.scss
@@ -32,9 +32,9 @@
     border-radius: 10px;
     input {
       font-size: $font_size_medium;
-      // text-align: right;
+      text-align: center;
       width: 100%;
-      padding-right: 10px;
+      // padding-right: 10px;
     }
   }
 
diff --git a/src/components/selectList/index.module.scss b/src/components/selectList/index.module.scss
index 4fec545..c01d82b 100644
--- a/src/components/selectList/index.module.scss
+++ b/src/components/selectList/index.module.scss
@@ -2,7 +2,7 @@
   display: flex;
   background-color: #fff;
   font-size: 32px;
-  font-weight: 500;
+  color: #000000cc;
   .select_list_item {
     height: 96px;
     text-align: center;
@@ -18,6 +18,7 @@
   .select_list_ed {
     text {
       border-bottom: 6px solid #337fff;
+      font-weight: 500;
     }
     color: #4581ff;
   }
diff --git a/src/pages/colorCardClipping/components/cutProductItem/index.module.scss b/src/pages/colorCardClipping/components/cutProductItem/index.module.scss
index fad73ef..7287c01 100644
--- a/src/pages/colorCardClipping/components/cutProductItem/index.module.scss
+++ b/src/pages/colorCardClipping/components/cutProductItem/index.module.scss
@@ -82,6 +82,7 @@
     font-size: 28px;
     text-align: right;
     margin-top: 16px;
+    font-weight: 700;
   }
   .btns {
     padding-top: 32px;
@@ -95,6 +96,7 @@
       border: 1px solid rgba(0, 0, 0, 0.06);
       text-align: center;
       line-height: 72px;
+      font-size: 28px;
     }
   }
 }
diff --git a/src/pages/colorCardClipping/components/productItem/index.module.scss b/src/pages/colorCardClipping/components/productItem/index.module.scss
index 9f3b9ac..d6e2d85 100644
--- a/src/pages/colorCardClipping/components/productItem/index.module.scss
+++ b/src/pages/colorCardClipping/components/productItem/index.module.scss
@@ -83,6 +83,7 @@
     font-size: 28px;
     text-align: right;
     margin-top: 16px;
+    font-weight: 700;
   }
   .btns {
     padding-top: 32px;
@@ -96,6 +97,7 @@
       border: 1px solid rgba(0, 0, 0, 0.06);
       text-align: center;
       line-height: 72px;
+      font-size: 28px;
     }
   }
 }
diff --git a/src/pages/colorCardOrder/components/remark/index.module.scss b/src/pages/colorCardOrder/components/remark/index.module.scss
index 2643ff3..1be6728 100644
--- a/src/pages/colorCardOrder/components/remark/index.module.scss
+++ b/src/pages/colorCardOrder/components/remark/index.module.scss
@@ -12,6 +12,9 @@
     justify-content: space-between;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     text {
+      &:nth-child(1) {
+        font-weight: 700;
+      }
       &:nth-child(2) {
         color: rgba(0, 0, 0, 0.8);
       }
@@ -25,5 +28,8 @@
     height: 82px;
     line-height: 82px;
     color: rgba(0, 0, 0, 0.4);
+    .seleced {
+      color: rgba(0, 0, 0, 0.8);
+    }
   }
 }
diff --git a/src/pages/colorCardOrder/components/remark/index.tsx b/src/pages/colorCardOrder/components/remark/index.tsx
index d492c6a..b9dffec 100644
--- a/src/pages/colorCardOrder/components/remark/index.tsx
+++ b/src/pages/colorCardOrder/components/remark/index.tsx
@@ -1,5 +1,6 @@
 import { Text, View } from '@tarojs/components'
 import { useEffect, useState } from 'react'
+import classNames from 'classnames'
 import styles from './index.module.scss'
 import Remark from '@/components/remark'
 import IconFont from '@/components/iconfont/iconfont'
@@ -26,7 +27,7 @@ export default (props: Param) => {
         <View className={styles.more}>填写/修改备注 <IconFont color="#000000FF" name="icon-rukou" size={30} /></View>
       </View>
       <View className={styles.remarks_message}>
-        <Text>{data || '尚未备注信息'}</Text>
+        <Text className={classNames(data ? styles.seleced : '')}>{data || '尚未备注信息'}</Text>
       </View>
     </View>
     <Remark show={showRemark} onSave={getOnSave} onClose={() => setShowRemark(false)} />
diff --git a/src/pages/colorCardOrderDetail/components/orderInfo/index.module.scss b/src/pages/colorCardOrderDetail/components/orderInfo/index.module.scss
index b59d3b9..63b278c 100644
--- a/src/pages/colorCardOrderDetail/components/orderInfo/index.module.scss
+++ b/src/pages/colorCardOrderDetail/components/orderInfo/index.module.scss
@@ -10,6 +10,7 @@
     font-size: 28px;
     color: rgba(0, 0, 0, 0.8);
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    font-weight: 700;
   }
   .order_info_list {
     font-size: 28px;
diff --git a/src/pages/colorCardOrderDetail/components/remark/index.module.scss b/src/pages/colorCardOrderDetail/components/remark/index.module.scss
index 8ec7f59..cf1a1ab 100644
--- a/src/pages/colorCardOrderDetail/components/remark/index.module.scss
+++ b/src/pages/colorCardOrderDetail/components/remark/index.module.scss
@@ -11,6 +11,9 @@
     justify-content: space-between;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     text {
+      &:nth-child(1) {
+        font-weight: 700;
+      }
       &:nth-child(2) {
         color: rgba(0, 0, 0, 0.8);
       }
diff --git a/src/pages/cutSampleListOrder/components/productCard/index.tsx b/src/pages/cutSampleListOrder/components/productCard/index.tsx
index add70f3..41f0c1d 100644
--- a/src/pages/cutSampleListOrder/components/productCard/index.tsx
+++ b/src/pages/cutSampleListOrder/components/productCard/index.tsx
@@ -1,6 +1,7 @@
 import { Text, View } from '@tarojs/components'
 import Taro, { getCurrentPages, useDidShow } from '@tarojs/taro'
 import { memo, useCallback, useEffect, useState } from 'react'
+import classNames from 'classnames'
 import styles from './index.module.scss'
 import Counter from '@/components/counter'
 import LabAndImg from '@/components/LabAndImg'
@@ -36,14 +37,15 @@ export interface Param {
   value: ColorItem
   onChangeNum?: (val: { id: number; count: number }) => void
   onDelData?: (val: number) => void
+  bottomStatus?: boolean
 }
 
 export default memo((props: Param) => {
-  return <ProductItem onChangeNum={props.onChangeNum} onDelData={props.onDelData} value={props.value} />
+  return <ProductItem onChangeNum={props.onChangeNum} onDelData={props.onDelData} value={props.value} bottomStatus={props.bottomStatus} />
 })
 
 const ProductItem = memo((props: Param) => {
-  const { value } = props
+  const { value, bottomStatus = true } = props
   const labAndImgObj = useCallback(
     (item) => {
       return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
@@ -72,7 +74,7 @@ const ProductItem = memo((props: Param) => {
   return <>
     <View key={value.id} className={styles.card_item}>
       <View className={styles.img}><LabAndImg value={labAndImgObj(props.value)} /></View>
-      <View className={styles.name_count}>
+      <View className={classNames(styles.name_count, bottomStatus && styles.bottom_styles)}>
         <Text>{formatHashTag(value.code, value.name)}</Text>
         <View className={styles.btns}>
           <View className={styles.count_btn}>
@@ -82,7 +84,7 @@ const ProductItem = memo((props: Param) => {
               defaultNum={value.count}
               onClickBtn={onChangeNum}
               onBlue={onChangeNum}
-              unit="件"
+              unit="份"
               onMin={onMin}
               onMax={onMax}
             />
diff --git a/src/pages/cutSampleListOrder/components/remark/index.module.scss b/src/pages/cutSampleListOrder/components/remark/index.module.scss
index d051d7b..fd39478 100644
--- a/src/pages/cutSampleListOrder/components/remark/index.module.scss
+++ b/src/pages/cutSampleListOrder/components/remark/index.module.scss
@@ -12,6 +12,9 @@
     justify-content: space-between;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     text {
+      &:nth-child(1) {
+        font-weight: 700;
+      }
       &:nth-child(2) {
         color: rgba(0, 0, 0, 0.8);
       }
diff --git a/src/pages/cutSampleListOrder/index.module.scss b/src/pages/cutSampleListOrder/index.module.scss
index bf198ec..8bd7a72 100644
--- a/src/pages/cutSampleListOrder/index.module.scss
+++ b/src/pages/cutSampleListOrder/index.module.scss
@@ -5,6 +5,11 @@
   .backIcon {
     transform: rotate(180deg);
   }
+  .address_info {
+    padding: 20px 20px 0 20px;
+  }
+  .remark {
+  }
   .add_card_btn {
     margin: 24px;
     height: 82px;
diff --git a/src/pages/cutSampleListOrder/index.tsx b/src/pages/cutSampleListOrder/index.tsx
index c9f906c..a8def1d 100644
--- a/src/pages/cutSampleListOrder/index.tsx
+++ b/src/pages/cutSampleListOrder/index.tsx
@@ -223,18 +223,18 @@ export default () => {
       </View>
     } title="领取剪样"
     ></NavBar>
-    <Address onSelect={getAddress} defaultValue={addressInfo} />
+    <View className={styles.address_info}><Address onSelect={getAddress} defaultValue={addressInfo} /></View>
     <View className={styles.add_card_btn} onClick={onAddCard}>添加剪样</View>
-    {list?.map(item => <View key={item.id} className={styles.card_con}>
+    {list?.map((item, index) => <View key={item.id} className={styles.card_con}>
       <View className={styles.card_header}>{formatHashTag(item.code, item.name)}</View>
       <View className={styles.card_list}>
         {item.colors?.map(citem =>
           <ProductCard key={citem.id} value={citem} onDelData={onDelData(item)} onChangeNum={onChangeNum} />,
         )}
-        <View className={styles.express_btn}>快递到付</View>
+        {(list?.length - 1 === index) && <View className={styles.express_btn}>快递到付</View>}
       </View>
     </View>)}
-    <Remark onSave={onRemark} defaultValue={remarkData} />
+    <View className={styles.remark}><Remark onSave={onRemark} defaultValue={remarkData} /></View>
     <View className={styles.order_btn}>
       <View className={styles.btn_con} onClick={onSubmitData}>
         <Text>{numText}</Text>
diff --git a/src/pages/cutSampleListOrderDetail/components/orderInfo/index.module.scss b/src/pages/cutSampleListOrderDetail/components/orderInfo/index.module.scss
index b59d3b9..a2442d3 100644
--- a/src/pages/cutSampleListOrderDetail/components/orderInfo/index.module.scss
+++ b/src/pages/cutSampleListOrderDetail/components/orderInfo/index.module.scss
@@ -10,6 +10,7 @@
     font-size: 28px;
     color: rgba(0, 0, 0, 0.8);
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    font-weight: 700;
   }
   .order_info_list {
     font-size: 28px;
@@ -31,6 +32,7 @@
           line-height: 32px;
           color: #337fffff;
           margin-left: 10px;
+          font-size: 24px;
         }
       }
     }
diff --git a/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx b/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx
index 7120df7..3b65948 100644
--- a/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx
+++ b/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx
@@ -38,7 +38,7 @@ export default (props: Param) => {
     [value],
   )
   return <>
-    {value?.map((pitem) => {
+    {value?.map((pitem, pindex) => {
       return <View key={pitem.product_id} className={styles.card_con}>
         <View className={styles.card_header}>{formatHashTag(pitem.code, pitem.name)}</View>
         <View className={styles.card_list}>
@@ -54,7 +54,7 @@ export default (props: Param) => {
                 </View>
               </View>
             })}
-            <View className={styles.express_btn}>快递到付</View>
+            {(value.length - 1 === pindex) && <View className={styles.express_btn}>快递到付</View>}
           </>
         </View>
       </View>
diff --git a/src/pages/cutSampleListOrderDetail/components/remark/index.module.scss b/src/pages/cutSampleListOrderDetail/components/remark/index.module.scss
index 8ec7f59..cf1a1ab 100644
--- a/src/pages/cutSampleListOrderDetail/components/remark/index.module.scss
+++ b/src/pages/cutSampleListOrderDetail/components/remark/index.module.scss
@@ -11,6 +11,9 @@
     justify-content: space-between;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     text {
+      &:nth-child(1) {
+        font-weight: 700;
+      }
       &:nth-child(2) {
         color: rgba(0, 0, 0, 0.8);
       }