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
1f504a1e
Commit
1f504a1e
authored
Jun 15, 2023
by
武广
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改获取企业列表接口
parent
27a6d72c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
9 deletions
+21
-9
env.config.js
config/env.config.js
+1
-1
CustomerInfo.jsx
src/pages/businessCustomer/components/CustomerInfo.jsx
+9
-5
bll.js
src/pages/businessGoods/service/bll.js
+2
-1
takeawayGoods.jsx
src/pages/businessGoods/takeawayGoods.jsx
+3
-1
virtualGoods.jsx
src/pages/businessGoods/virtualGoods.jsx
+3
-1
virtualGoodsInfo.jsx
src/pages/businessGoods/virtualGoodsInfo.jsx
+3
-0
No files found.
config/env.config.js
View file @
1f504a1e
import
RoleType
,
{
isPlatForm
}
from
'
./role.config
'
;
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
environment
=
'
sc
'
;
const
environment
=
'
yxm2
'
;
const
envAPi
=
{
api
:
`https://security-
${
environment
}
.liangkebang.net`
,
//'https://security-xyqb.liangkebang.net',
...
...
src/pages/businessCustomer/components/CustomerInfo.jsx
View file @
1f504a1e
...
...
@@ -230,7 +230,7 @@ const CustomerInfo = props => {
obj
.
mealTimePeriod
=
[];
}
obj
.
mealLimit
=
{};
if
(
res
.
data
.
mealLimit
)
{
if
(
res
.
data
.
mealLimit
&&
res
.
data
.
mealLimit
.
length
)
{
res
.
data
.
mealLimit
.
forEach
(
item
=>
{
obj
.
mealLimit
[
`limit
${
item
.
mealPeriodType
}
`
]
=
{};
item
.
limit
.
forEach
(
limit
=>
{
...
...
@@ -245,12 +245,16 @@ const CustomerInfo = props => {
if
(
+
res
.
data
.
hideImage
)
{
obj
.
hideInfo
.
push
(
'
hideImage
'
);
}
obj
.
mealType
=
res
.
data
.
mealType
.
map
(
item
=>
`
${
item
}
`
);
if
(
res
.
data
.
mealType
)
{
obj
.
mealType
=
res
.
data
.
mealType
.
map
(
item
=>
`
${
item
}
`
);
}
setMealTypes
(
obj
.
mealType
);
const
json
=
{};
res
.
data
.
mealTimePeriod
.
forEach
(
item
=>
{
json
[
item
.
mealPeriodType
]
=
mealSections
[
item
.
mealPeriodType
];
});
if
(
res
.
data
.
mealTimePeriod
)
{
res
.
data
.
mealTimePeriod
.
forEach
(
item
=>
{
json
[
item
.
mealPeriodType
]
=
mealSections
[
item
.
mealPeriodType
];
});
}
setMeals
(
json
);
form
.
setFieldsValue
(
obj
);
}
...
...
src/pages/businessGoods/service/bll.js
View file @
1f504a1e
...
...
@@ -2,10 +2,11 @@ import debounce from 'lodash/debounce';
import
{
apiEnterpriseList
,
apiShopList
,
apiShopListByPickSelfID
}
from
'
./index
'
;
// 获取企业列表
export
const
getEnterpriseList
=
async
()
=>
{
export
const
getEnterpriseList
=
async
(
param
=
{}
)
=>
{
const
res
=
await
apiEnterpriseList
({
page
:
1
,
size
:
10000
,
data
:
param
,
});
if
(
res
&&
res
.
data
&&
res
.
data
.
records
)
{
const
data
=
res
.
data
.
records
;
...
...
src/pages/businessGoods/takeawayGoods.jsx
View file @
1f504a1e
...
...
@@ -136,7 +136,9 @@ const TakeawayGoods = () => {
// 获取企业列表
const
getList
=
async
()
=>
{
const
obj
=
await
getEnterpriseList
();
const
obj
=
await
getEnterpriseList
({
type
:
1
,
});
if
(
obj
.
list
&&
Object
.
keys
(
obj
.
list
).
length
)
{
setEnterprises
(
obj
.
list
);
setEnterpriseId
(
`
${
obj
.
id
}
`
);
...
...
src/pages/businessGoods/virtualGoods.jsx
View file @
1f504a1e
...
...
@@ -84,7 +84,9 @@ const VirtualGoods = () => {
// 获取企业列表
const
getList
=
async
()
=>
{
const
obj
=
await
getEnterpriseList
();
const
obj
=
await
getEnterpriseList
({
type
:
2
,
});
if
(
obj
.
list
&&
Object
.
keys
(
obj
.
list
).
length
)
{
setEnterprises
(
obj
.
list
);
setEnterpriseId
(
`
${
obj
.
id
}
`
);
...
...
src/pages/businessGoods/virtualGoodsInfo.jsx
View file @
1f504a1e
...
...
@@ -90,8 +90,11 @@ const VirtualGoodsInfo = props => {
// 删除
const
onDel
=
i
=>
{
const
arr
=
[...
dataSource
];
const
keys
=
[...
selectedRowKeys
];
arr
.
splice
(
i
,
1
);
keys
.
splice
(
i
,
1
);
setDataSource
(
arr
);
setSelectedRowKeys
(
keys
);
};
// 根据企业ID获取店铺列表
...
...
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