优化

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,13 +69,30 @@ const Detail: React.FC<{}> = () => {
         </Button>
       ]}
     >
-      <Descriptions title="基本信息" column={2}>
+      <ProCard style={{ marginBottom: 12 }}>
+        <Descriptions bordered title="基本信息" column={2}>
           <Descriptions.Item label="商户名称">{info.pbcBusinessName}</Descriptions.Item>
           <Descriptions.Item label="商户类别">{info.pbcBusinessType}</Descriptions.Item>
           <Descriptions.Item label="联系人">{info.pbcBusinessContact}</Descriptions.Item>
           <Descriptions.Item label="手机号">{info.pbcBusinessContactMobile}</Descriptions.Item>
+          <Descriptions.Item label="负责人">{info.pbcBusinessHead}</Descriptions.Item>
+          <Descriptions.Item label="负责人身份证号">{info.pbcBusinessHeadUserNo}</Descriptions.Item>
+          <Descriptions.Item label="身份证人像面">
+            <Image
+              width={200}
+              src={info.pbcBusinessHeadUserNoBackUrl}
+            />
+          </Descriptions.Item>
+          <Descriptions.Item label="身份证国徽面">
+            <Image
+              width={200}
+              src={info.pbcBusinessHeadUserNoFrontUrl}
+            />
+          </Descriptions.Item>
         </Descriptions>
-      <Descriptions title="工商信息">
+      </ProCard>
+      <ProCard style={{ marginBottom: 12 }}>
+        <Descriptions bordered title="工商信息">
           <Descriptions.Item label="法人">{info.pbcBusinessHead}</Descriptions.Item>
           <Descriptions.Item label="法人身份证号">{info.pbcBusinessHeadUserNo}</Descriptions.Item>
           <Descriptions.Item label="公司成立时间">{info.pbcBusinessStartDate}</Descriptions.Item>
