Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
project
jinfa-admin
Commits
6159e26f
Commit
6159e26f
authored
Oct 27, 2020
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
745f864e
d04b5fba
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
checkProducts.tsx
src/pages/commodity/productWillCheck/checkProducts.tsx
+0
-1
viewProducts.tsx
src/pages/commodity/products/viewProducts.tsx
+0
-1
RuleSetting.tsx
...SettingManage/transactionRules/components/RuleSetting.tsx
+1
-1
No files found.
src/pages/commodity/productWillCheck/checkProducts.tsx
View file @
6159e26f
...
...
@@ -209,7 +209,6 @@ const viewProducts: React.FC<{}> = () => {
}
/* 品类类型&商品类型 */
//1-实物商品、2-虚拟商品、3-服务商品
const
renderCustomerCategoryType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'实物商品'
if
(
type
===
2
)
return
'虚拟商品'
...
...
src/pages/commodity/products/viewProducts.tsx
View file @
6159e26f
...
...
@@ -199,7 +199,6 @@ const viewProducts: React.FC<{}> = () => {
}
/* 品类类型&商品类型 */
//1-实物商品、2-虚拟商品、3-服务商品
const
renderCustomerCategoryType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'实物商品'
if
(
type
===
2
)
return
'虚拟商品'
...
...
src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx
View file @
6159e26f
...
...
@@ -217,7 +217,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
// 会员弹框筛选select值
const
fetchSelectOptions
=
async
()
=>
{
const
res
=
await
PublicApi
.
getMemberManagePageitems
()
const
res
=
await
PublicApi
.
getMemberManagePageitems
(
{
roleTypeEnum
:
'1'
}
)
if
(
res
.
code
===
1000
)
{
const
{
data
=
{}
}:
any
=
res
const
{
...
...
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