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
caa5bb44
Commit
caa5bb44
authored
Aug 08, 2022
by
beisir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 解决测试问题
parent
2144b5ff
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
env.config.js
config/env.config.js
+2
-1
FormInformationBasic.jsx
src/pages/ServiceGoods/components/FormInformationBasic.jsx
+2
-2
FormRuleSetting.jsx
src/pages/ServiceGoods/components/FormRuleSetting.jsx
+2
-2
FormSettlementOthers.jsx
src/pages/ServiceGoods/components/FormSettlementOthers.jsx
+2
-2
config.js
src/pages/ServiceGoods/config.js
+1
-1
No files found.
config/env.config.js
View file @
caa5bb44
...
@@ -10,7 +10,8 @@ const envAPi = {
...
@@ -10,7 +10,8 @@ const envAPi = {
// kdspApi: 'https://sc-op-api-xyqb.liangkebang.net',
// kdspApi: 'https://sc-op-api-xyqb.liangkebang.net',
// goodsApi: 'https://sc-op-api-xyqb.liangkebang.net',
// goodsApi: 'https://sc-op-api-xyqb.liangkebang.net',
querysApi
:
'
https://sc-settlement-api-xyqb.liangkebang.net
'
,
querysApi
:
'
https://sc-settlement-api-xyqb.liangkebang.net
'
,
prologueDomain
:
'
https://mall-xyqb.liangkebang.net
'
,
// prologueDomain: 'https://mall-xyqb.liangkebang.net',
prologueDomain
:
'
https://prologue-xyqb.liangkebang.net
'
,
qiniuHost
:
'
https://kdspstatic.q-gp.com/
'
,
qiniuHost
:
'
https://kdspstatic.q-gp.com/
'
,
opapiHost
:
'
https://opapi-xyqb.liangkebang.net
'
,
opapiHost
:
'
https://opapi-xyqb.liangkebang.net
'
,
};
};
...
...
src/pages/ServiceGoods/components/FormInformationBasic.jsx
View file @
caa5bb44
...
@@ -186,9 +186,9 @@ const FormInformationBasic = forwardRef((props, ref) => {
...
@@ -186,9 +186,9 @@ const FormInformationBasic = forwardRef((props, ref) => {
key=
"description"
key=
"description"
name=
"description"
name=
"description"
label=
"描述"
label=
"描述"
rules=
{
[{
required
:
true
,
message
:
'
请输入描述!
'
}]
}
rules=
{
[{
required
:
true
,
message
:
'
请输入描述
,100字以内
!
'
}]
}
>
>
<
Input
.
TextArea
showCount
maxLength=
{
100
}
placeholder=
"请输入描述!"
/>
<
Input
.
TextArea
showCount
maxLength=
{
100
}
placeholder=
"请输入描述
, 100字以内
!"
/>
</
Form
.
Item
>
</
Form
.
Item
>
)
:
null
}
)
:
null
}
</
Form
>
</
Form
>
...
...
src/pages/ServiceGoods/components/FormRuleSetting.jsx
View file @
caa5bb44
...
@@ -72,10 +72,10 @@ const FormRuleSetting = forwardRef((props, ref) => {
...
@@ -72,10 +72,10 @@ const FormRuleSetting = forwardRef((props, ref) => {
}
}
}
}
scrollToFirstError
scrollToFirstError
>
>
<
Form
.
Item
name=
"
u
seTime"
label=
"购买时间"
{
...
rangeConfig
}
>
<
Form
.
Item
name=
"
purcha
seTime"
label=
"购买时间"
{
...
rangeConfig
}
>
<
RangePicker
showTime
format=
"YYYY-MM-DD HH:mm:ss"
/>
<
RangePicker
showTime
format=
"YYYY-MM-DD HH:mm:ss"
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
name=
"
purcha
seTime"
label=
"有效期"
{
...
rangeConfig
}
>
<
Form
.
Item
name=
"
u
seTime"
label=
"有效期"
{
...
rangeConfig
}
>
<
RangePicker
showTime
format=
"YYYY-MM-DD HH:mm:ss"
/>
<
RangePicker
showTime
format=
"YYYY-MM-DD HH:mm:ss"
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
...
...
src/pages/ServiceGoods/components/FormSettlementOthers.jsx
View file @
caa5bb44
...
@@ -142,9 +142,9 @@ const FormSettlementOthers = forwardRef((props, ref) => {
...
@@ -142,9 +142,9 @@ const FormSettlementOthers = forwardRef((props, ref) => {
<
Form
.
Item
<
Form
.
Item
name=
"packageContent"
name=
"packageContent"
label=
"套餐内容"
label=
"套餐内容"
rules=
{
[{
required
:
true
,
message
:
'
请输入套餐内容!
'
}]
}
rules=
{
[{
required
:
true
,
message
:
'
请输入套餐内容
, 1000字以内!
!
'
}]
}
>
>
<
Input
.
TextArea
showCount
maxLength=
{
100
}
placeholder=
"请输入套餐内容
!"
/>
<
Input
.
TextArea
showCount
maxLength=
{
100
0
}
placeholder=
"请输入套餐内容, 1000字以内!
!"
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
name=
"settlementMethod"
name=
"settlementMethod"
...
...
src/pages/ServiceGoods/config.js
View file @
caa5bb44
...
@@ -172,7 +172,7 @@ export const StaticColumns = customer => [
...
@@ -172,7 +172,7 @@ export const StaticColumns = customer => [
dataIndex
:
'
commissionRate
'
,
dataIndex
:
'
commissionRate
'
,
editable
:
true
,
editable
:
true
,
role
:
[
4
],
role
:
[
4
],
roleRules
:
{
required
:
tru
e
},
roleRules
:
{
required
:
fals
e
},
roleProps
:
{
roleProps
:
{
min
:
0
,
min
:
0
,
// max: 100,
// max: 100,
...
...
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