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
9c248291
Commit
9c248291
authored
Jun 06, 2022
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 时效2.0
parent
1dc993bf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
env.config.js
config/env.config.js
+7
-7
index.jsx
src/pages/AfterSaleManage/Pending/index.jsx
+7
-7
No files found.
config/env.config.js
View file @
9c248291
...
@@ -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-
test2
.liangkebang.net
'
,
api
:
'
//backstms-
qa
.liangkebang.net
'
,
kdspOpApi
:
'
https://kdsp-operation-
test2
.liangkebang.net
'
,
kdspOpApi
:
'
https://kdsp-operation-
qa
.liangkebang.net
'
,
kdspApi
:
'
https://sc-op-api-
test2
.liangkebang.net
'
,
kdspApi
:
'
https://sc-op-api-
qa
.liangkebang.net
'
,
goodsApi
:
'
https://sc-op-api-
test2
.liangkebang.net
'
,
goodsApi
:
'
https://sc-op-api-
qa
.liangkebang.net
'
,
querysApi
:
'
https://sc-settlement-api-
test2
.liangkebang.net
'
,
querysApi
:
'
https://sc-settlement-api-
qa
.liangkebang.net
'
,
// goodsApi: '//192.168.188.111:7000',
// goodsApi: '//192.168.188.111:7000',
prologueDomain
:
'
https://mall-
test2
.liangkebang.net
'
,
prologueDomain
:
'
https://mall-
qa
.liangkebang.net
'
,
qiniuHost
:
'
https://appsync.lkbang.net
'
,
qiniuHost
:
'
https://appsync.lkbang.net
'
,
opapiHost
:
'
https://opapi-
test2
.liangkebang.net
'
,
opapiHost
:
'
https://opapi-
qa
.liangkebang.net
'
,
};
};
const
prodApi
=
{
const
prodApi
=
{
...
...
src/pages/AfterSaleManage/Pending/index.jsx
View file @
9c248291
...
@@ -57,11 +57,11 @@ export default () => {
...
@@ -57,11 +57,11 @@ export default () => {
setSelectedRow
(
detailData
);
setSelectedRow
(
detailData
);
};
};
const
renderContent
=
(
record
,
index
,
action
)
=>
{
const
renderContent
=
(
record
,
index
,
action
)
=>
{
if
(
!
time
[
record
.
orderId
])
{
if
(
!
time
[
record
.
serviceNo
])
{
const
serviceTime
=
moment
(
record
.
serviceTime
).
valueOf
()
+
24
*
3600
*
1000
;
const
serviceTime
=
moment
(
record
.
serviceTime
).
valueOf
()
+
24
*
3600
*
1000
;
const
nowTime
=
moment
(
record
.
nowTime
).
valueOf
();
const
nowTime
=
moment
(
record
.
nowTime
).
valueOf
();
let
timeNumber
=
(
serviceTime
-
nowTime
)
/
1000
;
let
timeNumber
=
(
serviceTime
-
nowTime
)
/
1000
;
time
[
record
.
orderId
]
=
setInterval
(()
=>
{
time
[
record
.
serviceNo
]
=
setInterval
(()
=>
{
if
(
timeNumber
>
0
)
{
if
(
timeNumber
>
0
)
{
timeNumber
-=
1
;
timeNumber
-=
1
;
// eslint-disable-next-line radix
// eslint-disable-next-line radix
...
@@ -77,12 +77,12 @@ export default () => {
...
@@ -77,12 +77,12 @@ export default () => {
.
toString
()
.
toString
()
.
padStart
(
2
,
'
0
'
);
.
padStart
(
2
,
'
0
'
);
const
str
=
`
${
hours
}
时
${
minutes
}
分
${
seconds
}
秒`
;
const
str
=
`
${
hours
}
时
${
minutes
}
分
${
seconds
}
秒`
;
timeString
[
record
.
orderId
]
=
str
;
timeString
[
record
.
serviceNo
]
=
str
;
const
strings
=
_
.
cloneDeep
(
timeString
);
const
strings
=
_
.
cloneDeep
(
timeString
);
setTimeString
(
strings
);
setTimeString
(
strings
);
}
else
{
}
else
{
clearInterval
(
time
[
record
.
orderId
]);
clearInterval
(
time
[
record
.
serviceNo
]);
timeString
[
record
.
orderId
]
=
'
0时0分0秒
'
;
timeString
[
record
.
serviceNo
]
=
'
0时0分0秒
'
;
const
strings
=
_
.
cloneDeep
(
timeString
);
const
strings
=
_
.
cloneDeep
(
timeString
);
setTimeString
(
strings
);
setTimeString
(
strings
);
}
}
...
@@ -95,11 +95,11 @@ export default () => {
...
@@ -95,11 +95,11 @@ export default () => {
dataIndex
:
'
serviceTime
'
,
dataIndex
:
'
serviceTime
'
,
key
:
'
serviceTime
'
,
key
:
'
serviceTime
'
,
hideInSearch
:
true
,
hideInSearch
:
true
,
width
:
1
2
0
,
width
:
1
5
0
,
render
:
(
val
,
record
,
index
,
action
)
=>
[
render
:
(
val
,
record
,
index
,
action
)
=>
[
<
span
style=
{
{
color
:
'
red
'
}
}
>
<
span
style=
{
{
color
:
'
red
'
}
}
>
{
renderContent
(
record
,
index
,
action
)
}
{
renderContent
(
record
,
index
,
action
)
}
{
timeString
[
record
.
orderId
]
}
{
timeString
[
record
.
serviceNo
]
}
</
span
>,
</
span
>,
],
],
},
},
...
...
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