Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
52fbbe9b
Commit
52fbbe9b
authored
Jun 09, 2022
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修复已知问题
parent
c8e37188
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
9 deletions
+21
-9
index.jsx
src/pages/GoodsManage/TempleatModal/index.jsx
+15
-4
index.jsx
src/pages/GoodsManage/createModal/index.jsx
+5
-3
index.jsx
src/pages/GoodsManage/index.jsx
+1
-1
index.jsx
src/pages/components/sortablUpload/index.jsx
+0
-1
No files found.
src/pages/GoodsManage/TempleatModal/index.jsx
View file @
52fbbe9b
...
@@ -15,10 +15,11 @@ const TempleatModal = props => {
...
@@ -15,10 +15,11 @@ const TempleatModal = props => {
templateList
,
templateList
,
isALL
,
isALL
,
isType
,
isType
,
total
,
}
=
props
;
}
=
props
;
const
formItemLayout
=
{
const
formItemLayout
=
{
labelCol
:
{
labelCol
:
{
span
:
5
,
span
:
6
,
},
},
wrapperCol
:
{
wrapperCol
:
{
span
:
16
,
span
:
16
,
...
@@ -85,12 +86,22 @@ const TempleatModal = props => {
...
@@ -85,12 +86,22 @@ const TempleatModal = props => {
onOk=
{
()
=>
handleOk
()
}
onOk=
{
()
=>
handleOk
()
}
>
>
{
!
isALL
&&
<
p
>
已选择
{
selectedRowKeys
.
length
}
个商品
</
p
>
}
{
!
isALL
&&
<
p
>
已选择
{
selectedRowKeys
.
length
}
个商品
</
p
>
}
{
isALL
>
0
&&
isType
===
'
after
'
&&
<
p
>
已选择
{
total
}
个商品
</
p
>
}
<
Form
{
...
formItemLayout
}
>
<
Form
{
...
formItemLayout
}
>
<
Form
.
Item
label=
"选择模板"
>
<
Form
.
Item
label=
{
isType
===
'
after
'
?
'
选择售后地址
'
:
'
选择模板
'
}
>
{
getFieldDecorator
(
'
templateId
'
,
{
{
getFieldDecorator
(
'
templateId
'
,
{
rules
:
[{
required
:
true
,
message
:
'
请选择模板!
'
}],
rules
:
[
{
required
:
true
,
message
:
`${isType === 'after' ? '请选择售后地址' : '请选择模板'}`
,
},
],
})(
})(
<
Select
placeholder=
"请选择模板"
labelInValue
allowClear
>
<
Select
placeholder=
{
isType
===
'
after
'
?
'
选择售后地址
'
:
'
选择模板
'
}
labelInValue
allowClear
>
{
isType
===
'
distribution
'
&&
{
isType
===
'
distribution
'
&&
templateList
.
map
(
item
=>
(
templateList
.
map
(
item
=>
(
<
Option
label=
{
item
.
templateName
}
value=
{
item
.
id
}
key=
{
item
.
id
}
>
<
Option
label=
{
item
.
templateName
}
value=
{
item
.
id
}
key=
{
item
.
id
}
>
...
...
src/pages/GoodsManage/createModal/index.jsx
View file @
52fbbe9b
...
@@ -83,7 +83,6 @@ class goodsManage extends Component {
...
@@ -83,7 +83,6 @@ class goodsManage extends Component {
// 获取售后地址
// 获取售后地址
getAfterAddressData
=
async
()
=>
{
getAfterAddressData
=
async
()
=>
{
const
data
=
await
queryAllAfterAddress
();
const
data
=
await
queryAllAfterAddress
();
console
.
log
(
data
);
if
(
data
)
{
if
(
data
)
{
this
.
setState
({
afterAddressList
:
data
.
data
.
records
});
this
.
setState
({
afterAddressList
:
data
.
data
.
records
});
}
}
...
@@ -137,7 +136,6 @@ class goodsManage extends Component {
...
@@ -137,7 +136,6 @@ class goodsManage extends Component {
i
.
imageList
=
colorImg
[
i
.
firstSpecValue
];
i
.
imageList
=
colorImg
[
i
.
firstSpecValue
];
return
i
;
return
i
;
});
});
console
.
log
(
editData
);
this
.
setState
(
this
.
setState
(
()
=>
({
colorImg
,
editData
}),
()
=>
({
colorImg
,
editData
}),
()
=>
{
()
=>
{
...
@@ -360,8 +358,12 @@ class goodsManage extends Component {
...
@@ -360,8 +358,12 @@ class goodsManage extends Component {
specListData
,
specListData
,
}
=
this
.
props
;
}
=
this
.
props
;
const
{
editData
,
productType
}
=
this
.
state
;
const
{
editData
,
productType
}
=
this
.
state
;
validateFields
(
async
(
errors
,
values
)
=>
{
validateFields
(
async
(
errors
,
values
)
=>
{
if
(
!
values
.
afterAddressId
)
{
notification
.
error
({
message
:
'
请选择售后地址
'
,
});
}
let
imgErr
=
false
;
let
imgErr
=
false
;
if
(
!
errors
)
{
if
(
!
errors
)
{
if
(
validateSpuInfo
(
values
,
initData
,
editData
,
productType
))
return
;
if
(
validateSpuInfo
(
values
,
initData
,
editData
,
productType
))
return
;
...
...
src/pages/GoodsManage/index.jsx
View file @
52fbbe9b
...
@@ -294,7 +294,6 @@ class goodsManage extends Component {
...
@@ -294,7 +294,6 @@ class goodsManage extends Component {
const
{
const
{
goodsManage
:
{
tableData
=
{}
},
goodsManage
:
{
tableData
=
{}
},
}
=
this
.
props
;
}
=
this
.
props
;
const
rowSelection
=
{
const
rowSelection
=
{
selectedRowKeys
:
this
.
state
.
selectedRowKeys
,
selectedRowKeys
:
this
.
state
.
selectedRowKeys
,
onChange
:
this
.
onSelectChange
,
onChange
:
this
.
onSelectChange
,
...
@@ -390,6 +389,7 @@ class goodsManage extends Component {
...
@@ -390,6 +389,7 @@ class goodsManage extends Component {
<
TempleatModal
<
TempleatModal
visible=
{
this
.
state
.
templeatModalVisible
}
visible=
{
this
.
state
.
templeatModalVisible
}
selectedRowKeys=
{
this
.
state
.
selectedRowKeys
}
selectedRowKeys=
{
this
.
state
.
selectedRowKeys
}
total=
{
tableData
.
total
||
0
}
onCancel=
{
()
=>
{
onCancel=
{
()
=>
{
this
.
setState
({
templeatModalVisible
:
false
,
selectedRowKeys
:
[]
});
this
.
setState
({
templeatModalVisible
:
false
,
selectedRowKeys
:
[]
});
this
.
handleSearch
();
this
.
handleSearch
();
...
...
src/pages/components/sortablUpload/index.jsx
View file @
52fbbe9b
...
@@ -48,7 +48,6 @@ const ImageInfo = file =>
...
@@ -48,7 +48,6 @@ const ImageInfo = file =>
file
.
width
=
width
;
file
.
width
=
width
;
file
.
height
=
height
;
file
.
height
=
height
;
file
.
LtMB
=
LtMB
;
file
.
LtMB
=
LtMB
;
console
.
log
(
file
);
resolve
(
file
);
resolve
(
file
);
});
});
image
.
addEventListener
(
'
error
'
,
()
=>
{
image
.
addEventListener
(
'
error
'
,
()
=>
{
...
...
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