商城测试版v5

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

@@ -37,7 +37,7 @@ export default memo(({value, onClickBtn}: Param) => {
     const userInfo = useSelector(state => state.userInfo)
     //对应数量
     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) + '米'
     }, [value])
     //对应单价
     const standardPrice = useCallback((price, sale_mode) => {
@@ -69,20 +69,17 @@ export default memo(({value, onClickBtn}: Param) => {
         ReturnApplyOrderTypeReturnForRefund, // 退货退款
     } = REFUND_STATUS_ORDER
 
-    
+    const numText = useMemo(() => {
+        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? '条':'米'}`
+    }, [value])
 
     return (
         <View className={styles.order_item}>
             <View className={styles.header} onClick={() => goLink('/pages/salesAfter/index', {id: value?.id})}>
                 <View className={styles.user}>
                     <Image src={`${userInfo?.adminUserInfo?.avatar_url}`}/>
-                    {/* <Text className={styles.name}>{userInfo?.adminUserInfo?.user_name}</Text> */}
                 </View>
-                {/* <View className={styles.order_num}>
-                    <Text>售后单号：{value?.return_order_no}</Text>
-                    <Text className={classnames(styles.miconfont, 'iconfont, icon-a-moreback')}></Text>
-                </View>
-                <OrderStatusTag status={value?.type}/> */}
                 <View className={styles.order_con}>
                     <Text className={styles.name}>{userInfo?.adminUserInfo?.user_name}</Text>
                     <View className={styles.order_num}>
@@ -111,7 +108,7 @@ export default memo(({value, onClickBtn}: 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, value.sale_mode)}</View>
-                                        <View className={styles.color_num}>×{formatCount(itemColor, value.sale_mode)}条</View>
+                                        <View className={styles.color_num}>×{formatCount(itemColor, value.sale_mode)}</View>
                                     </View>
                                 )
                             })
@@ -123,7 +120,7 @@ export default memo(({value, onClickBtn}: Param) => {
                         </View>
                     </View>
                 </View>
-                <View className={styles.color_count_num}>{`${value?.total_fabrics}种面料，${value?.total_colors}种颜色，共${value?.total_number}条`}</View>
+                <View className={styles.color_count_num}>{numText}</View>
                 <View className={styles.order_number}>
                     <Text>{value?.type == ReturnApplyOrderTypeReturnForRefund.value?'已申请退货':'已申请退款'}</Text>
                     <Text>订单号：{value?.order_no}</Text>