Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
project
jinfa-admin
Commits
fe05811c
Commit
fe05811c
authored
Oct 30, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
b5aa57e0
b6cfd3cd
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
9 deletions
+20
-9
index.tsx
src/pages/comment/manage/index.tsx
+3
-1
utils.ts
src/pages/comment/utils.ts
+5
-4
index.tsx
src/pages/member/memberPr1/index.tsx
+3
-1
index.tsx
src/pages/member/memberPr2/index.tsx
+3
-1
index.tsx
src/pages/member/memberPrConfirm/index.tsx
+3
-1
index.tsx
src/pages/member/memberPrSubmit/index.tsx
+3
-1
No files found.
src/pages/comment/manage/index.tsx
View file @
fe05811c
...
...
@@ -157,7 +157,9 @@ const CommentManage: React.FC = () => {
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要删除选中的评论吗?'
,
content
:
'确定要删除选中的评论吗?'
,
okText
:
'确定'
,
cancelText
:
'取消'
,
onOk
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberPlatformCommentOrderTradeHistoryDelete
({
...
...
src/pages/comment/utils.ts
View file @
fe05811c
...
...
@@ -2,10 +2,10 @@
* @Author: XieZhiXiong
* @Date: 2020-10-20 11:43:12
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-
20 11:43:21
* @LastEditTime: 2020-10-
30 14:11:06
* @Description:
*/
import
{
normalizeFiledata
,
FileData
}
from
'@/utils'
;
import
{
normalizeFiledata
,
FileData
,
isJSONStr
}
from
'@/utils'
;
export
interface
Unevaluated
{
good
:
{
...
...
@@ -27,10 +27,11 @@ export function normalizeUnevaluatedList(arr: any): Unevaluated[] {
return
ret
;
}
arr
.
forEach
(
item
=>
{
const
product
=
isJSONStr
(
item
.
product
)
||
{};
const
atom
=
{
good
:
{
pic
:
item
.
imgUrl
,
productName
:
item
.
productName
,
pic
:
product
.
pic
,
productName
:
product
.
productName
,
price
:
item
.
price
,
purchaseCount
:
item
.
dealCount
,
// 采购数量
},
...
...
src/pages/member/memberPr1/index.tsx
View file @
fe05811c
...
...
@@ -138,7 +138,9 @@ const MemberPr1: React.FC<{}> = props => {
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
content
:
'确定要审核通过选中的会员吗?'
,
okText
:
'确定'
,
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
src/pages/member/memberPr2/index.tsx
View file @
fe05811c
...
...
@@ -138,7 +138,9 @@ const MemberPr2: React.FC<{}> = props => {
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
content
:
'确定要审核通过选中的会员吗?'
,
okText
:
'确定'
,
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
src/pages/member/memberPrConfirm/index.tsx
View file @
fe05811c
...
...
@@ -144,7 +144,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
content
:
'确定要审核通过选中的会员吗?'
,
okText
:
'确定'
,
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
src/pages/member/memberPrSubmit/index.tsx
View file @
fe05811c
...
...
@@ -138,7 +138,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
content
:
'确定要审核通过选中的会员吗?'
,
okText
:
'确定'
,
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
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