商城测试版v5

src/pages/order/components/returnRecord/index.module.scss

@@ -1,10 +1,17 @@
 .returnRecord_main{
     height: 70vh;
+    .returnRecord_con{
+        padding: 0 20px;
+    }
+    .returnRecord_con{
+        padding-top: 20px;
+    }
     .order_item{
         background-color: #fff;
         border-radius: 20px;
         padding: 20px;
         box-sizing: border-box;
+        box-shadow: 0px 0px 12px 0px rgba(0,0,0,0.16); 
         .header{
             display: flex;
             align-items: center;

src/pages/order/components/returnRecord/index.tsx

@@ -24,12 +24,12 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
     const searchField = useRef({
         page : 1,
         size : 10,
-        saleOrderID: 0
+        sale_order_id: 0
     })
 
     useEffect(() => {
         if(show && id) {
-            searchField.current.saleOrderID = id
+            searchField.current.sale_order_id = id
             getOrderList()
         }
     }, [show, id])
@@ -61,7 +61,7 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
 
     //对应数量
     const formatCount = useCallback((item, sale_mode) => {
-        return sale_mode == 0? item.roll : Number(item.length / 100)
+        return sale_mode == 0? item.roll + '条' : Number(item.length / 100) + '米'
     }, [orderData])
 
     //上拉加载数据
@@ -74,6 +74,11 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
         }
     }
 
+    const numText = useCallback((value) => {
+        let total_number_new = value?.sale_mode == 0? value?.total_number:(value?.total_number/100)
+        return `${value?.total_fabrics}种面料，${value?.total_colors}种颜色，共${total_number_new}${value?.sale_mode == 0? '条':'米'}`
+    }, [orderData])
+
     //监听滚动
     const [scrollStatus, setScrollStatus] = useState(false)
     const onscroll = useCallback((e) => {
@@ -132,7 +137,7 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
                                                         (index <= 1)&&<View className={styles.color_item}>
                                                             <View className={styles.color_title}>{formatHashTag(itemColor.code, itemColor.name)}</View>
                                                             <View className={styles.color_price}>{standardPrice(itemColor.sale_price, item.sale_mode)}</View>
-                                                            <View className={styles.color_num}>×{formatCount(itemColor, itemColor.sale_mode)}条</View>
+                                                            <View className={styles.color_num}>×{formatCount(itemColor, itemColor.sale_mode)}</View>
                                                         </View>
                                                     )
                                                 })
@@ -144,7 +149,7 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
                                             </View>
                                         </View>
                                     </View>
-                                    <View className={styles.color_count_num}>{`${item?.total_fabrics}种面料，${item?.total_colors}种颜色，共${item?.total_number}条`}</View>
+                                    <View className={styles.color_count_num}>{numText(item)}</View>
                                     <View className={styles.order_number}>
                                         <Text>{item?.type == ReturnApplyOrderTypeReturnForRefund.value?'已申请退货':'已申请退款'}</Text>
                                         <Text>订单号：{item?.order_no}</Text>