diff --git a/src/pages/AuditsList/detail.tsx b/src/pages/AuditsList/detail.tsx index d0b273c..1a59e3a 100644 --- a/src/pages/AuditsList/detail.tsx +++ b/src/pages/AuditsList/detail.tsx @@ -3,7 +3,7 @@ import { Button, Descriptions, Image, message } from 'antd'; import { PageContainer } from '@ant-design/pro-layout'; import { approvalSignNUsingPost, approvalSignYUsingGet, getRecordByBusinessIdAdminUsingGet } from '@/services/pop-b2b2c/pbcBusinessApprovalController'; import { Access, useAccess, useParams } from '@umijs/max'; -import { ModalForm, ProFormTextArea } from '@ant-design/pro-components'; +import { ModalForm, ProCard, ProFormTextArea } from '@ant-design/pro-components'; const Detail: React.FC<{}> = () => { const params = useParams(); @@ -69,26 +69,44 @@ const Detail: React.FC<{}> = () => { ]} > - - {info.pbcBusinessName} - {info.pbcBusinessType} - {info.pbcBusinessContact} - {info.pbcBusinessContactMobile} - - - {info.pbcBusinessHead} - {info.pbcBusinessHeadUserNo} - {info.pbcBusinessStartDate} - {info.pbcBusinessBank} - {info.pbcBusinessAccount} - {info.pbcBusinessMainCategory} - - - - + + + {info.pbcBusinessName} + {info.pbcBusinessType} + {info.pbcBusinessContact} + {info.pbcBusinessContactMobile} + {info.pbcBusinessHead} + {info.pbcBusinessHeadUserNo} + + + + + + + + + + + {info.pbcBusinessHead} + {info.pbcBusinessHeadUserNo} + {info.pbcBusinessStartDate} + {info.pbcBusinessBank} + {info.pbcBusinessAccount} + {info.pbcBusinessMainCategory} + + + + + { @@ -60,55 +60,59 @@ const Detail: React.FC<{}> = () => { ]} > - - 基本信息 - {info.pbcBusinessState === 1 ? } color="success"> - 已认证 - : - } color="default"> - 未认证 - } - } column={3}> - {info.pbcBusinessName} - {info.pbcBusinessType} - - - { - const success = await handleUpdateState(info.pbcId || '', value ? 1 : 2 ); - if (success) { - getInfo() - } - }} + + + 基本信息 + {info.pbcBusinessState === 1 ? } color="success"> + 已认证 + : + } color="default"> + 未认证 + } + } column={3}> + {info.pbcBusinessName} + {info.pbcBusinessType} + + + { + const success = await handleUpdateState(info.pbcId || '', value ? 1 : 2 ); + if (success) { + getInfo() + } + }} + /> + + + {info.pbcBusinessContact} + {info.pbcBusinessContactMobile} + + {info.pbcBusinessLevel} + + { + setIsModalOpen(true) + }} /> + + + + + + + {info.pbcBusinessHead} + {info.pbcBusinessHeadUserNo} + {info.pbcBusinessStartDate} + {info.pbcBusinessBank} + {info.pbcBusinessAccount} + {info.pbcBusinessMainCategory} + + - - - {info.pbcBusinessContact} - {info.pbcBusinessContactMobile} - - {info.pbcBusinessLevel} - - { - setIsModalOpen(true) - }} /> - - - - - {info.pbcBusinessHead} - {info.pbcBusinessHeadUserNo} - {info.pbcBusinessStartDate} - {info.pbcBusinessBank} - {info.pbcBusinessAccount} - {info.pbcBusinessMainCategory} - - - - + + + { @@ -35,7 +35,6 @@ const Welcome: React.FC = () => { label: { autoRotate: false, formatter: (value: any) => { - console.log(value) return value.length > 10 ? value.substring(0,10) + '...' : value; }, } @@ -57,14 +56,10 @@ const Welcome: React.FC = () => { }, }; - const getData = () => { - const param = ref.current?.getFieldsValue() - if (param) { - if (param.pbcCategoryType && param.pbcCategoryType.length > 0) { - param.pbcCategoryType = param.pbcCategoryType[param.pbcCategoryType.length - 1] - } + const getData = (type: number) => { + if (type) { handleLoadChange(true) - dashboardUsingPost(param).then(res => { + dashboardUsingPost({ pbcQueryType: type }).then(res => { handleLoadChange(false) if (res.retcode && res.data) { setPbcRegisterStatical(res.data.pbcRegisterStaticalVO) @@ -90,7 +85,6 @@ const Welcome: React.FC = () => { value: res.data.pbcVisitStaticalVO.pbcLinkNumber || 0 }, ] - console.log(arr) setData2(arr) setData3((res.data.pbcProductViewStaticalVO.pbcProductViewRank || []).map((e: any) => { return { @@ -112,7 +106,7 @@ const Welcome: React.FC = () => { } useEffect(() => { - getData() + getData(1) }, []) return ( @@ -123,69 +117,24 @@ const Welcome: React.FC = () => { }} > - { + getData(value) }} - submitter={{ - searchConfig: { - submitText: '查询', - }, - submitButtonProps: { - loading: loading, - }, - resetButtonProps: { - style: { - display: 'none', - }, + options={[ + { + label: '今日', + value: 1, }, - }} - onFinish={async (values) => { - console.log(values) - getData() - }} - > - - - { - const msg = await listTreeUsingGet({ type: 2 }); - if (msg.retcode && msg.data) { - return msg.data; - } - return []; - }} - /> - - + { + label: '本月', + value: 2, + } + ]} + /> diff --git a/src/pages/ProductList/detail.tsx b/src/pages/ProductList/detail.tsx index 646d982..13fabef 100644 --- a/src/pages/ProductList/detail.tsx +++ b/src/pages/ProductList/detail.tsx @@ -4,6 +4,7 @@ import { PageContainer } from '@ant-design/pro-layout'; import { Access, useAccess, useParams } from '@umijs/max'; import { changeProductStateForAdminUsingGet, productDetailForAdminUsingGet, productDetailUsingPost } from '@/services/pop-b2b2c/pbcProductController'; import { CheckCircleOutlined, InfoCircleOutlined } from '@ant-design/icons'; +import { ProCard } from '@ant-design/pro-components'; const Detail: React.FC<{}> = () => { const params = useParams(); @@ -64,50 +65,52 @@ const Detail: React.FC<{}> = () => { ]} > - - 基本信息 - {info.pbcState === 1 ? } color="success"> - 上架中 - : - } color="default"> - 已下架 - } - } column={3}> - {info.pbcProductTitle} - {info.pbcProductTopCategoryName}/{info.pbcProductParentCategoryName}/{info.pbcProductCategoryName} - ¥{info.pbcProductPrice} - -
- {info.colorDataList?.map(e => - - {e.pbcCommonDataSystem} - + + + 基本信息 + {info.pbcState === 1 ? } color="success"> + 上架中 + : + } color="default"> + 已下架 + } + } column={3}> + {info.pbcProductTitle} + {info.pbcProductTopCategoryName}/{info.pbcProductParentCategoryName}/{info.pbcProductCategoryName} + ¥{info.pbcProductPrice} + +
+ {info.colorDataList?.map(e => + + {e.pbcCommonDataSystem} + + + )} +
+
+ +
+ {images.map(e =>
)} +
+
+ + {info.productCommonDataList?.map(e => + + {e.pbcSystemName} + {e.pbcSystemInputType == 'select' ? e.pbcCommonDataSystemValue : e.pbcCommonDataSystem} )} -
-
- -
- {images.map(e =>
)} -
-
- - {info.productCommonDataList?.map(e => - - {e.pbcSystemName} - {e.pbcCommonDataSystemValue} - - )} - - {info.pbcProductDetail} - {info.pbcProductVipLevels} -
+ + {info.pbcProductDetail} + {info.pbcProductVipLevels} + + ); }; diff --git a/src/pages/User/Login/index.tsx b/src/pages/User/Login/index.tsx index 544bed8..0fce03d 100644 --- a/src/pages/User/Login/index.tsx +++ b/src/pages/User/Login/index.tsx @@ -211,7 +211,7 @@ const Login: React.FC = () => { /> )} */} -
{ > 忘记密码 ? -
+ */}