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
黄庭坚
jinfa-platform
Commits
0551a59a
Commit
0551a59a
authored
Dec 11, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善业务逻辑
parent
3b303fb8
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
7 deletions
+29
-7
integral-1.png
src/assets/imgs/integral-1.png
+0
-0
integral-2.png
src/assets/imgs/integral-2.png
+0
-0
integral-3.png
src/assets/imgs/integral-3.png
+0
-0
integral-4.png
src/assets/imgs/integral-4.png
+0
-0
index.tsx
...terService/exchangeManage/components/DetailInfo/index.tsx
+2
-2
index.tsx
...afterService/returnManage/components/DetailInfo/index.tsx
+20
-1
index.tsx
src/pages/member/components/SincerityInfo/index.tsx
+7
-4
No files found.
src/assets/imgs/integral-1.png
0 → 100644
View file @
0551a59a
1.92 KB
src/assets/imgs/integral-2.png
0 → 100644
View file @
0551a59a
3.39 KB
src/assets/imgs/integral-3.png
0 → 100644
View file @
0551a59a
2.5 KB
src/assets/imgs/integral-4.png
0 → 100644
View file @
0551a59a
2.64 KB
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @
0551a59a
...
...
@@ -271,7 +271,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const
fetchOuterHistory
=
(
params
):
Promise
<
OuterHistoryData
>
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getAsRe
turn
GoodsPageOuterWorkflowRecord
({
PublicApi
.
getAsRe
place
GoodsPageOuterWorkflowRecord
({
...
params
,
dataId
:
id
,
})
...
...
@@ -289,7 +289,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const
fetchInnerHistory
=
(
params
):
Promise
<
InnerHistoryData
>
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getAsRe
turn
GoodsPageInnerWorkflowRecord
({
PublicApi
.
getAsRe
place
GoodsPageInnerWorkflowRecord
({
...
params
,
dataId
:
id
,
})
...
...
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @
0551a59a
...
...
@@ -34,7 +34,7 @@ import EyePreview from '@/components/EyePreview';
import
AuditProcess
from
'@/components/AuditProcess'
;
import
{
EditableColumns
}
from
'@/components/PolymericTable/interface'
;
import
{
Values
as
ReturnAddressValues
}
from
'../../../components/ReturnAddressInfo'
;
import
ReturnInfoDrawer
from
'../../../components/ReturnInfoDrawer'
;
import
ReturnInfoDrawer
,
{
OrderInfo
}
from
'../../../components/ReturnInfoDrawer'
;
import
{
EXCHANGE_OUTER_STATUS_TAG_MAP
,
EXCHANGE_INNER_STATUS_BADGE_MAP
,
...
...
@@ -75,8 +75,26 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const
[
infoLoading
,
setInfoloading
]
=
useState
(
false
);
const
[
visibleOrderDetial
,
setVisibleReturnInfo
]
=
useState
<
boolean
>
(
false
);
const
[
returnAddress
,
setReturnAddress
]
=
useState
<
ReturnAddressValues
>
(
null
);
const
[
orderInfo
,
setOrderInfo
]
=
useState
<
OrderInfo
>
(
null
);
const
handleCheckOrderDetial
=
record
=>
{
setOrderInfo
({
orderNo
:
record
.
orderNo
,
productName
:
record
.
productName
,
category
:
record
.
category
,
brand
:
record
.
brand
,
unit
:
record
.
unit
,
purchaseCount
:
record
.
purchaseCount
,
purchasePrice
:
record
.
purchasePrice
,
purchaseAmount
:
record
.
purchaseAmount
,
returnCount
:
record
.
returnCount
,
returnReason
:
record
.
returnReason
,
payList
:
record
.
payList
.
map
(
item
=>
({
...
item
,
payWayTxt
:
item
.
payWayName
,
channelTxt
:
item
.
channelName
,
})),
});
setVisibleReturnInfo
(
true
);
};
...
...
@@ -454,6 +472,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
ReturnInfoDrawer
visible=
{
visibleOrderDetial
}
orderInfo=
{
orderInfo
}
onClose=
{
()
=>
setVisibleReturnInfo
(
false
)
}
/>
</
PageHeaderWrapper
>
...
...
src/pages/member/components/SincerityInfo/index.tsx
View file @
0551a59a
...
...
@@ -17,8 +17,8 @@ import { EditableColumns } from '@/components/PolymericTable/interface';
import
{
Pie
}
from
'@/components/Charts'
;
import
MellowCard
from
'@/components/MellowCard'
;
import
Mood
from
'@/components/Mood'
;
import
equity5
from
'@/assets/imgs/equity-5.png'
;
import
styles
from
'./index.less'
;
import
request
from
'@/utils/request'
;
const
{
TabPane
}
=
Tabs
;
...
...
@@ -549,14 +549,17 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
<
Col
flex=
"1"
>
<
div
className=
{
styles
.
tofo
}
>
<
MellowCard
fullHeight
>
{
integralItems
.
map
(
item
=>
(
{
integralItems
.
map
(
(
item
,
index
)
=>
(
<
Card
.
Grid
key=
{
item
.
id
}
className=
{
styles
[
'tofo-item'
]
}
>
<
ContentBox
title=
{
item
.
creditTypeName
}
desc=
{
item
.
remark
}
desc=
{
`${item.remark}(${item.creditPoint})`
}
content=
{
item
.
creditPoint
}
extra=
{
<
img
className=
{
styles
[
'tofo-item-logo'
]
}
src=
{
equity5
}
/>
<
img
className=
{
styles
[
'tofo-item-logo'
]
}
src=
{
require
(
`@/assets/imgs/integral-${index + 1}.png`
)
}
/>
}
/>
</
Card
.
Grid
>
...
...
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