master
Joe 2 years ago
parent 201203617c
commit 979b9337d1

@ -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<{}> = () => {
</Button>
]}
>
<Descriptions 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>
<Descriptions title="工商信息">
<Descriptions.Item label="法人">{info.pbcBusinessHead}</Descriptions.Item>
<Descriptions.Item label="法人身份证号">{info.pbcBusinessHeadUserNo}</Descriptions.Item>
<Descriptions.Item label="公司成立时间">{info.pbcBusinessStartDate}</Descriptions.Item>
<Descriptions.Item label="开户行">{info.pbcBusinessBank}</Descriptions.Item>
<Descriptions.Item label="收款账号" span={2}>{info.pbcBusinessAccount}</Descriptions.Item>
<Descriptions.Item label="经营范围" span={3}>{info.pbcBusinessMainCategory}</Descriptions.Item>
<Descriptions.Item label="营业执照" span={3}>
<Image
width={200}
src={info.pbcBusinessLicenseUrl}
/>
</Descriptions.Item>
</Descriptions>
<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>
</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>
<Descriptions.Item label="开户行">{info.pbcBusinessBank}</Descriptions.Item>
<Descriptions.Item label="收款账号" span={2}>{info.pbcBusinessAccount}</Descriptions.Item>
<Descriptions.Item label="经营范围" span={3}>{info.pbcBusinessMainCategory}</Descriptions.Item>
<Descriptions.Item label="营业执照" span={3}>
<Image
width={200}
src={info.pbcBusinessLicenseUrl}
/>
</Descriptions.Item>
</Descriptions>
</ProCard>
<ModalForm
title="填写驳回理由"
open={isModalOpen}

@ -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,55 +60,59 @@ const Detail: React.FC<{}> = () => {
</Button>
]}
>
<Descriptions title={<>
<span style={{ marginRight: 20 }}></span>
{info.pbcBusinessState === 1 ? <Tag icon={<CheckCircleOutlined />} color="success">
</Tag> :
<Tag icon={<InfoCircleOutlined />} color="default">
</Tag>}
</>} column={3}>
<Descriptions.Item label="商户名称">{info.pbcBusinessName}</Descriptions.Item>
<Descriptions.Item label="商户类别">{info.pbcBusinessType}</Descriptions.Item>
<Descriptions.Item label="商户状态">
<Access key="switch" accessible={access.businessUpdateState}>
<Switch
checked={info.pbcState === 1}
onChange={async (value) => {
const success = await handleUpdateState(info.pbcId || '', value ? 1 : 2 );
if (success) {
getInfo()
}
}}
<ProCard style={{ marginBottom: 12 }}>
<Descriptions bordered title={<>
<span style={{ marginRight: 20 }}></span>
{info.pbcBusinessState === 1 ? <Tag icon={<CheckCircleOutlined />} color="success">
</Tag> :
<Tag icon={<InfoCircleOutlined />} color="default">
</Tag>}
</>} column={3}>
<Descriptions.Item label="商户名称">{info.pbcBusinessName}</Descriptions.Item>
<Descriptions.Item label="商户类别">{info.pbcBusinessType}</Descriptions.Item>
<Descriptions.Item label="商户状态">
<Access key="switch" accessible={access.businessUpdateState}>
<Switch
checked={info.pbcState === 1}
onChange={async (value) => {
const success = await handleUpdateState(info.pbcId || '', value ? 1 : 2 );
if (success) {
getInfo()
}
}}
/>
</Access>
</Descriptions.Item>
<Descriptions.Item label="联系人">{info.pbcBusinessContact}</Descriptions.Item>
<Descriptions.Item label="手机号">{info.pbcBusinessContactMobile}</Descriptions.Item>
<Descriptions.Item label="商户等级">
<span style={{ marginRight: 20 }}>{info.pbcBusinessLevel}</span>
<Access key="switch" accessible={access.businessUpdateState}>
<FormOutlined onClick={() => {
setIsModalOpen(true)
}} />
</Access>
</Descriptions.Item>
</Descriptions>
</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>
<Descriptions.Item label="开户行">{info.pbcBusinessBank}</Descriptions.Item>
<Descriptions.Item label="收款账号" span={2}>{info.pbcBusinessAccount}</Descriptions.Item>
<Descriptions.Item label="经营范围" span={3}>{info.pbcBusinessMainCategory}</Descriptions.Item>
<Descriptions.Item label="营业执照" span={3}>
<Image
width={200}
src={info.pbcBusinessLicenseUrl}
/>
</Access>
</Descriptions.Item>
<Descriptions.Item label="联系人">{info.pbcBusinessContact}</Descriptions.Item>
<Descriptions.Item label="手机号">{info.pbcBusinessContactMobile}</Descriptions.Item>
<Descriptions.Item label="商户等级">
<span style={{ marginRight: 20 }}>{info.pbcBusinessLevel}</span>
<Access key="switch" accessible={access.businessUpdateState}>
<FormOutlined onClick={() => {
setIsModalOpen(true)
}} />
</Access>
</Descriptions.Item>
</Descriptions>
<Descriptions title="工商信息">
<Descriptions.Item label="法人">{info.pbcBusinessHead}</Descriptions.Item>
<Descriptions.Item label="法人身份证号">{info.pbcBusinessHeadUserNo}</Descriptions.Item>
<Descriptions.Item label="公司成立时间">{info.pbcBusinessStartDate}</Descriptions.Item>
<Descriptions.Item label="开户行">{info.pbcBusinessBank}</Descriptions.Item>
<Descriptions.Item label="收款账号" span={2}>{info.pbcBusinessAccount}</Descriptions.Item>
<Descriptions.Item label="经营范围" span={3}>{info.pbcBusinessMainCategory}</Descriptions.Item>
<Descriptions.Item label="营业执照" span={3}>
<Image
width={200}
src={info.pbcBusinessLicenseUrl}
/>
</Descriptions.Item>
</Descriptions>
</Descriptions.Item>
</Descriptions>
</ProCard>
<ModalForm
title="修改商户等级"
open={isModalOpen}

