From 3e7b70c19056ec39c27f014270b2927e276d0514 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 6 Dec 2022 11:35:39 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 +++ src/common/constant.ts | 4 ++-- src/pages/salesAfter/components/kindList/index.tsx | 2 +- src/pages/salesAfter/index.tsx | 7 ++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a0b07a8..d061590 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -39,4 +39,7 @@ "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[jsonc]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, } diff --git a/src/common/constant.ts b/src/common/constant.ts index 74c1972..030c4c2 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,4 +1,4 @@ -// 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` @@ -13,7 +13,7 @@ // export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 -export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 +// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 // export const BASE_URL = `http://192.168.1.42:50002/lymarket` // 杰 // CDN diff --git a/src/pages/salesAfter/components/kindList/index.tsx b/src/pages/salesAfter/components/kindList/index.tsx index e179fc6..1c74ff1 100644 --- a/src/pages/salesAfter/components/kindList/index.tsx +++ b/src/pages/salesAfter/components/kindList/index.tsx @@ -135,7 +135,7 @@ export default memo(({ order, comfirm = false }: Param) => { if (!order?.is_quality_check) { const total_number = order?.sale_mode == 0 ? order?.total_number : order?.total_number / 100 return `${order?.total_fabrics} 种面料,${order?.total_colors} 种颜色,共 ${total_number} ${order?.unit}` - } + } else { const total_number = order?.sale_mode == 0 ? order?.quality_check_pass_number : order?.quality_check_pass_number / 100 return `${order?.quality_check_pass_fabrics} 种面料,${order?.quality_check_pass_colors} 种颜色,共 ${total_number} ${order?.unit}` diff --git a/src/pages/salesAfter/index.tsx b/src/pages/salesAfter/index.tsx index 08ea396..102bac3 100644 --- a/src/pages/salesAfter/index.tsx +++ b/src/pages/salesAfter/index.tsx @@ -13,8 +13,8 @@ import styles from './index.module.scss' import useLogin from '@/use/useLogin' import SearchInput from '@/components/searchInput' import AfterOrderBtns from '@/components/afterOrderBtns' -import { formatDateTime, formatImgUrl, formatPriceDiv } from '@/common/fotmat' -import { AFTER_ORDER_STATUS, ORDER_STATUS } from '@/common/enum' +import { formatDateTime, formatImgUrl } from '@/common/fotmat' +import { AFTER_ORDER_STATUS } from '@/common/enum' import { SaleOrderOrderDetailApi } from '@/api/salesAfterOrder' const OrderDes = ({ orderInfo }: { orderInfo?: any }) => { @@ -95,6 +95,7 @@ const AfterSalePricture = ({ urls = [] }: { urls: string[] }) => { ) } + const AfterSalePrictureWithMemo = memo(AfterSalePricture) const SalesAfter = () => { useLogin() @@ -139,7 +140,7 @@ const SalesAfter = () => { }, [orderDetail]) // 售后订单状态枚举 - const {} = AFTER_ORDER_STATUS + const { } = AFTER_ORDER_STATUS // 物流显示 const [logisticsShow, setLogisticsShow] = useState(false)