diff --git a/project.private.config.json b/project.private.config.json index 500c9bd..93e718a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -128,6 +128,13 @@ "query": "id=34311", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "pages/submitOrder/index", + "query": "purchaser_id=1873&sale_mode=0&shopping_cart_product_color_list=%5B75484%2C75485%5D&purchaser_name=%E5%AD%9C%E7%84%B6%E7%83%A4%E9%B1%BF%E9%B1%BC", + "launchMode": "default", + "scene": null } ] } diff --git a/src/common/constant.ts b/src/common/constant.ts index a5ea304..c305c85 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,11 +1,11 @@ -export const BASE_URL = CURRENT_BASE_URL +// export const BASE_URL = CURRENT_BASE_URL // 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` // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 -// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 diff --git a/src/components/InputX/index.tsx b/src/components/InputX/index.tsx index 5a761db..14e5429 100644 --- a/src/components/InputX/index.tsx +++ b/src/components/InputX/index.tsx @@ -1,14 +1,14 @@ +import type { InputProps } from '@tarojs/components' import { CustomWrapper, Input, View } from '@tarojs/components' import type { FC } from 'react' import React from 'react' // 解决 input 组件输入过快会出现闪烁的问题 // https://github.com/NervJS/taro/issues/9664 -interface PropsType { +interface PropsType extends InputProps { customClassName?: string customStyle?: React.CSSProperties customInputStyle?: React.CSSProperties customInputClassName?: string - [Property: string]: any } const InputX: FC = (props) => { const { customClassName, customStyle, customInputStyle, customInputClassName, ...inputProps } = props diff --git a/src/pages/submitOrder/index.tsx b/src/pages/submitOrder/index.tsx index 7fe0ea5..924396f 100644 --- a/src/pages/submitOrder/index.tsx +++ b/src/pages/submitOrder/index.tsx @@ -1,3 +1,4 @@ +import type { CommonEvent } from '@tarojs/components' import { Input, Text, View } from '@tarojs/components' import Taro, { useDidShow, usePullDownRefresh, useRouter } from '@tarojs/taro' import type { ReactNode } from 'react' @@ -24,6 +25,13 @@ import LayoutBlock from '@/components/layoutBlock' import IconText from '@/components/iconText' import Dialog from '@/components/Dialog' import InputX from '@/components/InputX' + +interface ExtendEvent { + target: { + value: string | number + } +} + // 卡片盒子元素 interface Obs { title?: string @@ -142,17 +150,23 @@ const GoodsItem = (props: PropGoods) => { updateList(res) } // 批量调整 + const defaultValue = '-1.5' // 单价调整 - const [value, setValue] = useState('-1.5') + const [value, setValue] = useState(defaultValue) - const handleInput = (e) => { + const handleInput = (e: CommonEvent & ExtendEvent) => { const res = e.detail.value setValue(res) + return res } const errorMsg = useMemo(() => { let msg = '' - if (Number(value) < -3) { + console.log('errorMsg', value) + if (/[a-zA-Z]/.test(value) || Number.isNaN(Number(value))) { + msg = '请填写数字' + } + else if (Number(value) < -3) { msg = '不能小于-3' } else {