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
5f33098b
Commit
5f33098b
authored
Mar 01, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 更改新增交易规则查询商城接口
parent
33e4d2ce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
ruleSetting.tsx
...s/transaction/transactionRules/components/ruleSetting.tsx
+2
-2
type.ts
src/utils/type.ts
+13
-1
No files found.
src/pages/transaction/transactionRules/components/ruleSetting.tsx
View file @
5f33098b
...
...
@@ -18,7 +18,7 @@ import Submit from '@/components/NiceForm/components/Submit'
import
SelectProcesss
from
'./selectProcesss'
import
{
usePaymentTable
}
from
'../model/usePaymentTable'
import
{
help
}
from
'../../common'
import
{
fectchShopListsSource
}
from
'@/utils/type'
import
{
fectchShopListsSource
TradeRule
}
from
'@/utils/type'
import
{
getProductCommodityCommonGetCommodityListBySeller
,
getProductSelectGetSelectBrand
,
getProductSelectGetSelectCustomerCategory
}
from
'@/services/ProductV2Api'
import
{
getOrderTradeProcessGet
,
getOrderTradeProcessProductPage
}
from
'@/services/OrderNewV2Api'
import
{
useIntl
}
from
'umi'
...
...
@@ -382,7 +382,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
}
}
effects=
{
(
$
,
{
setFieldState
,
setFieldValue
})
=>
{
$
(
'onFormMount'
).
subscribe
(
async
()
=>
{
const
data
=
await
fectchShopListsSource
()
const
data
=
await
fectchShopListsSource
TradeRule
()
if
(
data
&&
data
.
length
)
{
setFieldState
(
'shopIds'
,
state
=>
{
state
.
props
[
"x-component-props"
].
dataSource
=
data
.
sort
((
a
,
b
)
=>
a
.
type
-
b
.
type
)
...
...
src/utils/type.ts
View file @
5f33098b
import
{
GlobalConfig
}
from
'@/global/config'
;
import
{
postManageWebShopWebAllShop
}
from
'@/services/ManageV2Api'
;
import
{
postManageWebShopWebAll
,
postManageWebShopWebAll
Shop
}
from
'@/services/ManageV2Api'
;
export
function
isString
(
str
:
any
):
str
is
string
{
return
typeof
str
===
'string'
...
...
@@ -43,6 +43,18 @@ interface getShopListsParmasProps {
*/
export
const
fectchShopListsSource
=
async
(
params
?:
getShopListsParmasProps
)
=>
{
if
(
postManageWebShopWebAllShop
)
{
const
{
data
}
=
await
postManageWebShopWebAll
({
...
params
,
siteId
:
GlobalConfig
.
global
.
siteInfo
.
id
},
{
ctlType
:
'none'
})
return
data
}
}
/**
* 同上 仅限交规规则模块适用
* @param params 接口参数
*/
export
const
fectchShopListsSourceTradeRule
=
async
(
params
?:
getShopListsParmasProps
)
=>
{
if
(
postManageWebShopWebAllShop
)
{
const
{
data
}
=
await
postManageWebShopWebAllShop
({
...
params
,
siteId
:
GlobalConfig
.
global
.
siteInfo
.
id
},
{
ctlType
:
'none'
})
return
data
}
...
...
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