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
9f5c5c7e
Commit
9f5c5c7e
authored
Apr 21, 2022
by
lxd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 问题修复
parent
adb42cb0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
env.config.js
config/env.config.js
+6
-6
index.jsx
src/pages/Admin/index.jsx
+4
-4
Pending.jsx
src/pages/cancelBillManage/Pending.jsx
+1
-1
No files found.
config/env.config.js
View file @
9f5c5c7e
...
@@ -2,14 +2,14 @@ const isProduction = process.env.NODE_ENV === 'production';
...
@@ -2,14 +2,14 @@ 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-
gyl
.liangkebang.net
'
,
api
:
'
//backstms-
test4
.liangkebang.net
'
,
kdspOpApi
:
'
https://kdsp-operation-
gyl
.liangkebang.net
'
,
kdspOpApi
:
'
https://kdsp-operation-
test4
.liangkebang.net
'
,
kdspApi
:
'
https://sc-op-api-
gyl
.liangkebang.net
'
,
kdspApi
:
'
https://sc-op-api-
test4
.liangkebang.net
'
,
goodsApi
:
'
https://sc-op-api-
gyl
.liangkebang.net
'
,
goodsApi
:
'
https://sc-op-api-
test4
.liangkebang.net
'
,
// goodsApi: '//192.168.28.107:7000',
// goodsApi: '//192.168.28.107:7000',
prologueDomain
:
'
https://mall-
gyl2
.liangkebang.net
'
,
prologueDomain
:
'
https://mall-
test4
.liangkebang.net
'
,
qiniuHost
:
'
https://appsync.lkbang.net
'
,
qiniuHost
:
'
https://appsync.lkbang.net
'
,
opapiHost
:
'
https://opapi-
gyl2
.liangkebang.net
'
,
opapiHost
:
'
https://opapi-
test4
.liangkebang.net
'
,
};
};
const
prodApi
=
{
const
prodApi
=
{
...
...
src/pages/Admin/index.jsx
View file @
9f5c5c7e
...
@@ -40,7 +40,7 @@ const Admin = () => {
...
@@ -40,7 +40,7 @@ const Admin = () => {
pathname
:
'
/orderManage/pendingDeliveryOrder
'
,
pathname
:
'
/orderManage/pendingDeliveryOrder
'
,
}
}
}
}
>
>
<
strong
>
{
pendingNum
?.
pendingShipNum
}
</
strong
>
<
strong
>
{
pendingNum
?.
pendingShipNum
||
0
}
</
strong
>
<
p
>
待发货
</
p
>
<
p
>
待发货
</
p
>
</
Link
>
</
Link
>
</
Col
>
</
Col
>
...
@@ -51,7 +51,7 @@ const Admin = () => {
...
@@ -51,7 +51,7 @@ const Admin = () => {
state
:
{
status
:
1
},
state
:
{
status
:
1
},
}
}
}
}
>
>
<
strong
>
{
pendingNum
?.
timeOutShipNum
}
</
strong
>
<
strong
>
{
pendingNum
?.
timeOutShipNum
||
0
}
</
strong
>
<
p
>
待发货
{
'
>
'
}
48小时
</
p
>
<
p
>
待发货
{
'
>
'
}
48小时
</
p
>
</
Link
>
</
Link
>
</
Col
>
</
Col
>
...
@@ -61,7 +61,7 @@ const Admin = () => {
...
@@ -61,7 +61,7 @@ const Admin = () => {
pathname
:
'
cancelBillManage
'
,
pathname
:
'
cancelBillManage
'
,
}
}
}
}
>
>
<
strong
>
{
pendingNum
?.
cancelOrderPendingAuditNum
}
</
strong
>
<
strong
>
{
pendingNum
?.
cancelOrderPendingAuditNum
||
0
}
</
strong
>
<
p
>
取消订单审核
{
'
<
'
}
24小时
</
p
>
<
p
>
取消订单审核
{
'
<
'
}
24小时
</
p
>
</
Link
>
</
Link
>
</
Col
>
</
Col
>
...
@@ -77,7 +77,7 @@ const Admin = () => {
...
@@ -77,7 +77,7 @@ const Admin = () => {
pathname
:
'
afterSaleManage
'
,
pathname
:
'
afterSaleManage
'
,
}
}
}
}
>
>
<
strong
>
{
pendingNum
?.
afterOrderPendingAuditNum
}
</
strong
>
<
strong
>
{
pendingNum
?.
afterOrderPendingAuditNum
||
0
}
</
strong
>
<
p
>
退款待审核
</
p
>
<
p
>
退款待审核
</
p
>
</
Link
>
</
Link
>
</
Col
>
</
Col
>
...
...
src/pages/cancelBillManage/Pending.jsx
View file @
9f5c5c7e
...
@@ -101,7 +101,7 @@ export default () => {
...
@@ -101,7 +101,7 @@ export default () => {
setTimeString
(
strings
);
setTimeString
(
strings
);
}
else
{
}
else
{
clearInterval
(
time
[
record
.
orderId
]);
clearInterval
(
time
[
record
.
orderId
]);
timeString
[
record
.
orderId
]
=
'
处理中
'
;
timeString
[
record
.
orderId
]
=
'
0时0分0秒
'
;
const
strings
=
_
.
cloneDeep
(
timeString
);
const
strings
=
_
.
cloneDeep
(
timeString
);
setTimeString
(
strings
);
setTimeString
(
strings
);
}
}
...
...
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