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
fd1f83ba
Commit
fd1f83ba
authored
Nov 07, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复商户首次登录消息数据不正确的问题
parent
34d37bb5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
3 deletions
+19
-3
env.config.js
config/env.config.js
+1
-1
index.jsx
src/components/MessageReminder/Simple/index.jsx
+8
-1
data.js
src/pages/AfterSaleManage/data.js
+4
-0
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+6
-1
No files found.
config/env.config.js
View file @
fd1f83ba
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
environment
=
'
yxm2
'
;
const
environment
=
'
sc
'
;
const
envAPi
=
{
const
envAPi
=
{
api
:
`https://security-
${
environment
}
.liangkebang.net`
,
//'https://security-xyqb.liangkebang.net',
api
:
`https://security-
${
environment
}
.liangkebang.net`
,
//'https://security-xyqb.liangkebang.net',
kdspOpApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
kdspOpApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
...
...
src/components/MessageReminder/Simple/index.jsx
View file @
fd1f83ba
...
@@ -122,7 +122,7 @@ const Simple = props => {
...
@@ -122,7 +122,7 @@ const Simple = props => {
const
[
messageData
,
setMessageData
]
=
useState
([]);
const
[
messageData
,
setMessageData
]
=
useState
([]);
cons
t
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
'
user
'
)
||
'
{}
'
);
le
t
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
'
user
'
)
||
'
{}
'
);
const
toggle
=
()
=>
{
const
toggle
=
()
=>
{
setVisible
(
!
visible
);
setVisible
(
!
visible
);
...
@@ -130,6 +130,13 @@ const Simple = props => {
...
@@ -130,6 +130,13 @@ const Simple = props => {
// 初始化获取数据
// 初始化获取数据
const
getMsgList
=
async
()
=>
{
const
getMsgList
=
async
()
=>
{
if
(
!
userInfo
.
supplierCode
)
{
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
'
user
'
)
||
'
{}
'
);
setTimeout
(()
=>
{
getMsgList
();
},
1000
);
return
;
}
const
params
=
{
const
params
=
{
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
1000
,
pageSize
:
1000
,
...
...
src/pages/AfterSaleManage/data.js
View file @
fd1f83ba
...
@@ -213,6 +213,9 @@ export const getColumns = props => {
...
@@ -213,6 +213,9 @@ export const getColumns = props => {
hideInSearch
:
true
,
hideInSearch
:
true
,
width
:
150
,
width
:
150
,
render
:
(
val
,
record
)
=>
{
render
:
(
val
,
record
)
=>
{
if
(
record
.
status
!==
14
)
{
return
<
div
align
=
"
center
"
>-<
/div>
;
}
const
serviceTime
=
moment
(
record
.
approvalEndTime
).
valueOf
();
const
serviceTime
=
moment
(
record
.
approvalEndTime
).
valueOf
();
return
(
return
(
<
Countdown
<
Countdown
...
@@ -228,6 +231,7 @@ export const getColumns = props => {
...
@@ -228,6 +231,7 @@ export const getColumns = props => {
if
(
dealStatus
===
70
)
{
if
(
dealStatus
===
70
)
{
auditCountDown
=
[];
auditCountDown
=
[];
}
}
return
[
return
[
...
auditCountDown
,
...
auditCountDown
,
{
{
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
fd1f83ba
...
@@ -499,6 +499,7 @@ const TableList = props => {
...
@@ -499,6 +499,7 @@ const TableList = props => {
// eslint-disable-next-line no-unused-expressions
// eslint-disable-next-line no-unused-expressions
form
?.
resetFields
();
form
?.
resetFields
();
setorderStatus
(
''
);
setorderStatus
(
''
);
setOrderNo
(
''
);
// eslint-disable-next-line no-unused-expressions
// eslint-disable-next-line no-unused-expressions
form
?.
submit
();
form
?.
submit
();
}
}
}
}
...
@@ -512,7 +513,11 @@ const TableList = props => {
...
@@ -512,7 +513,11 @@ const TableList = props => {
type=
"primary"
type=
"primary"
onClick=
{
()
=>
{
onClick=
{
()
=>
{
if
(
ref
.
current
)
{
if
(
ref
.
current
)
{
const
obj
=
{
...
ref
.
current
.
getFieldsValue
(),
logisticsStatus
:
props
.
type
||
1
};
const
obj
=
{
...
ref
.
current
.
getFieldsValue
(),
orderNo
,
logisticsStatus
:
props
.
type
||
1
,
};
obj
.
startTime
=
startTimeStr
;
obj
.
startTime
=
startTimeStr
;
obj
.
endTime
=
endTimeStr
;
obj
.
endTime
=
endTimeStr
;
downOrder
(
obj
);
downOrder
(
obj
);
...
...
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