From b23ad4b28aae820889306400b9b210912f9d258a Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sat, 20 Jul 2024 11:15:39 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E4=BB=B7?=
 =?UTF-8?q?=E4=B8=AD=E4=BF=9D=E5=AD=98=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/components/addReceiveProduct.vue | 42 +++++--------------
 src/utils/http.ts                             |  2 +-
 src/utils/index.ts                            | 10 ++++-
 src/utils/validate.ts                         |  2 +-
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/pagesApp/components/addReceiveProduct.vue b/src/pagesApp/components/addReceiveProduct.vue
index f1a0495..0829303 100644
--- a/src/pagesApp/components/addReceiveProduct.vue
+++ b/src/pagesApp/components/addReceiveProduct.vue
@@ -44,24 +44,6 @@
             </text>
           </template>
         </u-input>
-        <u-input
-          v-if="item.type === 'number'"
-          v-model="(model1.formData as any)[item.key]"
-          :placeholder="`请输入${
-            item.name
-          }`"
-          clearable
-          :customStyle="{}"
-          border="none"
-          @change="(e:any) => {handleInput(e, item)}"
-          @clear="handleClear(item)"
-        >
-          <template #suffix>
-            <text>
-              {{ item.unit }}
-            </text>
-          </template>
-        </u-input>
         <template #right v-if="item.type === 'select'">
           <u-icon name="arrow-right"></u-icon>
         </template>
@@ -86,7 +68,7 @@
 </template>
 <script setup lang="ts">
 import { GoodsApi } from "@/services";
-import { countDots } from "@/utils";
+import { countDots, isTwoDecimalPlaces } from "@/utils";
 import valid from "@/utils/validate";
 import { onLoad } from "@dcloudio/uni-app";
 import _ from "underscore";
@@ -97,20 +79,18 @@ const handleClear = (item: any) => {
 const handleInput = (e: any, item: any) => {
   if (["minPrice", "maxPrice", "commonPrice"].indexOf(item.key) > -1) {
     const temp = e?.replace(valid.valid_decimal.pattern, "");
-    if (!valid.valid_decimal2.pattern.test(temp)) {
-      uni.showToast({
-        title: "请输入正确的" + item.name + ", 且最多保留2位小数",
-        icon: "none",
-      });
-      return;
-    }
-    if (countDots(temp).length > 1) {
+    if (countDots(temp) > 1) {
       uni.showToast({
         title: "请输入正确的" + item.name,
         icon: "none",
       });
+    } else if(countDots(temp) === 1 && (isTwoDecimalPlaces(temp))) {
+        uni.showToast({
+        title: item.name + "最多只能输入2位小数",
+        icon: "none",
+      });
     }
-
+ 
     setTimeout(() => {
       model1.formData[item.key] = temp;
     }, 10);
@@ -185,21 +165,21 @@ const formAttrList = reactive<any>([
   {
     name: "最低价",
     key: "minPrice",
-    type: "number",
+    type: "input",
     required: false,
     unit: "",
   },
   {
     name: "最高价",
     key: "maxPrice",
-    type: "number",
+    type: "input",
     required: false,
     unit: "",
   },
   {
     name: "常用价格",
     key: "commonPrice",
-    type: "number",
+    type: "input",
     required: false,
     unit: "",
   },
diff --git a/src/utils/http.ts b/src/utils/http.ts
index ae412e7..10b80a8 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -68,7 +68,7 @@ export const http = <T>(options: UniApp.RequestOptions) => {
               // #endif
             },
             timeout: 1800000,
-            url: baseUrl + '/test/sh0001' + options.url, //仅为示例，非真实的接口地址
+            url: options.url, //仅为示例，非真实的接口地址
             fileType: "image",
             // #ifdef H5
             files: (options as any).data.files,
diff --git a/src/utils/index.ts b/src/utils/index.ts
index dde845d..cb46c22 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -269,7 +269,15 @@ export function formatMoney(
 export function countDots(str: any) {
   return (str.match(/\./g) || []).length;
 }
-
+export function isTwoDecimalPlaces(num:any) {
+  // 转换为字符串并移除可能的符号
+  const str = num.toString().replace(/[-]+/g, '');
+  // 分割整数部分和小数部分
+  const parts = str.split('.');
+  console.log(parts)
+  // 如果小数点后有两位数字，返回true
+  return parts.length === 2 && parts[1].length > 2;
+}
 export function validateRegex(regexValue: string, value: string) {
   const regex = new RegExp(regexValue);
   return regex.test(value);
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 2ace21d..b74b03a 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -27,7 +27,7 @@ const valid = {
     message: "请输入正确的数字",
   },
   valid_decimal2: {
-    pattern: /^\d+(\.\d{1,2})?$/,
+    pattern:  /([1-9]+[\d]*(\.[0-9]{0,2})?)/,
     message: "请输入正确的数字",
   },
   valid_id_card: {