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
35cd1181
Commit
35cd1181
authored
Sep 08, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:品类修改异常
parent
e310c429
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
10 deletions
+15
-10
index.tsx
src/pages/classAndProperty/class/index.tsx
+1
-1
checkProducts.tsx
src/pages/commodity/products/checkProducts.tsx
+12
-7
checkBrand.tsx
src/pages/trademark/trademarkSearch/checkBrand.tsx
+1
-1
viewBrand.tsx
src/pages/trademark/trademarkSearch/viewBrand.tsx
+1
-1
No files found.
src/pages/classAndProperty/class/index.tsx
View file @
35cd1181
...
...
@@ -63,7 +63,7 @@ const ClassProperty: React.FC<{}> = () => {
const
onFinish
=
(
values
)
=>
{
const
editOrAdd
=
nodeRecord
&&
treeStatus
===
FormState
.
EDIT
const
params
=
editOrAdd
?
{
...
values
,
parentId
:
nodeRecord
.
i
d
}
:
{
const
params
=
editOrAdd
?
{
...
values
,
parentId
:
nodeRecord
.
parentI
d
}
:
{
...
values
,
parentId
:
nodeRecord
?
nodeRecord
.
parentId
:
0
,
id
:
null
,
...
...
src/pages/commodity/products/checkProducts.tsx
View file @
35cd1181
...
...
@@ -6,6 +6,7 @@ import {
CheckSquareOutlined
}
from
'@ant-design/icons'
import
{
ColumnType
}
from
'antd/lib/table/interface'
import
cx
from
'classnames'
import
ReutrnEle
from
'@/components/ReturnEle'
import
styles
from
"./index.less"
import
{
PublicApi
}
from
'@/services/api'
...
...
@@ -625,10 +626,14 @@ const viewProducts: React.FC<{}> = () => {
</
Space
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
"商品描述"
>
{
/* 预留 文字区块 */
}
{
/* <div className={styles.descriptionBox}>
<p>商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述商品描述</p>
</div> */
}
{
/* 文字区块 */
}
<
div
className=
{
cx
(
styles
.
descriptionBox
,
styles
.
descriptionWordBox
)
}
>
{
productDetail
?.
commodityRemark
?.
word
?.
length
>
0
?
productDetail
?.
commodityRemark
?.
word
.
map
((
_item
,
_index
)
=>
_item
&&
<
p
>
{
_item
}
</
p
>
)
:
<
p
className=
{
styles
.
descriptNull
}
>
暂无文字数据
</
p
>
}
</
div
>
{
/* 视频区块 */
}
<
div
className=
{
styles
.
descriptionBox
}
>
{
...
...
@@ -636,15 +641,15 @@ const viewProducts: React.FC<{}> = () => {
<
video
src=
{
_item
}
controls=
{
true
}
>
您的浏览器不支持视频标签,请及时升级。
</
video
>
</
div
>)
:
<
p
>
暂无
数据
</
p
>
</
div
>)
:
<
p
className=
{
styles
.
descriptNull
}
>
暂无视频
数据
</
p
>
}
</
div
>
{
/* 图片区块 */
}
<
div
className=
{
styles
.
descriptionBox
}
>
{
productDetail
?.
commodityRemark
?.
image
?.
length
>
0
?
productDetail
?.
commodityRemark
?.
image
.
map
((
_item
,
_index
)
=>
<
div
key=
{
_index
}
className=
{
styles
.
imgItem
}
>
productDetail
?.
commodityRemark
?.
image
?.
length
>
0
?
productDetail
?.
commodityRemark
?.
image
.
map
((
_item
,
_index
)
=>
_item
&&
<
div
key=
{
_index
}
className=
{
styles
.
imgItem
}
>
<
img
src=
{
_item
}
/>
</
div
>)
:
<
p
>
暂无
数据
</
p
>
</
div
>)
:
<
p
className=
{
styles
.
descriptNull
}
>
暂无图片
数据
</
p
>
}
</
div
>
</
Card
>
...
...
src/pages/trademark/trademarkSearch/checkBrand.tsx
View file @
35cd1181
...
...
@@ -127,7 +127,7 @@ const CheckBrand: React.FC<{}> = () => {
const
fixProveUrl
=
(
proveInfo
:
any
)
=>
{
if
(
proveInfo
){
let
imgArray
=
Object
.
values
(
proveInfo
)
return
imgArray
.
map
((
item
:
any
,
index
:
number
)
=>
<
Col
key=
{
index
}
span=
{
3
}
>
return
imgArray
.
map
((
item
:
any
,
index
:
number
)
=>
<
Col
key=
{
index
}
span=
{
3
}
xxl=
{
3
}
xl=
{
4
}
lg=
{
4
}
>
<
div
className=
{
styles
.
proveBox
}
>
<
img
src=
{
item
}
alt=
""
/>
</
div
>
...
...
src/pages/trademark/trademarkSearch/viewBrand.tsx
View file @
35cd1181
...
...
@@ -117,7 +117,7 @@ const viewBrand: React.FC<{}> = () => {
const
fixProveUrl
=
(
proveInfo
:
any
)
=>
{
if
(
proveInfo
){
let
imgArray
=
Object
.
values
(
proveInfo
)
return
imgArray
.
map
((
item
:
any
,
index
:
number
)
=>
<
Col
key=
{
index
}
span=
{
3
}
>
return
imgArray
.
map
((
item
:
any
,
index
:
number
)
=>
<
Col
key=
{
index
}
span=
{
3
}
xxl=
{
3
}
xl=
{
4
}
lg=
{
4
}
>
<
div
className=
{
styles
.
proveBox
}
>
<
img
src=
{
item
}
alt=
""
/>
</
div
>
...
...
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