diff --git a/src/components/counter/index.tsx b/src/components/counter/index.tsx index b313170..f9458ae 100644 --- a/src/components/counter/index.tsx +++ b/src/components/counter/index.tsx @@ -51,12 +51,21 @@ const CounterDisplayName = (props: params) => { useEffect(() => { setValue({ count: defaultNum }) }, [defaultNum]) + + // 判断是否整数类型 + function isInteger(obj) { + return (obj | 0) === obj + } + const onPlus = () => { if (disabled) { return false } const count = value.count let num_res = Big(count).add(step).toNumber() - num_res = num_res >= maxNum ? maxNum : num_res num_res = formatDigits(num_res) + if (!isInteger(num_res)) { + num_res = Math.trunc(num_res) + } + num_res = num_res >= maxNum ? maxNum : num_res setValue({ ...value, count: num_res }) onChange?.(parseFloat(num_res)) onClickBtn?.(parseFloat(num_res)) @@ -64,11 +73,19 @@ const CounterDisplayName = (props: params) => { const minus = () => { if (disabled) { return false } const count = value.count - let num_res = Big(count).minus(step).toNumber() + let num_res = value.count + // let num_res = Big(count).minus(step).toNumber() if (returnZero) { num_res = num_res < minNum ? 0 : num_res } else { + // num_res = num_res < minNum ? minNum : num_res + if (!isInteger(num_res)) { + num_res = Math.trunc(num_res) + } + else { + num_res = Big(count).minus(step).toNumber() + } num_res = num_res < minNum ? minNum : num_res } setValue({ ...value, count: num_res }) diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx index aea22b5..f187256 100644 --- a/src/components/shopCart/index.tsx +++ b/src/components/shopCart/index.tsx @@ -42,7 +42,7 @@ interface modelClassType { const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mode }: param) => { const selectList: modelClassType[] = [ { value: 0, title: '大货', unit: '条', eunit: 'kg', step: 1, digits: 0, minNum: 1, maxNum: 100000, defaultNum: 1 }, - { value: 1, title: '剪板', unit: '米', eunit: 'm', step: 1, digits: 2, minNum: 0.5, maxNum: 9.99, defaultNum: 1 }, + { value: 1, title: '剪板', unit: '米', eunit: 'm', step: 1, digits: 2, minNum: 0.3, maxNum: 100000, defaultNum: 0.3 }, { value: 2, title: '散剪', unit: '米', eunit: 'kg', step: 1, digits: 2, minNum: 3, maxNum: 100000, defaultNum: 3 }, ] const bindSalesManDialogRef = useRef(null)