From 23e7a39aed0353cf8cfb82a56408c938f2a05597 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 7 Mar 2024 00:07:35 +0800 Subject: [PATCH] up --- .husky/commit-msg | 7 ------- .husky/pre-commit | 4 ---- src/pages/AuditsList/detail.tsx | 3 ++- src/pages/MemberList/index.tsx | 4 ++++ src/pages/ProductList/index.tsx | 1 + src/utils/utils.ts | 4 ++++ 6 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 .husky/commit-msg delete mode 100644 .husky/pre-commit diff --git a/.husky/commit-msg b/.husky/commit-msg deleted file mode 100644 index d50cdcf..0000000 --- a/.husky/commit-msg +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -# Export Git hook params -export GIT_PARAMS=$* - -npx --no-install fabric verify-commit diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100644 index d37daa0..0000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx --no-install lint-staged diff --git a/src/pages/AuditsList/detail.tsx b/src/pages/AuditsList/detail.tsx index aaab0b7..1282b05 100644 --- a/src/pages/AuditsList/detail.tsx +++ b/src/pages/AuditsList/detail.tsx @@ -129,6 +129,7 @@ const Detail: React.FC = () => { destroyOnClose: true, onCancel: () => setIsModalOpen(false), }} + width={500} onFinish={async (value: any) => { console.log(value); if (params.id) { @@ -156,7 +157,7 @@ const Detail: React.FC = () => { message: '驳回理由为必填项', }, ]} - width="md" + width="lg" name="pbcBusinessApprovalRefusedReason" /> diff --git a/src/pages/MemberList/index.tsx b/src/pages/MemberList/index.tsx index 414f830..8fae718 100644 --- a/src/pages/MemberList/index.tsx +++ b/src/pages/MemberList/index.tsx @@ -68,6 +68,10 @@ const TableList: React.FC<{}> = () => { search: false, valueEnum: Constants.pbcUserSourceType }, + { + title: '分享人昵称', + dataIndex: 'pbcUserSourceUserNickName', + }, { title: '会员等级', dataIndex: 'pbcVipGradeName', diff --git a/src/pages/ProductList/index.tsx b/src/pages/ProductList/index.tsx index 646e393..bd8b8c0 100644 --- a/src/pages/ProductList/index.tsx +++ b/src/pages/ProductList/index.tsx @@ -18,6 +18,7 @@ const fetchData = async (params: any) => { if (params.pbcProductCategoryId && params.pbcProductCategoryId.length === 3) { params.pbcProductCategoryId = params.pbcProductCategoryId[2]; } + params.pbcUserType = 2 const msg = await getProductPageForAdminUsingPost(params); return { data: msg.data?.records, diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 04fbb07..341af86 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -49,6 +49,10 @@ export const handlePageQuery = ( for (let i = 0; i < arr.length; i++) { const element = arr[i]; console.log(typeof(param[element])) + if (typeof(param[element]) === 'string' && !param[element]) { + delete param[element]; + continue; + } if (typeof(param[element]) === 'string') { filters.push({ key: element.replace(/([A-Z])/g, '_$1').toLowerCase(),