From f91e014db5e42e835904c809077b58d0b41cad07 Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Fri, 23 Dec 2022 15:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(ID1000829):=E3=80=90=E4=B8=B4?=
 =?UTF-8?q?=E3=80=91=E5=89=AA=E7=89=88=E4=B8=8B=E5=8D=95=E7=B1=B3=E6=95=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA0.3=E7=B1=B3=EF=BC=8C=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=95=B4=E6=95=B0?=
 =?UTF-8?q?=E7=B4=AF=E5=8A=A0=EF=BC=8C=E4=B8=8D=E8=A6=810.3+1=E8=BF=99?=
 =?UTF-8?q?=E6=A0=B7=E7=B4=AF=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/counter/index.tsx  | 21 +++++++++++++++++++--
 src/components/shopCart/index.tsx |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

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<SalesManDialogRef | null>(null)