Skip to content

J
jinfa-platform
Commit 0f59f401 authored by GuanHua's avatar GuanHua
Browse files
Options

Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

parents 6c4e0a7f 7f7eb6b8
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 138 deletions
src/pages/balance/settleRules/memberSettle/index.tsx
View file @ 0f59f401
......@@ -79,12 +79,22 @@ const MemberSettle: React.FC<{}> = () => {
return (
<Space>
<Link to={`/memberCenter/balance/settleRules/memberSettleList/edit?id=${record.id}`}>修改</Link>
<Button type="link" onClick={() => handleRemove({id: record.id})}>删除</Button>
</Space>
)
}
}
]
const handleRemove = (params) => {
PublicApi.postSettleAccountsPlatformConfigDeleteMemberSettlementStrategy({id: params.id})
.then(({code}) => {
if(code === 1000) {
formActions.submit();
}
})
}
const goToCreate = () => {
history.push('/memberCenter/balance/settleRules/memberSettleList/add');
}
......
src/pages/home/components/Centers/AfterSoldCenter.tsx
View file @ 0f59f401
......@@ -51,28 +51,28 @@ const SettlementAbility: React.FC<Iprops> = () => {
loading
? <Skeleton active />
: Object.keys(requestData).map((record) => {
return (
<Row key={record} className={styles.row}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col>
<Col span={20} className={styles.colRow}>
{
requestData[record].map((item, key) => {
return (
<Col span={4} key={key} className={styles.col}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</Col>
)
})
}
</Col>
</Row>
)
})
return (
<div className={styles.wrapRow} key={record}>
<span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<div className={styles.rowValues}>
{
requestData[record].map((item, key) => {
return (
<div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</div>
)
})
}
</div>
</div>
)
})
}
</>
)
......
src/pages/home/components/Centers/FundCenter.tsx
View file @ 0f59f401
......@@ -84,28 +84,27 @@ const FundCenter: React.FC<Iprops> = () => {
</div>
<div>
{
Object.keys(requestData).map((item) => {
Object.keys(requestData).map((record) => {
return (
<Row key={item} className={styles.row}>
<Col span={4} className={styles.rowTitle}>{KEY_TO_TITLE[item]}</Col>
<Col span={20} className={styles.colRow}>
<div className={styles.wrapRow} key={record}>
<span className={styles.rowTitle}>{KEY_TO_TITLE[record]}</span>
<div className={styles.rowValues}>
{
requestData[item].map((record) => {
requestData[record].map((item, key) => {
return (
<Col span={4} key={record.name} className={styles.col}>
<div className={styles.colTitle}>{record.name}</div>
<div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div>
{
record.link
? <Link to={record.link} className={styles.colValue}>{record.count}</Link>
: <div className={styles.colValue}>{record.count}</div>
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</Col>
</div>
)
})
}
</Col>
</Row>
</div>
</div>
)
})
}
......
src/pages/home/components/Centers/LogisticsCenter.tsx
View file @ 0f59f401
......@@ -6,7 +6,7 @@ import logistics_form from '@/assets/imgs/logistics_form.png';
import logistics_address from '@/assets/imgs/logistics_address.png';
import logistics_cost from '@/assets/imgs/logistics_cost.png';
import { PublicApi } from '@/services/api';
import { Skeleton, Row, Col, Badge } from 'antd';
import { Skeleton, Badge } from 'antd';
import { Link } from 'umi';
import Authorize from '../Authorize';
import { getAuth } from '@/utils/auth';
......@@ -76,7 +76,7 @@ const LogisticsCenter: React.FC<Iprops> = () => {
<div className={styles.centerRow}>
{
data.map((item) => {
const hasAuth = !urls.includes(item.url);;
const hasAuth = !urls.includes(item.url);
if(!hasAuth) {
return null
}
......
src/pages/home/components/Centers/ProcessCenter.tsx
View file @ 0f59f401
......@@ -42,28 +42,28 @@ const ProcessCenter: React.FC<Iprops> = () => {
loading
? <Skeleton active />
: Object.keys(requestData).map((record) => {
return (
<Row key={record} className={styles.row}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col>
<Col span={20} className={styles.colRow}>
{
requestData[record].map((item, key) => {
return (
<Col span={4} key={key} className={styles.col}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</Col>
)
})
}
</Col>
</Row>
)
})
return (
<div className={styles.wrapRow} key={record}>
<span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<div className={styles.rowValues}>
{
requestData[record].map((item, key) => {
return (
<div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</div>
)
})
}
</div>
</div>
)
})
}
</>
)
......
src/pages/home/components/Centers/ProductCenter.tsx
View file @ 0f59f401
......@@ -57,27 +57,26 @@ const ProductCenter: React.FC<Iprops> = () => {
{
loading
? <Skeleton active />
: <>
<Row className={styles.row}>
<Col span={4} className={styles.rowTitle}>商品</Col>
<Col span={20} className={styles.colRow}>
{
isArray && requestData.map((item) => {
return (
<Col span={4} key={item.name} className={styles.col}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</Col>
)
})
}
</Col>
</Row>
</>
: <div className={styles.wrapRow}>
<span className={styles.rowTitle}>商品</span>
<div className={styles.rowValues}>
{
isArray && requestData.map((item, key) => {
return (
<div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</div>
)
})
}
</div>
</div>
}
</>
)
......
src/pages/home/components/Centers/SettlementCenter.tsx
View file @ 0f59f401
......@@ -87,25 +87,25 @@ const SettlementCenter: React.FC<Iprops> = () => {
{
Object.keys(requestData).map((record) => {
return (
<Row key={record} className={styles.row}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col>
<Col span={20} className={styles.colRow}>
<div className={styles.wrapRow} key={record}>
<span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<div className={styles.rowValues}>
{
requestData[record].map((item, key) => {
return (
<Col span={4} key={key} className={styles.col}>
<div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</Col>
</div>
)
})
}
</Col>
</Row>
</div>
</div>
)
})
}
......
src/pages/home/components/Centers/TradeCenter.tsx
View file @ 0f59f401
......@@ -55,25 +55,25 @@ const TradeCenter: React.FC<Iprops> = () => {
))
: Object.keys(requestData).map((record) => {
return (
<Row key={record} className={styles.row}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col>
<Col span={20} className={styles.colRow}>
<div className={styles.wrapRow} key={record}>
<span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<div className={styles.rowValues}>
{
requestData[record].map((item, key) => {
return (
<Col span={4} key={key} className={styles.col}>
<div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div>
{
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</Col>
item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div>
}
</div>
)
})
}
</Col>
</Row>
</div>
</div>
)
})
......
src/pages/home/components/Centers/center.less
View file @ 0f59f401
.row {
padding: 0px 0px 12px 0;
.rowTitle {
font-size: 14;
font-weight: 400;
color: #303133;
margin-top: 24px;
}
.colRow {
display: flex;
flex-wrap: wrap;
.col {
margin-top: 24px;
}
.colTitle {
font-size: 12px;
font-weight: 400;
color: #909399;
min-height: 36px;
}
.colValue {
font-weight: 500;
font-size: 24px;
margin-top: 16px;
color: #303133;
display: block;
&:hover {
text-decoration: underline;
color: @main-color;
cursor: pointer;
}
}
}
}
.tagsItem {
min-width: 160px;
......@@ -144,3 +105,74 @@
}
}
}
.wrapRow {
display: flex;
flex-direction: row;
padding: 30px 0 6px 0;
border-bottom: 1px dashed #FFEEF0F3;
&:last-of-type {
border-bottom: none;
}
.rowTitle {
font-size: 14px;
width: 145px;
}
.rowValues {
display: flex;
flex-direction: row;
flex-wrap: wrap;
flex: 1;
.wrapCol {
flex-basis: 16.66%;
padding: 0 10px;
margin-bottom: 24px;
.colTitle {
font-size: 12px;
font-weight: 400;
color: #909399;
min-height: 36px;
}
.colValue {
font-weight: 500;
font-size: 24px;
margin-top: 16px;
color: #303133;
display: block;
&:hover {
text-decoration: underline;
color: @main-color;
cursor: pointer;
}
}
}
}
}
@media (max-width: 1366px) {
.wrapRow {
.rowTitle {
font-size: 12px;
width: 125px;
}
.rowValues {
.wrapCol {
flex-basis: 20%;
padding: 0 10px;
}
.colValue {
font-weight: 500;
font-size: 18px;
}
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment