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
0d021097
Commit
0d021097
authored
Jun 27, 2023
by
武广
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改虚拟商品修改餐段校验问题
parent
fb03e418
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
3 deletions
+48
-3
SaleDateModal.jsx
src/pages/businessGoods/components/SaleDateModal.jsx
+17
-1
SaleSectionModal.jsx
src/pages/businessGoods/components/SaleSectionModal.jsx
+17
-1
index.js
src/pages/businessGoods/service/index.js
+10
-0
virtualGoodsInfo.jsx
src/pages/businessGoods/virtualGoodsInfo.jsx
+4
-0
request.js
src/utils/request.js
+0
-1
No files found.
src/pages/businessGoods/components/SaleDateModal.jsx
View file @
0d021097
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
{
Checkbox
,
Space
,
message
,
Modal
,
notification
}
from
'
antd
'
;
import
{
Checkbox
,
Space
,
message
,
Modal
,
notification
}
from
'
antd
'
;
import
{
weekOptions
}
from
'
../staticData/goods
'
;
import
{
weekOptions
}
from
'
../staticData/goods
'
;
import
{
apiMealInfoUpdate
}
from
'
../service
'
;
import
{
apiMealInfoUpdate
,
apiCheckInfo
}
from
'
../service
'
;
const
SaleDateModal
=
props
=>
{
const
SaleDateModal
=
props
=>
{
const
[
value
,
setValue
]
=
useState
([]);
const
[
value
,
setValue
]
=
useState
([]);
...
@@ -21,6 +21,22 @@ const SaleDateModal = props => {
...
@@ -21,6 +21,22 @@ const SaleDateModal = props => {
message
.
error
(
'
请选择可售日期
'
);
message
.
error
(
'
请选择可售日期
'
);
return
;
return
;
}
}
if
(
props
.
productType
===
4
)
{
const
data
=
props
.
dataSource
.
map
(
item
=>
{
const
obj
=
{
saleDateList
:
item
.
saleDate
,
tabCateList
:
item
.
tabCateList
,
};
if
(
props
.
item
.
skuId
===
item
.
skuId
)
{
obj
.
saleDateList
=
value
;
}
return
obj
;
});
const
res
=
await
apiCheckInfo
(
data
);
if
(
!
res
||
!
res
.
success
)
{
return
;
}
}
if
(
props
.
id
)
{
if
(
props
.
id
)
{
const
params
=
{
const
params
=
{
id
:
props
.
id
,
id
:
props
.
id
,
...
...
src/pages/businessGoods/components/SaleSectionModal.jsx
View file @
0d021097
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
{
Checkbox
,
Space
,
Modal
,
notification
,
message
}
from
'
antd
'
;
import
{
Checkbox
,
Space
,
Modal
,
notification
,
message
}
from
'
antd
'
;
import
{
mealColumn
}
from
'
../staticData/goods
'
;
import
{
mealColumn
}
from
'
../staticData/goods
'
;
import
{
apiMealInfoUpdate
,
apiEnterpriseInfo
}
from
'
../service
'
;
import
{
apiMealInfoUpdate
,
apiEnterpriseInfo
,
apiCheckInfo
}
from
'
../service
'
;
const
SaleDateModal
=
props
=>
{
const
SaleDateModal
=
props
=>
{
const
[
value
,
setValue
]
=
useState
([]);
const
[
value
,
setValue
]
=
useState
([]);
...
@@ -23,6 +23,22 @@ const SaleDateModal = props => {
...
@@ -23,6 +23,22 @@ const SaleDateModal = props => {
message
.
error
(
'
请选择餐段
'
);
message
.
error
(
'
请选择餐段
'
);
return
;
return
;
}
}
if
(
props
.
productType
===
4
)
{
const
data
=
props
.
dataSource
.
map
(
item
=>
{
const
obj
=
{
saleDateList
:
item
.
saleDate
,
tabCateList
:
item
.
tabCateList
,
};
if
(
props
.
item
.
skuId
===
item
.
skuId
)
{
obj
.
tabCateList
=
value
.
map
(
v
=>
({
tabId
:
v
}));
}
return
obj
;
});
const
res
=
await
apiCheckInfo
(
data
);
if
(
!
res
||
!
res
.
success
)
{
return
;
}
}
if
(
props
.
id
)
{
if
(
props
.
id
)
{
const
params
=
{
const
params
=
{
id
:
props
.
id
,
id
:
props
.
id
,
...
...
src/pages/businessGoods/service/index.js
View file @
0d021097
...
@@ -171,3 +171,13 @@ export async function apiEnterpriseInfo(id) {
...
@@ -171,3 +171,13 @@ export async function apiEnterpriseInfo(id) {
prefix
:
roleApi
,
prefix
:
roleApi
,
});
});
}
}
/**
* 企业团餐->虚拟商品 校验是否可修改餐段和可售日期
* http://yapi.quantgroups.com/project/389/interface/api/65674
*/
export
async
function
apiCheckInfo
(
data
)
{
return
request
.
post
(
`
${
apiPrefix
}
/product/enterprise/virtual/addParamCheck`
,
{
data
,
prefix
:
roleApi
,
});
}
src/pages/businessGoods/virtualGoodsInfo.jsx
View file @
0d021097
...
@@ -237,6 +237,8 @@ const VirtualGoodsInfo = props => {
...
@@ -237,6 +237,8 @@ const VirtualGoodsInfo = props => {
visible=
{
visibleSaleDate
}
visible=
{
visibleSaleDate
}
item=
{
editItem
}
item=
{
editItem
}
type=
"saleDate"
type=
"saleDate"
productType=
{
4
}
dataSource=
{
dataSource
}
handleRefresh=
{
v
=>
refreshList
(
'
saleDate
'
,
v
)
}
handleRefresh=
{
v
=>
refreshList
(
'
saleDate
'
,
v
)
}
handleClose=
{
()
=>
setVisibleSaleDate
(
false
)
}
handleClose=
{
()
=>
setVisibleSaleDate
(
false
)
}
/>
/>
...
@@ -248,6 +250,8 @@ const VirtualGoodsInfo = props => {
...
@@ -248,6 +250,8 @@ const VirtualGoodsInfo = props => {
item=
{
editItem
}
item=
{
editItem
}
type=
"tabCate"
type=
"tabCate"
enterpriseID=
{
id
}
enterpriseID=
{
id
}
productType=
{
4
}
dataSource=
{
dataSource
}
handleRefresh=
{
v
=>
refreshList
(
'
tabCate
'
,
v
)
}
handleRefresh=
{
v
=>
refreshList
(
'
tabCate
'
,
v
)
}
handleClose=
{
()
=>
setVisibleSaleSection
(
false
)
}
handleClose=
{
()
=>
setVisibleSaleSection
(
false
)
}
/>
/>
...
...
src/utils/request.js
View file @
0d021097
...
@@ -108,7 +108,6 @@ request.interceptors.response.use(async (response, options) => {
...
@@ -108,7 +108,6 @@ request.interceptors.response.use(async (response, options) => {
return
response
;
return
response
;
}
}
const
data
=
await
response
.
clone
().
json
();
const
data
=
await
response
.
clone
().
json
();
console
.
log
(
'
response data :>>
'
,
data
);
if
(
data
.
code
===
4033
)
{
if
(
data
.
code
===
4033
)
{
// TODO 该接口是否需要提示权限信息
// TODO 该接口是否需要提示权限信息
if
(
options
.
role
)
{
if
(
options
.
role
)
{
...
...
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