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
shenshaokai
jinfa-admin
Commits
7763f254
Commit
7763f254
authored
Aug 14, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
c44e3c3d
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
88 additions
and
18 deletions
+88
-18
package.json
package.json
+1
-1
addAttribute.tsx
src/pages/classAndProperty/attribute/addAttribute.tsx
+4
-1
index.tsx
src/pages/classAndProperty/class/index.tsx
+1
-0
addPropertyValue.tsx
...pages/classAndProperty/propertyValue/addPropertyValue.tsx
+4
-1
checkProducts.tsx
src/pages/commodity/products/checkProducts.tsx
+1
-1
viewProducts.tsx
src/pages/commodity/products/viewProducts.tsx
+1
-1
checkBrand.tsx
src/pages/trademark/trademarkSearch/checkBrand.tsx
+72
-12
index.less
src/pages/trademark/trademarkSearch/index.less
+1
-0
index.less
src/pages/trademark/trademarkWillCheck/index.less
+2
-0
request.ts
src/utils/request.ts
+1
-1
No files found.
package.json
View file @
7763f254
...
...
@@ -47,7 +47,7 @@
"
axios
"
:
"^0.19.2"
,
"
god-yapi2ts
"
:
"^1.6.0"
,
"
gulp
"
:
"^4.0.2"
,
"
json2ts
"
:
"
^
0.0.7"
,
"
json2ts
"
:
"0.0.7"
,
"
ora
"
:
"^4.0.4"
}
}
src/pages/classAndProperty/attribute/addAttribute.tsx
View file @
7763f254
...
...
@@ -51,7 +51,10 @@ const AddAtttribute: React.FC<{}> = () => {
delete
values
.
attributeShow
if
(
JSON
.
stringify
(
values
.
attribute
)
===
'{}'
)
delete
values
.
attribute
PublicApi
.
postProductPlatformSaveOrUpdateAttribute
(
values
)
PublicApi
.
postProductPlatformSaveOrUpdateAttribute
(
values
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
history
.
goBack
()
})
}).
catch
(
error
=>
{
console
.
error
(
error
)
})
...
...
src/pages/classAndProperty/class/index.tsx
View file @
7763f254
...
...
@@ -60,6 +60,7 @@ const ClassProperty: React.FC<{}> = () => {
setTreeStatus
(
FormState
.
ADD
)
},
addChildNode
(
node
)
{
formActions
.
reset
({
validate
:
false
})
setNodeRecord
({
...
node
,
parentId
:
node
.
id
,
// 添加子级的时候 使用上一级的id作为parentId
...
...
src/pages/classAndProperty/propertyValue/addPropertyValue.tsx
View file @
7763f254
...
...
@@ -68,7 +68,10 @@ const AddPropertyValue: React.FC<{}> = () => {
if
(
JSON
.
stringify
(
pararms
.
attributeValue
)
===
'{}'
)
delete
pararms
.
attributeValue
//@ts-ignore
PublicApi
.
postProductPlatformSaveOrUpdateAttributeValue
(
pararms
)
PublicApi
.
postProductPlatformSaveOrUpdateAttributeValue
(
pararms
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
history
.
goBack
()
})
}).
catch
(
error
=>
{
console
.
error
(
error
)
...
...
src/pages/commodity/products/checkProducts.tsx
View file @
7763f254
...
...
@@ -388,7 +388,7 @@ const viewProducts: React.FC<{}> = () => {
</
Row
>
<
Row
>
<
Col
span=
{
4
}
>
<
p
>
运
费
方式:
</
p
>
<
p
>
运
送
方式:
</
p
>
</
Col
>
<
Col
span=
{
20
}
>
<
p
>
买家承担运费
</
p
>
...
...
src/pages/commodity/products/viewProducts.tsx
View file @
7763f254
...
...
@@ -358,7 +358,7 @@ const viewProducts: React.FC<{}> = () => {
</
Row
>
<
Row
>
<
Col
span=
{
4
}
>
<
p
>
运
费
方式:
</
p
>
<
p
>
运
送
方式:
</
p
>
</
Col
>
<
Col
span=
{
20
}
>
<
p
>
买家承担运费
</
p
>
...
...
src/pages/trademark/trademarkSearch/checkBrand.tsx
View file @
7763f254
import
React
,
{
useState
,
useRef
,
ReactNode
,
useEffect
}
from
'react'
import
{
history
}
from
'umi'
import
{
Button
,
Steps
,
Card
,
Space
,
Tooltip
,
Row
,
Col
,
Descriptions
,
Table
}
from
'antd'
import
{
Button
,
Steps
,
Card
,
Space
,
Tooltip
,
Row
,
Col
,
Descriptions
,
Table
,
Form
,
Modal
,
Radio
,
Input
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
QuestionCircleOutlined
,
...
...
@@ -13,14 +13,18 @@ import moment from 'moment'
import
styles
from
'./index.less'
import
{
PublicApi
}
from
'@/services/api'
const
{
Step
}
=
Steps
;
const
{
Step
}
=
Steps
const
{
TextArea
}
=
Input
const
CheckBrand
:
React
.
FC
<
{}
>
=
()
=>
{
const
[
visibleModal
,
setVisibleModal
]
=
useState
<
boolean
>
(
false
)
const
[
queryId
,
setQueryId
]
=
useState
<
number
>
()
const
[
brandInfo
,
setBrandInfo
]
=
useState
<
any
>
({})
const
[
fixStep
,
setFixStep
]
=
useState
(
0
)
const
[
recordData
,
setRecordData
]
=
useState
<
any
[]
>
([])
const
[
checkForm
]
=
Form
.
useForm
();
const
[
disableCheck
,
setDisableCheck
]
=
useState
<
boolean
>
(
false
)
const
[
checkStatus
,
setCheckStatus
]
=
useState
<
number
>
(
4
)
useEffect
(()
=>
{
const
{
id
}
=
history
.
location
.
query
...
...
@@ -142,7 +146,28 @@ const CheckBrand: React.FC<{}> = () => {
</>
const
handleApplyCheck
=
(
status
:
number
)
=>
{
PublicApi
.
postProductBrandCheckBrand
({
id
:
brandInfo
.
id
,
status
:
status
})
// post问题
setVisibleModal
(
true
)
}
const
handleOK
=
()
=>
{
checkForm
.
validateFields
().
then
(
values
=>
{
console
.
log
(
values
,
'value'
)
PublicApi
.
postProductBrandCheckBrand
({
id
:
brandInfo
?.
id
,
...
values
}).
then
(
res
=>
{
if
(
res
.
code
=
1000
){
handleCancel
()
setDisableCheck
(
true
)
}
})
})
}
const
handleCancel
=
()
=>
{
checkForm
.
resetFields
()
setVisibleModal
(
false
)
}
const
handleStatusChange
=
(
value
:
any
)
=>
{
setCheckStatus
(
value
.
target
.
value
)
}
return
(
...
...
@@ -153,18 +178,13 @@ const CheckBrand: React.FC<{}> = () => {
content=
{
content
}
extra=
{
[
<
Button
key=
"0"
onClick=
{
()
=>
handleApplyCheck
(
3
)
}
>
审核不通过
</
Button
>,
<
Button
icon=
{
<
CheckSquareOutlined
/>
}
key=
"1"
type=
"primary"
onClick=
{
()
=>
handleApplyCheck
(
4
)
}
onClick=
{
handleApplyCheck
}
disabled=
{
disableCheck
}
>
审核通过
提交审核
</
Button
>
]
}
>
...
...
@@ -191,6 +211,46 @@ const CheckBrand: React.FC<{}> = () => {
<
Table
dataSource=
{
recordData
}
columns=
{
columns
}
pagination=
{
false
}
/>
</
Card
>
</
Space
>
<
Modal
title=
"提交审核"
visible=
{
visibleModal
}
onOk=
{
handleOK
}
onCancel=
{
handleCancel
}
>
<
Form
layout=
"vertical"
form=
{
checkForm
}
>
<
Form
.
Item
name=
"status"
label=
""
rules=
{
[
{
required
:
true
,
message
:
'请选择审核状态'
}
]
}
initialValue=
{
4
}
>
<
Radio
.
Group
onChange=
{
handleStatusChange
}
>
<
Radio
value=
{
4
}
>
审核通过
</
Radio
>
<
Radio
value=
{
3
}
>
审核不通过
</
Radio
>
</
Radio
.
Group
>
</
Form
.
Item
>
<
Form
.
Item
name=
"checkRemark"
label=
{
checkStatus
===
4
?
'审核通过原因'
:
'审核不通过原因'
}
rules=
{
[
{
required
:
checkStatus
===
4
?
false
:
true
,
message
:
'请填写原因'
}
]
}
>
<
TextArea
rows=
{
3
}
placeholder=
"请填写原因"
/>
</
Form
.
Item
>
</
Form
>
</
Modal
>
</
PageHeaderWrapper
>
)
}
...
...
src/pages/trademark/trademarkSearch/index.less
View file @
7763f254
...
...
@@ -3,6 +3,7 @@
height:120px;
border:1px solid rgba(235,236,240,1);
img {
width: 100%;
height: 100%;
padding: 18px;
}
...
...
src/pages/trademark/trademarkWillCheck/index.less
View file @
7763f254
...
...
@@ -4,6 +4,7 @@
border:1px solid rgba(235,236,240,1);
img {
height: 100%;
width: 100%;
padding: 18px;
}
}
\ No newline at end of file
src/utils/request.ts
View file @
7763f254
...
...
@@ -47,7 +47,7 @@ const errorHandler = (error: ResponseError):IRequestError => {
const
defaultHeaders
=
{
'Content-Type'
:
'Application/json'
,
'token'
:
'
e1404c3d593ad198e88187553bc40b2c
'
'token'
:
'
cb952df8768ae996a0db5b21b7cb5334
'
}
/**
...
...
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