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<{}> = () => { ...@@ -79,12 +79,22 @@ const MemberSettle: React.FC<{}> = () => {
return ( return (
<Space> <Space>
<Link to={`/memberCenter/balance/settleRules/memberSettleList/edit?id=${record.id}`}>修改</Link> <Link to={`/memberCenter/balance/settleRules/memberSettleList/edit?id=${record.id}`}>修改</Link>
<Button type="link" onClick={() => handleRemove({id: record.id})}>删除</Button>
</Space> </Space>
) )
} }
} }
] ]
const handleRemove = (params) => {
PublicApi.postSettleAccountsPlatformConfigDeleteMemberSettlementStrategy({id: params.id})
.then(({code}) => {
if(code === 1000) {
formActions.submit();
}
})
}
const goToCreate = () => { const goToCreate = () => {
history.push('/memberCenter/balance/settleRules/memberSettleList/add'); 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> = () => { ...@@ -51,28 +51,28 @@ const SettlementAbility: React.FC<Iprops> = () => {
loading loading
? <Skeleton active /> ? <Skeleton active />
: Object.keys(requestData).map((record) => { : Object.keys(requestData).map((record) => {
return ( return (
<Row key={record} className={styles.row}> <div className={styles.wrapRow} key={record}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col> <span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<Col span={20} className={styles.colRow}> <div className={styles.rowValues}>
{ {
requestData[record].map((item, key) => { requestData[record].map((item, key) => {
return ( return (
<Col span={4} key={key} className={styles.col}> <div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div> <div className={styles.colTitle}>{item.name}</div>
{ {
item.link item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link> ? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div> : <div className={styles.colValue}>{item.count}</div>
} }
</Col> </div>
) )
}) })
} }
</Col> </div>
</Row> </div>
) )
}) })
} }
</> </>
) )
......
src/pages/home/components/Centers/FundCenter.tsx
View file @ 0f59f401
...@@ -84,28 +84,27 @@ const FundCenter: React.FC<Iprops> = () => { ...@@ -84,28 +84,27 @@ const FundCenter: React.FC<Iprops> = () => {
</div> </div>
<div> <div>
{ {
Object.keys(requestData).map((item) => { Object.keys(requestData).map((record) => {
return ( return (
<Row key={item} className={styles.row}> <div className={styles.wrapRow} key={record}>
<Col span={4} className={styles.rowTitle}>{KEY_TO_TITLE[item]}</Col> <span className={styles.rowTitle}>{KEY_TO_TITLE[record]}</span>
<Col span={20} className={styles.colRow}> <div className={styles.rowValues}>
{ {
requestData[item].map((record) => { requestData[record].map((item, key) => {
return ( return (
<Col span={4} key={record.name} className={styles.col}> <div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{record.name}</div> <div className={styles.colTitle}>{item.name}</div>
{ {
record.link item.link
? <Link to={record.link} className={styles.colValue}>{record.count}</Link> ? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{record.count}</div> : <div className={styles.colValue}>{item.count}</div>
} }
</div>
</Col>
) )
}) })
} }
</Col> </div>
</Row> </div>
) )
}) })
} }
......
src/pages/home/components/Centers/LogisticsCenter.tsx
View file @ 0f59f401
...@@ -6,7 +6,7 @@ import logistics_form from '@/assets/imgs/logistics_form.png'; ...@@ -6,7 +6,7 @@ import logistics_form from '@/assets/imgs/logistics_form.png';
import logistics_address from '@/assets/imgs/logistics_address.png'; import logistics_address from '@/assets/imgs/logistics_address.png';
import logistics_cost from '@/assets/imgs/logistics_cost.png'; import logistics_cost from '@/assets/imgs/logistics_cost.png';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { Skeleton, Row, Col, Badge } from 'antd'; import { Skeleton, Badge } from 'antd';
import { Link } from 'umi'; import { Link } from 'umi';
import Authorize from '../Authorize'; import Authorize from '../Authorize';
import { getAuth } from '@/utils/auth'; import { getAuth } from '@/utils/auth';
...@@ -76,7 +76,7 @@ const LogisticsCenter: React.FC<Iprops> = () => { ...@@ -76,7 +76,7 @@ const LogisticsCenter: React.FC<Iprops> = () => {
<div className={styles.centerRow}> <div className={styles.centerRow}>
{ {
data.map((item) => { data.map((item) => {
const hasAuth = !urls.includes(item.url);; const hasAuth = !urls.includes(item.url);
if(!hasAuth) { if(!hasAuth) {
return null return null
} }
......
src/pages/home/components/Centers/ProcessCenter.tsx
View file @ 0f59f401
...@@ -42,28 +42,28 @@ const ProcessCenter: React.FC<Iprops> = () => { ...@@ -42,28 +42,28 @@ const ProcessCenter: React.FC<Iprops> = () => {
loading loading
? <Skeleton active /> ? <Skeleton active />
: Object.keys(requestData).map((record) => { : Object.keys(requestData).map((record) => {
return ( return (
<Row key={record} className={styles.row}> <div className={styles.wrapRow} key={record}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col> <span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<Col span={20} className={styles.colRow}> <div className={styles.rowValues}>
{ {
requestData[record].map((item, key) => { requestData[record].map((item, key) => {
return ( return (
<Col span={4} key={key} className={styles.col}> <div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div> <div className={styles.colTitle}>{item.name}</div>
{ {
item.link item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link> ? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div> : <div className={styles.colValue}>{item.count}</div>
} }
</Col> </div>
) )
}) })
} }
</Col> </div>
</Row> </div>
) )
}) })
} }
</> </>
) )
......
src/pages/home/components/Centers/ProductCenter.tsx
View file @ 0f59f401
...@@ -57,27 +57,26 @@ const ProductCenter: React.FC<Iprops> = () => { ...@@ -57,27 +57,26 @@ const ProductCenter: React.FC<Iprops> = () => {
{ {
loading loading
? <Skeleton active /> ? <Skeleton active />
: <> : <div className={styles.wrapRow}>
<Row className={styles.row}> <span className={styles.rowTitle}>商品</span>
<Col span={4} className={styles.rowTitle}>商品</Col> <div className={styles.rowValues}>
<Col span={20} className={styles.colRow}> {
{ isArray && requestData.map((item, key) => {
isArray && requestData.map((item) => { return (
return ( <div className={styles.wrapCol} key={key}>
<Col span={4} key={item.name} className={styles.col}> <div className={styles.colTitle}>{item.name}</div>
<div className={styles.colTitle}>{item.name}</div> {
{ item.link
item.link ? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
? <Link to={item.link} className={styles.colValue}>{item.count}</Link> : <div className={styles.colValue}>{item.count}</div>
: <div className={styles.colValue}>{item.count}</div> }
} </div>
</Col> )
) })
}) }
} </div>
</Col> </div>
</Row>
</>
} }
</> </>
) )
......
src/pages/home/components/Centers/SettlementCenter.tsx
View file @ 0f59f401
...@@ -87,25 +87,25 @@ const SettlementCenter: React.FC<Iprops> = () => { ...@@ -87,25 +87,25 @@ const SettlementCenter: React.FC<Iprops> = () => {
{ {
Object.keys(requestData).map((record) => { Object.keys(requestData).map((record) => {
return ( return (
<Row key={record} className={styles.row}> <div className={styles.wrapRow} key={record}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col> <span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<Col span={20} className={styles.colRow}> <div className={styles.rowValues}>
{ {
requestData[record].map((item, key) => { requestData[record].map((item, key) => {
return ( return (
<Col span={4} key={key} className={styles.col}> <div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div> <div className={styles.colTitle}>{item.name}</div>
{ {
item.link item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link> ? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div> : <div className={styles.colValue}>{item.count}</div>
} }
</Col> </div>
) )
}) })
} }
</Col> </div>
</Row> </div>
) )
}) })
} }
......
src/pages/home/components/Centers/TradeCenter.tsx
View file @ 0f59f401
...@@ -55,25 +55,25 @@ const TradeCenter: React.FC<Iprops> = () => { ...@@ -55,25 +55,25 @@ const TradeCenter: React.FC<Iprops> = () => {
)) ))
: Object.keys(requestData).map((record) => { : Object.keys(requestData).map((record) => {
return ( return (
<Row key={record} className={styles.row}> <div className={styles.wrapRow} key={record}>
<Col span={4} className={styles.rowTitle}>{KEY_TITLE[record]}</Col> <span className={styles.rowTitle}>{KEY_TITLE[record]}</span>
<Col span={20} className={styles.colRow}> <div className={styles.rowValues}>
{ {
requestData[record].map((item, key) => { requestData[record].map((item, key) => {
return ( return (
<Col span={4} key={key} className={styles.col}> <div className={styles.wrapCol} key={key}>
<div className={styles.colTitle}>{item.name}</div> <div className={styles.colTitle}>{item.name}</div>
{ {
item.link item.link
? <Link to={item.link} className={styles.colValue}>{item.count}</Link> ? <Link to={item.link} className={styles.colValue}>{item.count}</Link>
: <div className={styles.colValue}>{item.count}</div> : <div className={styles.colValue}>{item.count}</div>
} }
</Col> </div>
) )
}) })
} }
</Col> </div>
</Row> </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 { .tagsItem {
min-width: 160px; min-width: 160px;
...@@ -144,3 +105,74 @@ ...@@ -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