@ -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 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 = () => {
}}
>
<ProCard style={{ marginBottom: 12 }} bodyStyle={{ padding: '10px 24px' }}>
<ProForm
layout="inline"
formRef={ref}
initialValues={{
pbcQueryType: 1,
pbcCategoryType: null
<Radio.Group
optionType='button'
buttonStyle='solid'
defaultValue={1}
onChange={({ target: { value } }: RadioChangeEvent) => {
getData(value)
}}
submitter={{
searchConfig: {
submitText: '查询',
},
submitButtonProps: {
loading: loading,
},
resetButtonProps: {
style: {
display: 'none',
},
options={[
{
label: '今日',
value: 1,
},
}}
onFinish={async (values) => {
console.log(values)
getData()
}}
>
<ProFormGroup size="small">
<ProFormRadio.Group
colon={false}
name="pbcQueryType"
label=" "
radioType="button"
fieldProps={{
buttonStyle: "solid"
}}
options={[
{
label: '今日',
value: 1,
},
{
label: '本月',
value: 2,
}
]}
/>
<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>
{
label: '本月',
value: 2,
}
]}
/>
</ProCard>
<Spin spinning={loading}>
<Row style={{ marginBottom: 12 }} gutter={16}>

@ -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<{}> = () => {
</Button>
]}
>
<Descriptions title={<>
<span style={{ marginRight: 20 }}></span>
{info.pbcState === 1 ? <Tag icon={<CheckCircleOutlined />} color="success">
</Tag> :
<Tag icon={<InfoCircleOutlined />} color="default">
</Tag>}
</>} column={3}>
<Descriptions.Item label="名称">{info.pbcProductTitle}</Descriptions.Item>
<Descriptions.Item label="商品类目">{info.pbcProductTopCategoryName}/{info.pbcProductParentCategoryName}/{info.pbcProductCategoryName}</Descriptions.Item>
<Descriptions.Item label="价格">¥{info.pbcProductPrice}</Descriptions.Item>
<Descriptions.Item label="颜色" span={3}>
<div style={{ display: 'flex', flexWrap: 'wrap', width: 1000 }}>
{info.colorDataList?.map(e =>
<Row style={{ width: 200, marginBottom: 10, marginRight: 20, alignItems: 'center' }} justify="space-evenly">
<Col span={8}>{e.pbcCommonDataSystem}</Col>
<Col span={8}><Image
width={100}
src={e.pbcColorImageUrl}
/></Col>
<ProCard style={{ marginBottom: 12 }}>
<Descriptions bordered title={<>
<span style={{ marginRight: 20 }}></span>
{info.pbcState === 1 ? <Tag icon={<CheckCircleOutlined />} color="success">
</Tag> :
<Tag icon={<InfoCircleOutlined />} color="default">
</Tag>}
</>} column={3}>
<Descriptions.Item label="名称">{info.pbcProductTitle}</Descriptions.Item>
<Descriptions.Item label="商品类目">{info.pbcProductTopCategoryName}/{info.pbcProductParentCategoryName}/{info.pbcProductCategoryName}</Descriptions.Item>
<Descriptions.Item label="价格">¥{info.pbcProductPrice}</Descriptions.Item>
<Descriptions.Item label="颜色" span={3}>
<div style={{ display: 'flex', flexWrap: 'wrap', width: 1000 }}>
{info.colorDataList?.map(e =>
<Row style={{ width: 200, marginBottom: 10, marginRight: 20, alignItems: 'center' }} justify="space-evenly">
<Col span={8}>{e.pbcCommonDataSystem}</Col>
<Col span={8}><Image
width={100}
src={e.pbcColorImageUrl}
/></Col>
</Row>
)}
</div>
</Descriptions.Item>
<Descriptions.Item label="相册图片" span={3}>
<div style={{ display: 'flex', width: '100%', flexWrap: 'wrap' }}>
{images.map(e => <div style={{ marginBottom: 10, marginRight: 20 }}><Image
width={100}
src={e}
/></div>)}
</div>
</Descriptions.Item>
<Descriptions.Item label="规格" span={3}>
{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.pbcSystemInputType == 'select' ? e.pbcCommonDataSystemValue : e.pbcCommonDataSystem}</Col>
</Row>
)}
</div>
</Descriptions.Item>
<Descriptions.Item label="相册图片" span={3}>
<div style={{ display: 'flex', width: '100%', flexWrap: 'wrap' }}>
{images.map(e => <div style={{ marginBottom: 10, marginRight: 20 }}><Image
width={100}
src={e}
/></div>)}
</div>
</Descriptions.Item>
<Descriptions.Item label="规格" span={3}>
{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>
</Row>
)}
</Descriptions.Item>
<Descriptions.Item label="详情描述" span={3}>{info.pbcProductDetail}</Descriptions.Item>
<Descriptions.Item label="可见范围" span={3}>{info.pbcProductVipLevels}</Descriptions.Item>
</Descriptions>
</Descriptions.Item>
<Descriptions.Item label="详情描述" span={3}>{info.pbcProductDetail}</Descriptions.Item>
<Descriptions.Item label="可见范围" span={3}>{info.pbcProductVipLevels}</Descriptions.Item>
</Descriptions>
</ProCard>
</PageContainer>
);
};

@ -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>

Loading…
Cancel
Save