Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
838f7886
Commit
838f7886
authored
Dec 28, 2020
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
f30b47a1
7f7eb6b8
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
180 additions
and
140 deletions
+180
-140
index.tsx
src/pages/balance/settleRules/memberSettle/index.tsx
+10
-0
index.tsx
src/pages/editor/shopEdit/index.tsx
+2
-2
AfterSoldCenter.tsx
src/pages/home/components/Centers/AfterSoldCenter.tsx
+22
-22
FundCenter.tsx
src/pages/home/components/Centers/FundCenter.tsx
+13
-14
LogisticsCenter.tsx
src/pages/home/components/Centers/LogisticsCenter.tsx
+2
-2
ProcessCenter.tsx
src/pages/home/components/Centers/ProcessCenter.tsx
+22
-22
ProductCenter.tsx
src/pages/home/components/Centers/ProductCenter.tsx
+20
-21
SettlementCenter.tsx
src/pages/home/components/Centers/SettlementCenter.tsx
+7
-7
TradeCenter.tsx
src/pages/home/components/Centers/TradeCenter.tsx
+11
-11
center.less
src/pages/home/components/Centers/center.less
+71
-39
No files found.
src/pages/balance/settleRules/memberSettle/index.tsx
View file @
838f7886
...
...
@@ -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/editor/shopEdit/index.tsx
View file @
838f7886
...
...
@@ -127,10 +127,10 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
const
fetchShopInfo
=
()
=>
{
return
new
Promise
((
resolve
)
=>
{
const
param
:
any
=
{
memberId
,
memberId
,
roleId
:
memberRoleId
}
PublicApi
.
getTemplate
ShopFindShop
(
param
).
then
(
res
=>
{
PublicApi
.
getTemplate
WebMemberShopWebFindByMemberIdAndRoleId
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
...
...
src/pages/home/components/Centers/AfterSoldCenter.tsx
View file @
838f7886
...
...
@@ -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 @
838f7886
...
...
@@ -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 @
838f7886
...
...
@@ -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 @
838f7886
...
...
@@ -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 @
838f7886
...
...
@@ -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 @
838f7886
...
...
@@ -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 @
838f7886
...
...
@@ -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 @
838f7886
.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;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment