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
2ecb5e84
Commit
2ecb5e84
authored
May 13, 2022
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 时效2.0开发
parent
c3fe8eab
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
8 deletions
+34
-8
env.config.js
config/env.config.js
+7
-7
index.jsx
src/pages/Admin/index.jsx
+1
-1
index.jsx
src/pages/GoodsManage/SearchForm/index.jsx
+3
-0
service.js
src/pages/GoodsManage/service.js
+6
-0
form.jsx
src/pages/afterSaleAddress/form.jsx
+11
-0
index.jsx
src/pages/afterSaleAddress/index.jsx
+6
-0
No files found.
config/env.config.js
View file @
2ecb5e84
...
@@ -2,15 +2,15 @@ const isProduction = process.env.NODE_ENV === 'production';
...
@@ -2,15 +2,15 @@ const isProduction = process.env.NODE_ENV === 'production';
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
envAPi
=
{
const
envAPi
=
{
api
:
'
//backstms-test
9
.liangkebang.net
'
,
api
:
'
//backstms-test
4
.liangkebang.net
'
,
kdspOpApi
:
'
https://kdsp-operation-test
9
.liangkebang.net
'
,
kdspOpApi
:
'
https://kdsp-operation-test
4
.liangkebang.net
'
,
kdspApi
:
'
https://sc-op-api-test
9
.liangkebang.net
'
,
kdspApi
:
'
https://sc-op-api-test
4
.liangkebang.net
'
,
goodsApi
:
'
https://sc-op-api-test
9
.liangkebang.net
'
,
goodsApi
:
'
https://sc-op-api-test
4
.liangkebang.net
'
,
querysApi
:
'
https://sc-settlement-api-test
9
.liangkebang.net
'
,
querysApi
:
'
https://sc-settlement-api-test
4
.liangkebang.net
'
,
// goodsApi: '//192.168.188.111:7000',
// goodsApi: '//192.168.188.111:7000',
prologueDomain
:
'
https://mall-test
9
.liangkebang.net
'
,
prologueDomain
:
'
https://mall-test
4
.liangkebang.net
'
,
qiniuHost
:
'
https://appsync.lkbang.net
'
,
qiniuHost
:
'
https://appsync.lkbang.net
'
,
opapiHost
:
'
https://opapi-test
9
.liangkebang.net
'
,
opapiHost
:
'
https://opapi-test
4
.liangkebang.net
'
,
};
};
const
prodApi
=
{
const
prodApi
=
{
...
...
src/pages/Admin/index.jsx
View file @
2ecb5e84
...
@@ -78,7 +78,7 @@ const Admin = () => {
...
@@ -78,7 +78,7 @@ const Admin = () => {
}
}
}
}
>
>
<
strong
>
{
pendingNum
?.
afterOrderPendingAuditNum
||
0
}
</
strong
>
<
strong
>
{
pendingNum
?.
afterOrderPendingAuditNum
||
0
}
</
strong
>
<
p
>
退款待审核
</
p
>
<
p
>
退款待审核
{
'
<
'
}
24小时
</
p
>
</
Link
>
</
Link
>
</
Col
>
</
Col
>
</
Row
>
</
Row
>
...
...
src/pages/GoodsManage/SearchForm/index.jsx
View file @
2ecb5e84
...
@@ -144,6 +144,9 @@ class goodsManage extends Component {
...
@@ -144,6 +144,9 @@ class goodsManage extends Component {
<
Button
type=
"primary"
className=
{
styles
.
button
}
onClick=
{
()
=>
this
.
setArea
(
0
)
}
>
<
Button
type=
"primary"
className=
{
styles
.
button
}
onClick=
{
()
=>
this
.
setArea
(
0
)
}
>
批量设置不支持配送区域
批量设置不支持配送区域
</
Button
>
</
Button
>
<
Button
type=
"primary"
className=
{
styles
.
button
}
>
批量操作
</
Button
>
<
Button
type=
"primary"
className=
{
styles
.
button
}
onClick=
{
this
.
addSpu
}
>
<
Button
type=
"primary"
className=
{
styles
.
button
}
onClick=
{
this
.
addSpu
}
>
新增商品
新增商品
</
Button
>
</
Button
>
...
...
src/pages/GoodsManage/service.js
View file @
2ecb5e84
...
@@ -173,3 +173,9 @@ export async function getTemplateList(params) {
...
@@ -173,3 +173,9 @@ export async function getTemplateList(params) {
});
});
return
data
;
return
data
;
}
}
// 查询供应商售后地址
export
async
function
queryAllAfterAddress
()
{
return
request
.
get
(
'
/supplier/after/queryAllAfterAddress
'
,
{
prefix
:
goodsApi
,
});
}
src/pages/afterSaleAddress/form.jsx
View file @
2ecb5e84
...
@@ -169,6 +169,17 @@ const AddressForm = props => {
...
@@ -169,6 +169,17 @@ const AddressForm = props => {
onOk=
{
handleSubmit
}
onOk=
{
handleSubmit
}
>
>
<
Form
{
...
layout
}
name=
"formData"
>
<
Form
{
...
layout
}
name=
"formData"
>
<
FormItem
label=
"售后地址名称"
>
{
getFieldDecorator
(
'
addressName
'
,
{
initialValue
:
formData
.
addressName
,
rules
:
[
{
required
:
true
,
message
:
'
请输入售后地址名称!
'
,
},
],
})(<
Input
placeholder=
"请输入售后地址名称"
maxLength=
{
20
}
/>)
}
</
FormItem
>
<
FormItem
label=
"供应商名称"
>
<
FormItem
label=
"供应商名称"
>
{
getFieldDecorator
(
'
shopId
'
,
{
{
getFieldDecorator
(
'
shopId
'
,
{
initialValue
:
formData
.
shopId
,
initialValue
:
formData
.
shopId
,
...
...
src/pages/afterSaleAddress/index.jsx
View file @
2ecb5e84
...
@@ -54,6 +54,12 @@ const TableList = () => {
...
@@ -54,6 +54,12 @@ const TableList = () => {
}
}
};
};
const
columns
=
[
const
columns
=
[
{
title
:
'
售后地址名称
'
,
dataIndex
:
'
addressName
'
,
key
:
'
addressName
'
,
hideInSearch
:
true
,
},
{
{
title
:
'
供应商名称
'
,
title
:
'
供应商名称
'
,
dataIndex
:
'
shopId
'
,
dataIndex
:
'
shopId
'
,
...
...
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