From a1ebd4b29c4414243f015d43b921a8f1b4e31903 Mon Sep 17 00:00:00 2001 From: Haiyi <1021441632@qq.com> Date: Tue, 6 Dec 2022 16:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=94=AE=E5=90=8E=E6=A8=A1?= =?UTF-8?q?=E5=9D=97):=E9=85=8D=E5=90=88=E5=90=8E=E7=AB=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/refundDetail/index.tsx | 8 ++-- src/pages/refundMoneyDetail/index.tsx | 8 ++-- .../refundPage/components/itemList/index.tsx | 38 ++++++++++++++----- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/pages/refundDetail/index.tsx b/src/pages/refundDetail/index.tsx index 7ccc3d5..4dafa58 100644 --- a/src/pages/refundDetail/index.tsx +++ b/src/pages/refundDetail/index.tsx @@ -372,16 +372,16 @@ const RefundDetail = () => { }, [DeatailObj]) // 待退款和已退款需要变更字段 const totalNums = useMemo(() => { - if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.quality_check_pass_number } - if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.quality_check_pass_number / 100 } - if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.return_roll } - if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.total_number / 100 } if (DeatailObj.type == ReturnType.TypeOne) { diff --git a/src/pages/refundMoneyDetail/index.tsx b/src/pages/refundMoneyDetail/index.tsx index a94d22e..086b799 100644 --- a/src/pages/refundMoneyDetail/index.tsx +++ b/src/pages/refundMoneyDetail/index.tsx @@ -330,16 +330,16 @@ const RefundMoneyDetail = () => { }, [DeatailObj]) // 待退款和已退款需要变更字段 const totalNums = useMemo(() => { - if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.quality_check_pass_number } - if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.quality_check_pass_number / 100 } - if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.return_roll } - if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) { + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) { return DeatailObj.total_number / 100 } if (DeatailObj.type == ReturnType.TypeOne) { diff --git a/src/pages/refundPage/components/itemList/index.tsx b/src/pages/refundPage/components/itemList/index.tsx index 2e2ff0a..20b821d 100644 --- a/src/pages/refundPage/components/itemList/index.tsx +++ b/src/pages/refundPage/components/itemList/index.tsx @@ -37,6 +37,25 @@ const ItemList = (props: propsObj) => { } } + // 根据退款状态判断使用数组 + const refundArr = useMemo(() => { + // let booll = false + // let arr: any[] = [] + if ((props?.obj.stage == ReturnEnum.Refunded || props?.obj.stage == ReturnEnum.RefundedBefore || props?.obj.stage == ReturnEnum.RefundedAfter) && props?.obj.sale_mode == 0 && props?.obj.type != ReturnType.TypeOne) { + return props?.obj.quality_check_pass_product + } + else { + return props?.obj.product_list + } + // if (booll) { + // arr = props?.obj.quality_check_pass_product + // } + // else { + // arr = props?.obj.product_list + // } + // return arr + }, [props?.obj]) + const labAndImgObj = useCallback((item) => { return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url } }, []) @@ -122,8 +141,9 @@ const ItemList = (props: propsObj) => { return props?.obj?.product_list[0]?.product_colors[1]?.length / 100 } }, [props?.obj]) - + console.log(refundArr, 'wwww') return ( + navTo(props.obj)}> 单号:{props?.obj?.order_no} @@ -136,12 +156,12 @@ const ItemList = (props: propsObj) => { { props?.obj?.product_list[0]?.texture_url === '' - && + && } { props?.obj?.product_list[0]?.texture_url !== '' - && <> - + && <> + } 颜色 ({props?.obj?.total_colors}) @@ -156,16 +176,16 @@ const ItemList = (props: propsObj) => { {props?.obj?.shipment_mode_name} - {props?.obj?.product_list[0]?.product_colors[0]?.code} {props?.obj?.product_list[0]?.product_colors[0]?.name} + {refundArr[0]?.product_colors[0]?.code} {refundArr[0]?.product_colors[0]?.name} x{ itemOneNums } {props?.obj?.sale_mode === 0 ? '条' : 'm'} - ¥ {props?.obj?.product_list[0]?.product_colors[0]?.sale_price / 100}/kg + ¥ {refundArr[0]?.product_colors[0]?.sale_price / 100}/kg { - props?.obj?.product_list[0]?.product_colors?.length > 1 && <> + refundArr[0]?.product_colors?.length > 1 && <> - {props?.obj?.product_list[0]?.product_colors[1]?.code} {props?.obj?.product_list[0]?.product_colors[1]?.name} + {refundArr[0]?.product_colors[1]?.code} {refundArr[0]?.product_colors[1]?.name} x{ itemTwoNums } {props?.obj?.sale_mode === 0 ? '条' : 'm'} - ¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/kg + ¥ {refundArr[0]?.product_colors[1]?.sale_price / 100}/kg }