From 3abe542ec7b8840796e2be921e7c4d473e1595c3 Mon Sep 17 00:00:00 2001 From: Haiyi <1021441632@qq.com> Date: Mon, 5 Dec 2022 14:36:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=94=AE=E5=90=8E):?= =?UTF-8?q?=E9=85=8D=E5=90=88=E5=90=8E=E7=AB=AF=E6=A0=B9=E6=8D=AE=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 3 +- src/pages/refundDetail/index.tsx | 60 ++++++++- src/pages/refundMoneyDetail/index.tsx | 58 ++++++++- .../refundPage/components/itemList/index.tsx | 121 ++++++++++++++---- 4 files changed, 206 insertions(+), 36 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index 303281d..1f12b31 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,5 +1,4 @@ export const BASE_URL = CURRENT_BASE_URL -// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket` @@ -14,7 +13,7 @@ export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 -// export const BASE_URL = `http://192.168.1.42:50002/lymarket` // 杰 +// export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 diff --git a/src/pages/refundDetail/index.tsx b/src/pages/refundDetail/index.tsx index 290f437..7ccc3d5 100644 --- a/src/pages/refundDetail/index.tsx +++ b/src/pages/refundDetail/index.tsx @@ -20,6 +20,16 @@ import { alert } from '@/common/common' import RefundCodelist from '@/components/RefundCodelist' import LabAndImg from '@/components/LabAndImg' +enum ReturnEnum { + Refunded = 3, // 已退款 + RefundedBefore = 5, // 待退款-确认单 + RefundedAfter = 6, // 待退款 +} + +enum ReturnType { + TypeOne = 2, // 预收退款 +} + interface Obs { title?: string modeName?: string @@ -90,7 +100,7 @@ const GoodsItem = (porps: PropGoods) => { - {it.code}# {it.name} + {it.code}{it.name} {/* x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'} */} { obj.sale_mode == 0 && x{obj.stage == 0 || obj.stage == 1 || obj.stage == 2 @@ -335,6 +345,50 @@ const RefundDetail = () => { useEffect(() => { getDetail() }, []) + + // 待退款和已退款需要变更字段 + const totalGoods = useMemo(() => { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.quality_check_pass_fabrics + } + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.total_fabrics + } + if (DeatailObj.type == ReturnType.TypeOne) { + return DeatailObj.total_fabrics + } + }, [DeatailObj]) + // 待退款和已退款需要变更字段 + const totalColors = useMemo(() => { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.quality_check_pass_colors + } + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.total_colors + } + if (DeatailObj.type == ReturnType.TypeOne) { + return DeatailObj.total_colors + } + }, [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) { + 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) { + 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) { + 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) { + return DeatailObj.total_number / 100 + } + if (DeatailObj.type == ReturnType.TypeOne) { + return DeatailObj.total_number / 100 + } + }, [DeatailObj]) + return ( @@ -356,9 +410,7 @@ const RefundDetail = () => { 总计 - {DeatailObj.total_fabrics} 种面料，{DeatailObj?.total_colors} 种颜色，共 { - DeatailObj?.sale_mode == 0 ? DeatailObj?.return_roll : DeatailObj?.total_number / 100 - } {DeatailObj?.sale_mode == 0 ? '条' : '米'} + {totalGoods} 种面料，{totalColors} 种颜色，共 { totalNums} {DeatailObj?.sale_mode == 0 ? '条' : '米'} { (DeatailObj.stage == 3) diff --git a/src/pages/refundMoneyDetail/index.tsx b/src/pages/refundMoneyDetail/index.tsx index c2aa4ff..a94d22e 100644 --- a/src/pages/refundMoneyDetail/index.tsx +++ b/src/pages/refundMoneyDetail/index.tsx @@ -17,6 +17,16 @@ import { IMG_CND_Prefix } from '@/common/constant' import RefundCodelist from '@/components/RefundCodelist' import LabAndImg from '@/components/LabAndImg' +enum ReturnEnum { + Refunded = 3, // 已退款 + RefundedBefore = 5, // 待退款-确认单 + RefundedAfter = 6, // 待退款 +} + +enum ReturnType { + TypeOne = 2, // 预收退款 +} + interface Obs { title?: string modeName?: string @@ -293,6 +303,50 @@ const RefundMoneyDetail = () => { usePullDownRefresh(() => { getDetail() }) + + // 待退款和已退款需要变更字段 + const totalGoods = useMemo(() => { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.quality_check_pass_fabrics + } + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.total_fabrics + } + if (DeatailObj.type == ReturnType.TypeOne) { + return DeatailObj.total_fabrics + } + }, [DeatailObj]) + // 待退款和已退款需要变更字段 + const totalColors = useMemo(() => { + if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.quality_check_pass_colors + } + if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.type != ReturnType.TypeOne) { + return DeatailObj.total_colors + } + if (DeatailObj.type == ReturnType.TypeOne) { + return DeatailObj.total_colors + } + }, [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) { + 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) { + 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) { + 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) { + return DeatailObj.total_number / 100 + } + if (DeatailObj.type == ReturnType.TypeOne) { + return DeatailObj.total_number / 100 + } + }, [DeatailObj]) + return ( @@ -314,9 +368,7 @@ const RefundMoneyDetail = () => { 总计 - {DeatailObj.total_fabrics} 种面料，{DeatailObj?.total_colors} 种颜色，共 { - DeatailObj?.sale_mode == 0 ? DeatailObj?.return_roll : DeatailObj?.total_number / 100 - } {DeatailObj?.sale_mode == 0 ? '条' : '米'} + {totalGoods} 种面料，{totalColors} 种颜色，共 { totalNums} {DeatailObj?.sale_mode == 0 ? '条' : '米'} { DeatailObj.stage == 0 && diff --git a/src/pages/refundPage/components/itemList/index.tsx b/src/pages/refundPage/components/itemList/index.tsx index b7190de..2e2ff0a 100644 --- a/src/pages/refundPage/components/itemList/index.tsx +++ b/src/pages/refundPage/components/itemList/index.tsx @@ -7,6 +7,15 @@ import styles from './index.module.scss' import { formatPriceDiv } from '@/common/format' import LabAndImg from '@/components/LabAndImg' +enum ReturnEnum { + Refunded = 3, // 已退款 + RefundedBefore = 5, // 待退款-确认单 + RefundedAfter = 6, // 待退款 +} + +enum ReturnType { + TypeOne = 2, // 预收退款 +} interface propsObj { obj: any cancle?: (arg: any, obj: any) => void @@ -32,6 +41,88 @@ const ItemList = (props: propsObj) => { return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url } }, []) + // 待退款和已退款需要变更字段 + const totalGoods = useMemo(() => { + if ((props?.obj.stage == ReturnEnum.Refunded || props?.obj.stage == ReturnEnum.RefundedBefore || props?.obj.stage == ReturnEnum.RefundedAfter) && props?.obj.type != ReturnType.TypeOne) { + return props?.obj.quality_check_pass_fabrics + } + if ((props?.obj.stage != ReturnEnum.Refunded || props?.obj.stage != ReturnEnum.RefundedBefore || props?.obj.stage != ReturnEnum.RefundedAfter) && props?.obj.type != ReturnType.TypeOne) { + return props?.obj.total_fabrics + } + if (props?.obj.type == ReturnType.TypeOne) { + return props?.obj.total_fabrics + } + }, [props?.obj]) + // 待退款和已退款需要变更字段 + const totalColors = useMemo(() => { + if ((props?.obj.stage == ReturnEnum.Refunded || props?.obj.stage == ReturnEnum.RefundedBefore || props?.obj.stage == ReturnEnum.RefundedAfter) && props?.obj.type != ReturnType.TypeOne) { + return props?.obj.quality_check_pass_colors + } + if ((props?.obj.stage != ReturnEnum.Refunded || props?.obj.stage != ReturnEnum.RefundedBefore || props?.obj.stage != ReturnEnum.RefundedAfter) && props?.obj.type != ReturnType.TypeOne) { + return props?.obj.total_colors + } + if (props?.obj.type == ReturnType.TypeOne) { + return props?.obj.total_colors + } + }, [props?.obj]) + // 待退款和已退款需要变更字段 + const totalNums = useMemo(() => { + 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_number + } + 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_number / 100 + } + 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.total_number + } + 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.total_number / 100 + } + if (props?.obj.type == ReturnType.TypeOne) { + return props?.obj.total_number / 100 + } + }, [props?.obj]) + + // 注意这些判断都是要配合后端一起判断的恶心代码 + // 证明不是前端的问题 + // 列表条数 + const itemOneNums = useMemo(() => { + 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[0]?.product_colors[0]?.return_roll + } + 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?.product_list[0]?.product_colors[0]?.roll + } + 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[0]?.product_colors[0]?.length / 100 + } + 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?.product_list[0]?.product_colors[0]?.length / 100 + } + if (props?.obj.type == ReturnType.TypeOne) { + return props?.obj?.product_list[0]?.product_colors[0]?.length / 100 + } + }, [props?.obj]) + + const itemTwoNums = useMemo(() => { + 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[0]?.product_colors[1]?.return_roll + } + 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?.product_list[0]?.product_colors[1]?.roll + } + 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[0]?.product_colors[1]?.length / 100 + } + 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?.product_list[0]?.product_colors[1]?.length / 100 + } + if (props?.obj.type == ReturnType.TypeOne) { + return props?.obj?.product_list[0]?.product_colors[1]?.length / 100 + } + }, [props?.obj]) + return ( navTo(props.obj)}> @@ -66,36 +157,14 @@ const ItemList = (props: propsObj) => { {props?.obj?.product_list[0]?.product_colors[0]?.code} {props?.obj?.product_list[0]?.product_colors[0]?.name} - x{ - props?.obj?.product_list && props?.obj.sale_mode === 0 - ? (props?.obj?.product_list && props?.obj.stage == 0) - || props?.obj.stage == 1 - || props?.obj.stage == 2 - ? props?.obj?.product_list[0]?.product_colors[0]?.roll - : props?.obj.stage == 5 || props?.obj.stage == 6 || props?.obj.stage == 3 - ? props?.obj?.product_list[0]?.product_colors[0]?.return_roll - : props?.obj?.product_list[0]?.product_colors[0]?.roll - : props?.obj?.product_list - && props?.obj?.product_list[0]?.product_colors[0]?.length / 100 - } {props?.obj?.sale_mode === 0 ? '条' : 'm'} + x{ itemOneNums } {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?.length > 1 && <> {props?.obj?.product_list[0]?.product_colors[1]?.code} {props?.obj?.product_list[0]?.product_colors[1]?.name} - x{ - props?.obj?.product_list && props?.obj.sale_mode === 0 - ? (props?.obj?.product_list && props?.obj.stage == 0) - || props?.obj.stage == 1 - || props?.obj.stage == 2 - ? props?.obj?.product_list[0]?.product_colors[1]?.roll - : props?.obj.stage == 5 || props?.obj.stage == 6 || props?.obj.stage == 3 - ? props?.obj?.product_list[0]?.product_colors[1]?.return_roll - : props?.obj?.product_list[0]?.product_colors[1]?.roll - : props?.obj?.product_list - && props?.obj?.product_list[0]?.product_colors[1]?.length / 100 - } {props?.obj?.sale_mode === 0 ? '条' : 'm'} + x{ itemTwoNums } {props?.obj?.sale_mode === 0 ? '条' : 'm'} ¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/kg @@ -105,9 +174,7 @@ const ItemList = (props: propsObj) => { 布料信息： - {props?.obj?.total_fabrics} 种面料，{ - props?.obj?.total_colors - } 种颜色，共 {props?.obj?.sale_mode === 0 ? props?.obj?.total_number : props?.obj?.total_number / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'} + {totalGoods} 种面料，{totalColors} 种颜色，共 {totalNums} {props?.obj?.sale_mode === 0 ? '条' : 'm'} { (props?.obj.stage == 3) &&