From 6aa1cd95642a373e9f413ec506673c3d6cd0749f Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Thu, 17 Nov 2022 17:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1000751):=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=89=AA=E7=89=88=E7=9A=84=E5=8D=95?=
=?UTF-8?q?=E4=BB=B7=E5=8D=95=E4=BD=8D=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/order/components/itemList/index.tsx | 4 ++--
src/pages/orderDetails/index.tsx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/order/components/itemList/index.tsx b/src/pages/order/components/itemList/index.tsx
index 5d3cf43..2765736 100644
--- a/src/pages/order/components/itemList/index.tsx
+++ b/src/pages/order/components/itemList/index.tsx
@@ -63,14 +63,14 @@ export default memo((props: propsObj) => {
{props?.obj?.product_list[0]?.product_colors[0]?.code} {props?.obj?.product_list[0]?.product_colors[0]?.name}
x{props?.obj?.sale_mode === 0 ? props?.obj?.product_list[0]?.product_colors[0]?.roll : props?.obj?.product_list[0]?.product_colors[0]?.length / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}
- ¥ {props?.obj?.product_list[0]?.product_colors[0]?.sale_price / 100}/kg
+ ¥ {props?.obj?.product_list[0]?.product_colors[0]?.sale_price / 100}/{props?.obj?.sale_mode == 1 ? 'm' : 'kg'}
{
props?.obj?.product_list[0]?.product_colors?.length > 1 && <>
{props?.obj?.product_list[0]?.product_colors[1]?.code} {props?.obj?.product_list[0]?.product_colors[1]?.name}
x{props?.obj?.sale_mode === 0 ? props?.obj?.product_list[0]?.product_colors[1]?.roll : props?.obj?.product_list[0]?.product_colors[1]?.length / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}
- ¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/kg
+ ¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/{props?.obj?.sale_mode == 1 ? 'm' : 'kg'}
>
}
diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx
index 967d09a..70aef2d 100644
--- a/src/pages/orderDetails/index.tsx
+++ b/src/pages/orderDetails/index.tsx
@@ -813,7 +813,7 @@ const GoodsItem = memo((porps: PropGoods) => {
x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}
- ¥{it.sale_price / 100}/{obj?.sale_mode === 0 ? 'kg' : 'm'}
+ ¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}
¥{formatPriceDiv(it.total_sale_price)}