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
a3f611a8
Commit
a3f611a8
authored
Jun 27, 2023
by
武广
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改餐段可售日期问题
parent
2ac60452
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
10 deletions
+15
-10
SaleDateModal.jsx
src/pages/businessGoods/components/SaleDateModal.jsx
+7
-4
SaleSectionModal.jsx
src/pages/businessGoods/components/SaleSectionModal.jsx
+7
-4
virtualGoodsInfo.jsx
src/pages/businessGoods/virtualGoodsInfo.jsx
+1
-1
request.js
src/utils/request.js
+0
-1
No files found.
src/pages/businessGoods/components/SaleDateModal.jsx
View file @
a3f611a8
...
@@ -22,15 +22,18 @@ const SaleDateModal = props => {
...
@@ -22,15 +22,18 @@ const SaleDateModal = props => {
return
;
return
;
}
}
if
(
props
.
productType
===
4
)
{
if
(
props
.
productType
===
4
)
{
const
data
=
props
.
dataSource
.
map
(
item
=>
{
const
data
=
[];
props
.
dataSource
.
forEach
(
item
=>
{
const
obj
=
{
const
obj
=
{
saleDateList
:
item
.
saleDate
,
saleDateList
:
item
.
saleDate
,
tabCateList
:
item
.
tabCate
List
,
tabCateList
:
item
.
tabCate
?.
map
(
v
=>
({
tabId
:
v
}))
,
};
};
if
(
props
.
item
.
skuId
===
item
.
skuId
)
{
if
(
props
.
item
.
skuId
===
item
.
skuId
&&
item
.
tabCate
)
{
obj
.
saleDateList
=
value
;
obj
.
saleDateList
=
value
;
data
.
push
(
obj
);
}
else
if
(
item
.
saleDate
?.
length
&&
item
.
tabCate
?.
length
)
{
data
.
push
(
obj
);
}
}
return
obj
;
});
});
const
res
=
await
apiCheckInfo
(
data
);
const
res
=
await
apiCheckInfo
(
data
);
if
(
!
res
||
!
res
.
success
)
{
if
(
!
res
||
!
res
.
success
)
{
...
...
src/pages/businessGoods/components/SaleSectionModal.jsx
View file @
a3f611a8
...
@@ -24,15 +24,18 @@ const SaleDateModal = props => {
...
@@ -24,15 +24,18 @@ const SaleDateModal = props => {
return
;
return
;
}
}
if
(
props
.
productType
===
4
)
{
if
(
props
.
productType
===
4
)
{
const
data
=
props
.
dataSource
.
map
(
item
=>
{
const
data
=
[];
props
.
dataSource
.
forEach
(
item
=>
{
const
obj
=
{
const
obj
=
{
saleDateList
:
item
.
saleDate
,
saleDateList
:
item
.
saleDate
,
tabCateList
:
item
.
tabCate
List
,
tabCateList
:
item
.
tabCate
?.
map
(
v
=>
({
tabId
:
v
}))
,
};
};
if
(
props
.
item
.
skuId
===
item
.
skuId
)
{
if
(
props
.
item
.
skuId
===
item
.
skuId
&&
item
.
saleDate
)
{
obj
.
tabCateList
=
value
.
map
(
v
=>
({
tabId
:
v
}));
obj
.
tabCateList
=
value
.
map
(
v
=>
({
tabId
:
v
}));
data
.
push
(
obj
);
}
else
if
(
item
.
saleDate
?.
length
&&
item
.
tabCate
?.
length
)
{
data
.
push
(
obj
);
}
}
return
obj
;
});
});
const
res
=
await
apiCheckInfo
(
data
);
const
res
=
await
apiCheckInfo
(
data
);
if
(
!
res
||
!
res
.
success
)
{
if
(
!
res
||
!
res
.
success
)
{
...
...
src/pages/businessGoods/virtualGoodsInfo.jsx
View file @
a3f611a8
...
@@ -22,7 +22,7 @@ const VirtualGoodsInfo = props => {
...
@@ -22,7 +22,7 @@ const VirtualGoodsInfo = props => {
const
[
visiblePrice
,
setVisiblePrice
]
=
useState
(
false
);
// 修改企业商品价格弹窗
const
[
visiblePrice
,
setVisiblePrice
]
=
useState
(
false
);
// 修改企业商品价格弹窗
const
[
dataSource
,
setDataSource
]
=
useState
([]);
const
[
dataSource
,
setDataSource
]
=
useState
([]);
const
[
shopList
,
setShopList
]
=
useState
({});
// 店铺列表
const
[
shopList
,
setShopList
]
=
useState
({});
// 店铺列表
const
[
sleShopID
,
setSelShopID
]
=
useState
(
''
);
// 选中的店铺ID
const
[
sleShopID
,
setSelShopID
]
=
useState
(
null
);
// 选中的店铺ID
const
[
sleShopName
,
setSelShopName
]
=
useState
(
''
);
// 选中的店铺名称
const
[
sleShopName
,
setSelShopName
]
=
useState
(
''
);
// 选中的店铺名称
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
([]);
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
([]);
const
[
editItem
,
setEditItem
]
=
useState
({});
// 编辑信息
const
[
editItem
,
setEditItem
]
=
useState
({});
// 编辑信息
...
...
src/utils/request.js
View file @
a3f611a8
...
@@ -129,7 +129,6 @@ request.interceptors.response.use(async (response, options) => {
...
@@ -129,7 +129,6 @@ request.interceptors.response.use(async (response, options) => {
if
(
!
isTob
)
{
if
(
!
isTob
)
{
window
.
location
.
href
=
loginPath
;
window
.
location
.
href
=
loginPath
;
}
else
{
}
else
{
console
.
log
(
'
isTob 4011 :>>
'
,
isTob
,
4011
);
const
iframeBridgeModel
=
new
IframeBridge
();
const
iframeBridgeModel
=
new
IframeBridge
();
iframeBridgeModel
.
run
({
event
:
'
toLogin
'
});
iframeBridgeModel
.
run
({
event
:
'
toLogin
'
});
}
}
...
...
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