From e56f538244e5a4a06897c78465dfab8e2339a3de Mon Sep 17 00:00:00 2001 From: xuan Date: Wed, 22 Mar 2023 14:42:07 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E8=89=B2=E5=8D=A1=E5=89=AA?= =?UTF-8?q?=E6=A0=B7):=20=E9=99=90=E5=88=B6=E6=8F=90=E4=BA=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.config.json | 3 ++- project.private.config.json | 7 +++++++ src/common/constant.ts | 4 ++-- src/components/loading/index.tsx | 7 ++++++- src/components/normalButton/index.module.scss | 9 +++------ src/components/normalButton/index.tsx | 9 ++++++++- src/pages/getColorCard/addColorCard/index.tsx | 14 ++++++++------ src/pages/sampleCutting/addSampleCutting/index.tsx | 13 +++++++------ 8 files changed, 43 insertions(+), 23 deletions(-) diff --git a/project.config.json b/project.config.json index 213e44b..abcf69a 100644 --- a/project.config.json +++ b/project.config.json @@ -31,7 +31,8 @@ }, "disableUseStrict": false, "useCompilerPlugins": false, - "minifyWXML": true + "minifyWXML": true, + "condition": false }, "compileType": "miniprogram", "libVersion": "2.24.5", diff --git a/project.private.config.json b/project.private.config.json index 93e718a..dfaaf7e 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -135,6 +135,13 @@ "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 + }, + { + "name": "", + "pathName": "pages/getColorCard/index", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/src/common/constant.ts b/src/common/constant.ts index c305c85..038e44e 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -4,8 +4,8 @@ // 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://test.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/loading/index.tsx b/src/components/loading/index.tsx index ef296bf..a87d2f9 100644 --- a/src/components/loading/index.tsx +++ b/src/components/loading/index.tsx @@ -2,7 +2,12 @@ import { View } from '@tarojs/components' import { memo, useMemo } from 'react' import style from './index.module.scss' -const Loading = ({ width = 60, color = '#6190e8' }: { width?: number; color?: string }) => { +interface LoadingProps { + width?: number + color?: string +} +const Loading = (props: LoadingProps) => { + const { width = 60, color = '#6190e8' } = props const styleObj = useMemo(() => { let obj = {} if (width > 0) { obj = { width: `${width}rpx`, height: `${width}rpx` } } diff --git a/src/components/normalButton/index.module.scss b/src/components/normalButton/index.module.scss index a13e4e7..8cae278 100644 --- a/src/components/normalButton/index.module.scss +++ b/src/components/normalButton/index.module.scss @@ -10,7 +10,7 @@ text-align: center; color: #fff; box-sizing: border-box; - + &--normal { height: 72px; font-size: $font_size_medium; @@ -76,12 +76,9 @@ align-items: center; color: currentColor; .loading { - position: absolute; + display: inline-block; + margin-right: 20px; pointer-events: none; - left: -40px; - top: 50%; - transform: translateY(-50%); - z-index: 1; } } // active 伪类 diff --git a/src/components/normalButton/index.tsx b/src/components/normalButton/index.tsx index b4005d4..d2beebe 100644 --- a/src/components/normalButton/index.tsx +++ b/src/components/normalButton/index.tsx @@ -49,6 +49,13 @@ const NormalButton: FC = (props) => { return classObject } + const loadingColor = type === 'primary' ? '#fff' : '' + let loadingComponent: JSX.Element | null = null + if (loading) { + loadingComponent = + + + } const handleClick = (event) => { if (disabled) { return @@ -59,7 +66,7 @@ const NormalButton: FC = (props) => { return ( - {loading && } + {loadingComponent} {children} ) diff --git a/src/pages/getColorCard/addColorCard/index.tsx b/src/pages/getColorCard/addColorCard/index.tsx index da77c2b..3fa2241 100644 --- a/src/pages/getColorCard/addColorCard/index.tsx +++ b/src/pages/getColorCard/addColorCard/index.tsx @@ -15,6 +15,7 @@ import Remark from '@/pages/orderDetails/components/remark' import { SubmitColorCardOrder } from '@/api/colorCard' import NavBar from '@/pages/order/components/NavBar' import { MpPurchaserAddressList } from '@/api/addressList' +import { debounce } from '@/common/util' const AddColorCard = () => { // 获取选择的客户 @@ -92,9 +93,9 @@ const AddColorCard = () => { // Taro.setStorageSync('colorCardCache', JSON.stringify(order)) } - const { fetchData } = SubmitColorCardOrder() + const { fetchData, state } = SubmitColorCardOrder() // 提交订单 - const handleSubmitOrder = async() => { + const handleSubmitOrder = debounce(async() => { if (!addressInfo.address_id) { return alert.none('请选择地址') } @@ -102,6 +103,7 @@ const AddColorCard = () => { return alert.none('请选择客户') } if (order.length === 0) { return alert.none('请选择色卡') } + // 请求数据 const res = await fetchData({ address_id: addressInfo.address_id, @@ -116,11 +118,9 @@ const AddColorCard = () => { duration: 2000, }) Taro.removeStorageSync('colorCardCache') - setTimeout(() => { - goLink('/pages/getColorCard/colorCardDetail/index', { id: res.data.id }, 'redirectTo') - }, 2000) + goLink('/pages/getColorCard/colorCardDetail/index', { id: res.data.id }, 'redirectTo') } - } + }, 300) const deleteColorCard = (id) => { setOrder((prev) => { @@ -372,7 +372,9 @@ const AddColorCard = () => { 提交订单 diff --git a/src/pages/sampleCutting/addSampleCutting/index.tsx b/src/pages/sampleCutting/addSampleCutting/index.tsx index 6e5b20f..f233d2e 100644 --- a/src/pages/sampleCutting/addSampleCutting/index.tsx +++ b/src/pages/sampleCutting/addSampleCutting/index.tsx @@ -18,6 +18,7 @@ import { formatRemoveHashTag } from '@/common/format' import { SubmitCutSampleOrder } from '@/api/sampleCutting' import NavBar from '@/pages/order/components/NavBar' import { MpPurchaserAddressList } from '@/api/addressList' +import { debounce } from '@/common/util' const AddColorCard = () => { // 获取选择的客户 @@ -87,9 +88,9 @@ const AddColorCard = () => { goLink('/pages/sampleCutting/sampleCuttingList/index', { isGoBack: true, isAddSampleCutIdList: order.map(item => item.product_id) }) } - const { fetchData } = SubmitCutSampleOrder() + const { fetchData, state } = SubmitCutSampleOrder() // 提交订单 - const handleSubmitOrder = async() => { + const handleSubmitOrder = debounce(async() => { if (!addressInfo.address_id) { return alert.none('请选择地址') } @@ -120,11 +121,9 @@ const AddColorCard = () => { duration: 2000, }) Taro.removeStorageSync('sampleCuttingCache') - setTimeout(() => { - goLink('/pages/sampleCutting/sampleCuttingDetail/index', { id: res.data.id }, 'redirectTo') - }, 2000) + goLink('/pages/sampleCutting/sampleCuttingDetail/index', { id: res.data.id }, 'redirectTo') } - } + }, 300) const labAndImgObj = useCallback((item) => { return { lab: item?.lab, rgb: item?.rgb, texture_url: item?.texture_url } @@ -441,7 +440,9 @@ const AddColorCard = () => { 提交订单