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
700ce345
Commit
700ce345
authored
Aug 20, 2020
by
LeeJiancong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理全局布局样式和修改支付策略接口和配置等
parent
07afc5c4
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
9 deletions
+32
-9
ruleSettingRoutes.ts
config/routes/ruleSettingRoutes.ts
+1
-1
index.js
scripts/services/index.js
+2
-2
layout.css
src/global/styles/mixins/layout.css
+7
-0
layout.less
src/global/styles/mixins/layout.less
+5
-1
settingIndex.tsx
src/pages/ruleSettingManage/paySetting/settingIndex.tsx
+2
-2
detail.tsx
src/pages/ruleSettingManage/payStrategy/detail.tsx
+13
-1
index.tsx
src/pages/ruleSettingManage/schema/index.tsx
+2
-2
No files found.
config/routes/ruleSettingRoutes.ts
View file @
700ce345
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Author: LeeJiancong
* @Date: 2020-08-04 16:21:48
* @Date: 2020-08-04 16:21:48
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-
13 09:52:00
* @LastEditTime: 2020-08-
20 19:43:26
*/
*/
const
router
=
{
const
router
=
{
path
:
'/ruleSettingManager'
,
path
:
'/ruleSettingManager'
,
...
...
scripts/services/index.js
View file @
700ce345
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Author: LeeJiancong
* @Date: 2020-08-10 14:41:27
* @Date: 2020-08-10 14:41:27
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-
18 14:55
:46
* @LastEditTime: 2020-08-
20 19:07
:46
*/
*/
/**
/**
* 用于在项目开始前获取所有的配置
* 用于在项目开始前获取所有的配置
...
@@ -57,7 +57,7 @@ async function batchAxiosHttps() {
...
@@ -57,7 +57,7 @@ async function batchAxiosHttps() {
for
(
const
subItem
in
serviceConfig
[
item
])
{
for
(
const
subItem
in
serviceConfig
[
item
])
{
try
{
try
{
const
data
=
await
axios
(
serviceConfig
[
item
][
subItem
])
const
data
=
await
axios
(
serviceConfig
[
item
][
subItem
])
asyncHttpQueue
[
item
][
subItem
]
=
data
.
data
.
data
asyncHttpQueue
[
item
][
subItem
]
=
data
.
data
}
catch
(
err
)
{
}
catch
(
err
)
{
console
.
log
(
serviceConfig
[
item
][
subItem
].
url
)
console
.
log
(
serviceConfig
[
item
][
subItem
].
url
)
console
.
log
(
err
.
response
.
data
)
console
.
log
(
err
.
response
.
data
)
...
...
src/global/styles/mixins/layout.css
0 → 100644
View file @
700ce345
/**
* @description 布局类
* @author xjm
*/
.ant-pro-basicLayout-content
.ant-pro-page-header-wrap
{
margin
:
0
!important
;
}
src/global/styles/mixins/layout.less
View file @
700ce345
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
*/
*/
// ------------ 容器container ------------
// ------------ 容器container ------------
.ant-pro-basicLayout-content{
.ant-pro-page-header-wrap{
margin: 0 !important;
}
}
.make-container(@pad-x: @padding-lg) {
.make-container(@pad-x: @padding-lg) {
width: 100%;
width: 100%;
.make-center(block);
.make-center(block);
...
...
src/pages/ruleSettingManage/paySetting/settingIndex.tsx
View file @
700ce345
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Author: LeeJiancong
* @Date: 2020-08-13 09:50:41
* @Date: 2020-08-13 09:50:41
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-
13 17:26:35
* @LastEditTime: 2020-08-
20 20:09:43
*/
*/
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
import
{
Card
,
Button
,
Tabs
,
Radio
,
Space
,
Row
,
Col
,
Table
,
Popconfirm
}
from
'antd'
import
{
Card
,
Button
,
Tabs
,
Radio
,
Space
,
Row
,
Col
,
Table
,
Popconfirm
}
from
'antd'
...
@@ -22,7 +22,7 @@ import '../components/PayForm/components/index.less'
...
@@ -22,7 +22,7 @@ import '../components/PayForm/components/index.less'
const
payActions
=
createFormActions
()
const
payActions
=
createFormActions
()
const
{
TabPane
}
=
Tabs
const
{
TabPane
}
=
Tabs
const
{
onFieldValueChange$
}
=
FormEffectHooks
const
{
onFieldValueChange$
}
=
FormEffectHooks
const
TabList
=
GlobalConfig
.
payConfig
.
payPlatformPayConfig
const
TabList
:
any
=
GlobalConfig
.
payConfig
.
payPlatformPayConfig
.
data
||
[]
const
PaySetting
:
React
.
FC
<
{}
>
=
()
=>
{
const
PaySetting
:
React
.
FC
<
{}
>
=
()
=>
{
const
ref
=
useRef
<
any
>
({})
const
ref
=
useRef
<
any
>
({})
const
[
mode
,
setmode
]
=
useState
<
number
>
(
0
)
const
[
mode
,
setmode
]
=
useState
<
number
>
(
0
)
...
...
src/pages/ruleSettingManage/payStrategy/detail.tsx
View file @
700ce345
/*
* @Author: LeeJiancong
* @Date: 2020-08-06 19:07:53
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-08-20 20:16:22
*/
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
import
{
Card
,
Button
,
Modal
}
from
'antd'
import
{
Card
,
Button
,
Modal
}
from
'antd'
import
{
PlusOutlined
,
SaveOutlined
}
from
'@ant-design/icons'
import
{
PlusOutlined
,
SaveOutlined
}
from
'@ant-design/icons'
...
@@ -18,8 +25,13 @@ import { GlobalConfig } from '@/global/config'
...
@@ -18,8 +25,13 @@ import { GlobalConfig } from '@/global/config'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
style
from
'./index.less'
import
style
from
'./index.less'
const
payActions
=
createFormActions
()
const
payActions
=
createFormActions
()
/**
* @description: 会员弹窗列表
* @param {type}
* @return {type}
*/
const
fetchMemberList
=
async
(
params
)
=>
{
const
fetchMemberList
=
async
(
params
)
=>
{
const
res
=
await
PublicApi
.
getMemberMa
intenance
Page
(
params
)
const
res
=
await
PublicApi
.
getMemberMa
nagePay
Page
(
params
)
return
res
.
data
return
res
.
data
}
}
...
...
src/pages/ruleSettingManage/schema/index.tsx
View file @
700ce345
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Author: LeeJiancong
* @Date: 2020-08-06 11:12:18
* @Date: 2020-08-06 11:12:18
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-
18 15:21:25
* @LastEditTime: 2020-08-
20 19:18:53
*/
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
import
React
,
{
useState
,
useEffect
}
from
'react'
import
{
ISchema
}
from
'@formily/antd'
import
{
ISchema
}
from
'@formily/antd'
...
@@ -17,7 +17,7 @@ let currentTab;
...
@@ -17,7 +17,7 @@ let currentTab;
export
const
strategyDetailTab
=
(
props
:
any
,
usePageStatus
:
any
)
=>
{
export
const
strategyDetailTab
=
(
props
:
any
,
usePageStatus
:
any
)
=>
{
//新增时候就初始化
//新增时候就初始化
let
baseList
:
any
=
GlobalConfig
.
payConfig
.
payInitializeConfig
let
baseList
:
any
=
GlobalConfig
.
payConfig
.
payInitializeConfig
.
data
console
.
log
(
'baseList'
,
JSON
.
stringify
(
baseList
))
console
.
log
(
'baseList'
,
JSON
.
stringify
(
baseList
))
// baseList[2].ruleConfigurations = [{value:1,label:"1",platformType:1}]
// baseList[2].ruleConfigurations = [{value:1,label:"1",platformType:1}]
...
...
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