@@ -89,6 +106,7 @@ const Detail: React.FC<{}> = () => {
             />
           </Descriptions.Item>
         </Descriptions>
+      </ProCard>
       <ModalForm
         title="填写驳回理由"
         open={isModalOpen}

src/pages/BusinessList/detail.tsx

@@ -4,7 +4,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import { Access, useAccess, useParams } from '@umijs/max';
 import { CheckCircleOutlined, FormOutlined, InfoCircleOutlined } from '@ant-design/icons';
 import { getPbcBusinessByIdUsingPost, updateBusinessRecordLevelUsingGet, updateBusinessRecordStateUsingGet } from '@/services/pop-b2b2c/pbcBusinessController';
-import { ModalForm, ProFormSelect } from '@ant-design/pro-components';
+import { ModalForm, ProCard, ProFormSelect } from '@ant-design/pro-components';
 
 
 const handleUpdateState = async (id: string, state: number) => {
@@ -60,7 +60,8 @@ const Detail: React.FC<{}> = () => {
         </Button>
       ]}
     >
-      <Descriptions title={<>
+      <ProCard style={{ marginBottom: 12 }}>
+        <Descriptions bordered title={<>
           <span style={{ marginRight: 20 }}>基本信息</span>
           {info.pbcBusinessState === 1 ? <Tag icon={<CheckCircleOutlined />} color="success">
             已认证
@@ -95,7 +96,9 @@ const Detail: React.FC<{}> = () => {
             </Access>
           </Descriptions.Item>
         </Descriptions>
-      <Descriptions title="工商信息">
+      </ProCard>
+      <ProCard style={{ marginBottom: 12 }}>
+        <Descriptions bordered title="工商信息">
           <Descriptions.Item label="法人">{info.pbcBusinessHead}</Descriptions.Item>
           <Descriptions.Item label="法人身份证号">{info.pbcBusinessHeadUserNo}</Descriptions.Item>
           <Descriptions.Item label="公司成立时间">{info.pbcBusinessStartDate}</Descriptions.Item>
@@ -109,6 +112,7 @@ const Detail: React.FC<{}> = () => {
             />
           </Descriptions.Item>
         </Descriptions>
+      </ProCard>
       <ModalForm
         title="修改商户等级"
         open={isModalOpen}

src/pages/Dashboard.tsx

@@ -2,7 +2,7 @@ import { listTreeUsingGet } from '@/services/pop-b2b2c/pbcCategoryController';
 import { dashboardUsingPost } from '@/services/pop-b2b2c/pbcUserRecordLogController';
 import { Bar, Pie } from '@ant-design/plots';
 import { PageContainer, ProCard, ProForm, ProFormCascader, ProFormGroup, ProFormInstance, ProFormRadio } from '@ant-design/pro-components';
-import { Card, Col, Row, Spin, Statistic } from 'antd';
+import { Card, Col, Radio, RadioChangeEvent, Row, Spin, Statistic } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 
 const Welcome: React.FC = () => {
@@ -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 getData = (type: number) => {
-    const param = ref.current?.getFieldsValue()
+    if (type) {
-    if (param) {
-      if (param.pbcCategoryType && param.pbcCategoryType.length > 0) {
-        param.pbcCategoryType = param.pbcCategoryType[param.pbcCategoryType.length - 1]
-      }
       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,39 +117,12 @@ const Welcome: React.FC = () => {
       }}
     >
       <ProCard style={{ marginBottom: 12 }} bodyStyle={{ padding: '10px 24px' }}>
-        <ProForm
+        <Radio.Group
-          layout="inline"
+          optionType='button'
-          formRef={ref}
+          buttonStyle='solid'
-          initialValues={{
+          defaultValue={1}
-            pbcQueryType: 1,
+          onChange={({ target: { value } }: RadioChangeEvent) => {
-            pbcCategoryType: null
+            getData(value)
-          }}
-          submitter={{
-            searchConfig: {
-              submitText: '查询',
-            },
-            submitButtonProps: {
-              loading: loading,
-            },
-            resetButtonProps: {
-              style: {
-                display: 'none',
-              },
-            },
-          }}
-          onFinish={async (values) => {
-            console.log(values)
-            getData()
-          }}
-        >
-          <ProFormGroup size="small">
-            <ProFormRadio.Group
-              colon={false}
-              name="pbcQueryType"
-              label=" "
-              radioType="button"
-              fieldProps={{
-                buttonStyle: "solid"
           }}
           options={[
             {
@@ -168,24 +135,6 @@ const Welcome: React.FC = () => {
             }
           ]}
         />
-            <ProFormCascader
-              colon={false}
-              name="pbcCategoryType"
-              label=" "
-              placeholder="请选择商品类别"
-              fieldProps={{
-                fieldNames: { label: 'pbcCategoryName', value: 'pbcId', children: 'children' }
-              }}
-              request={async () => {
-                const msg = await listTreeUsingGet({ type: 2 });
-                if (msg.retcode && msg.data) {
-                  return msg.data;
-                }
-                return [];
-              }}
-            />
-          </ProFormGroup>
-        </ProForm>
       </ProCard>
       <Spin spinning={loading}>
         <Row style={{ marginBottom: 12 }} gutter={16}>

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,7 +65,8 @@ const Detail: React.FC<{}> = () => {
         </Button>
       ]}
     >
-      <Descriptions title={<>
+      <ProCard style={{ marginBottom: 12 }}>
+        <Descriptions bordered title={<>
           <span style={{ marginRight: 20 }}>基本信息</span>
           {info.pbcState === 1 ? <Tag icon={<CheckCircleOutlined />} color="success">
             上架中
@@ -101,13 +103,14 @@ const Detail: React.FC<{}> = () => {
             {info.productCommonDataList?.map(e => 
               <Row style={{ width: 150, marginBottom: 10, marginRight: 20, alignItems: 'center' }} justify="space-evenly">
                 <Col style={{ color: 'rgb(170, 170, 170)' }} span={8}>{e.pbcSystemName}</Col>
-              <Col span={8}>{e.pbcCommonDataSystemValue}</Col>
+                <Col span={8}>{e.pbcSystemInputType == 'select' ? e.pbcCommonDataSystemValue : e.pbcCommonDataSystem}</Col>
               </Row>
             )}
           </Descriptions.Item>
           <Descriptions.Item label="详情描述" span={3}>{info.pbcProductDetail}</Descriptions.Item>
           <Descriptions.Item label="可见范围" span={3}>{info.pbcProductVipLevels}</Descriptions.Item>
         </Descriptions>
+      </ProCard>
     </PageContainer>
   );
 };

src/pages/User/Login/index.tsx

@@ -211,7 +211,7 @@ const Login: React.FC = () => {
               />
             </>
           )} */}
-          <div
+          {/* <div
             style={{
               marginBottom: 24,
             }}
@@ -226,7 +226,7 @@ const Login: React.FC = () => {
             >
               忘记密码 ?
             </a>
-          </div>
+          </div> */}
         </LoginForm>
       </div>
     </div>