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
4b0c6ce6
Commit
4b0c6ce6
authored
Jan 19, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
7eb93650
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
13 deletions
+3
-13
index.tsx
...ages/commodity/products/components/putawayGuide/index.tsx
+2
-11
index.tsx
...dity/products/components/upperProductModalTable/index.tsx
+1
-1
index.tsx
src/pages/commodity/products/index.tsx
+0
-1
No files found.
src/pages/commodity/products/components/putawayGuide/index.tsx
View file @
4b0c6ce6
...
@@ -26,7 +26,7 @@ export enum GuideMenu {
...
@@ -26,7 +26,7 @@ export enum GuideMenu {
/**
/**
* 商品 上架引导
* 商品 上架引导
* @param props
* @param props
* @returns
* @returns
ReactDOM
*/
*/
const
PutawayGuide
:
React
.
FC
<
PutawayGuideProps
>
=
(
props
)
=>
{
const
PutawayGuide
:
React
.
FC
<
PutawayGuideProps
>
=
(
props
)
=>
{
const
intl
=
useIntl
();
const
intl
=
useIntl
();
...
@@ -37,8 +37,6 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
...
@@ -37,8 +37,6 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
...
restProps
...
restProps
}
=
props
}
=
props
console
.
log
(
props
)
return
(
return
(
<
Modal
<
Modal
title=
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.title'
,
defaultMessage
:
"商品上架引导"
})
}
title=
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.title'
,
defaultMessage
:
"商品上架引导"
})
}
...
@@ -55,7 +53,7 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
...
@@ -55,7 +53,7 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
?
?
<>
<>
<
p
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.p.1'
,
defaultMessage
:
'您还没有创建店铺。'
})
}
</
p
>
<
p
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.p.1'
,
defaultMessage
:
'您还没有创建店铺。'
})
}
</
p
>
<
Button
type=
"link"
onClick=
{
()
=>
history
.
push
(
'/memberCenter/shopAbility/infoManage'
)
}
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.button.1'
,
defaultMessage
:
'创建店铺'
})
}
</
Button
>
<
Button
onClick=
{
()
=>
history
.
push
(
'/memberCenter/shopAbility/infoManage'
)
}
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.button.1'
,
defaultMessage
:
'创建店铺'
})
}
</
Button
>
</>
</>
:
:
(
currentStep
>
GuideMenu
.
CreateShop
?
<
Button
disabled=
{
true
}
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.finsih'
,
defaultMessage
:
'已完成'
})
}
</
Button
>
:
null
)
(
currentStep
>
GuideMenu
.
CreateShop
?
<
Button
disabled=
{
true
}
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.finsih'
,
defaultMessage
:
'已完成'
})
}
</
Button
>
:
null
)
...
@@ -92,13 +90,6 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
...
@@ -92,13 +90,6 @@ const PutawayGuide: React.FC<PutawayGuideProps> = (props) => {
</
div
>
</
div
>
<
div
className=
{
styles
.
guideItem
}
>
<
div
className=
{
styles
.
guideItem
}
>
<
h3
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.h3.4'
,
defaultMessage
:
'上架商品'
})
}
</
h3
>
<
h3
>
{
intl
.
formatMessage
({
id
:
'commodity.putawayGuide.modal.h3.4'
,
defaultMessage
:
'上架商品'
})
}
</
h3
>
{
/* {
currentStep === GuideMenu.Putaway
?
<Button>{intl.formatMessage({id: 'commodity.putawayGuide.modal.button.4', defaultMessage: '上架商品'})}</Button>
:
null
} */
}
<
span
className=
{
styles
.
stepNumber
}
>
4
</
span
>
<
span
className=
{
styles
.
stepNumber
}
>
4
</
span
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
src/pages/commodity/products/components/upperProductModalTable/index.tsx
View file @
4b0c6ce6
...
@@ -18,7 +18,7 @@ export interface UpperProductModalTableProps extends ModalTableProps {
...
@@ -18,7 +18,7 @@ export interface UpperProductModalTableProps extends ModalTableProps {
tableRef
?:
any
,
tableRef
?:
any
,
}
}
// 选择
采购合同
弹窗
// 选择
上游商品
弹窗
const
UpperProductModalTable
:
React
.
FC
<
UpperProductModalTableProps
>
=
(
props
)
=>
{
const
UpperProductModalTable
:
React
.
FC
<
UpperProductModalTableProps
>
=
(
props
)
=>
{
const
intl
=
useIntl
();
const
intl
=
useIntl
();
const
{
type
=
'radio'
,
currentRef
,
tableRef
,
...
restProps
}
=
props
const
{
type
=
'radio'
,
currentRef
,
tableRef
,
...
restProps
}
=
props
...
...
src/pages/commodity/products/index.tsx
View file @
4b0c6ce6
...
@@ -407,7 +407,6 @@ const Products: React.FC<{}> = () => {
...
@@ -407,7 +407,6 @@ const Products: React.FC<{}> = () => {
// 3. 判断是否配置流程
// 3. 判断是否配置流程
const
hasProcess
=
await
judgeProcess
(
params
,
checkShops
)
const
hasProcess
=
await
judgeProcess
(
params
,
checkShops
)
if
(
hasProcess
)
{
if
(
hasProcess
)
{
// executePutaway()
return
true
return
true
}
else
{
}
else
{
setGiudeStep
(
GuideMenu
.
ConfigProcess
)
setGiudeStep
(
GuideMenu
.
ConfigProcess
)
...
...
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