From eaf25db0bb47e964fbf2a8eff9df30a791d91fc8 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Thu, 20 Oct 2022 18:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E4=BF=AE=E6=94=B9=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E7=A0=81=E5=8D=95=E5=AD=97=E6=AE=B5):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/checkbox/index.tsx | 70 +++++++++---------- .../components/returnPayCheck/index.tsx | 6 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx index 7658fe0..5dfe52f 100644 --- a/src/components/checkbox/index.tsx +++ b/src/components/checkbox/index.tsx @@ -1,39 +1,39 @@ -import { View } from "@tarojs/components" -import classnames from "classnames"; -import { forwardRef, useEffect, useImperativeHandle, useState } from "react"; -import styles from "./index.module.scss" +import { View } from '@tarojs/components' +import classnames from 'classnames' +import { forwardRef, useEffect, useImperativeHandle, useState } from 'react' +import styles from './index.module.scss' type params = { - onSelect?: () => void, //选择触发 - onClose?: () => void, //取消触发 - status?: false|true //是否选中 - disabled?: false|true //是否禁用 + onSelect?: () => void //选择触发 + onClose?: () => void //取消触发 + status?: false | true //是否选中 + disabled?: false | true //是否禁用 } -export default forwardRef(({onSelect, onClose, status = false, disabled = false}: params, ref) => { - const [selected, SetSelected] = useState(false) - const onSelectEven = () => { - if(disabled) return false - let res = !selected - if(res) { - onSelect?.() - } else { - onClose?.() - } - SetSelected(res) +export default forwardRef(({ onSelect, onClose, status = false, disabled = false }: params, ref) => { + const [selected, SetSelected] = useState(false) + const onSelectEven = () => { + if (disabled) return false + let res = !selected + if (res) { + onSelect?.() + } else { + onClose?.() } - useImperativeHandle(ref, () => ({ - onSelectEven - })) - useEffect(() => { - SetSelected(status) - }, [status]) - return ( - <> - onSelectEven()}> - - {selected&&} - - - - ) -}) \ No newline at end of file + SetSelected(res) + } + useImperativeHandle(ref, () => ({ + onSelectEven, + })) + useEffect(() => { + SetSelected(status) + }, [status]) + return ( + <> + onSelectEven()}> + + {selected && } + + + + ) +}) diff --git a/src/pages/salesAfter/components/returnPayCheck/index.tsx b/src/pages/salesAfter/components/returnPayCheck/index.tsx index 2b7ecf9..8e777c3 100644 --- a/src/pages/salesAfter/components/returnPayCheck/index.tsx +++ b/src/pages/salesAfter/components/returnPayCheck/index.tsx @@ -57,7 +57,7 @@ export default memo(({ show = true, onClose, orderInfo }: Param) => { weight: formatWeightDiv(citem.actual_weight || citem.estimate_weight).toString(), sale_price: formatPriceDiv(citem.sale_price).toString(), total_price: formatPriceDiv(citem.total_sale_price || citem.estimate_amount).toString(), //小计 - weight_error: formatWeightDiv(citem.weight_error).toString(), + weight_error: formatWeightDiv(citem.settle_weight_error).toString(), deduction_weight: formatWeightDiv(citem.deductions_weight).toString(), settle_weight: formatWeightDiv(citem.settle_weight).toString(), deduction_amount: formatPriceDiv(citem.deductions_amount).toString(), @@ -67,7 +67,7 @@ export default memo(({ show = true, onClose, orderInfo }: Param) => { setDetail(() => ({ title: '售后确认单', order_type: orderInfo.sale_mode_name, //类型:大货 - sale_user: orderInfo.purchaser_name, + client: orderInfo.purchaser_name, order_created_time: formatDateTime(orderInfo.create_time), order_no: orderInfo.return_order_no, pay_account: orderInfo.transfer_remittance_account, @@ -164,7 +164,7 @@ export default memo(({ show = true, onClose, orderInfo }: Param) => { - 查看销售码单 + 查看退款码单 {(state.loading && ) || (