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
8cbfcf0e
Commit
8cbfcf0e
authored
Nov 01, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复售后订单管理通过消息切换查询订单号不请求的问题
parent
69ec80f1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
19 deletions
+19
-19
env.config.js
config/env.config.js
+1
-6
index.less
src/components/MessageReminder/Complex/index.less
+2
-1
index.less
src/components/MessageReminder/Empty/index.less
+1
-0
index.jsx
src/components/MessageReminder/Simple/index.jsx
+1
-1
BasicLayout.jsx
src/layouts/BasicLayout.jsx
+1
-6
index.jsx
src/pages/AfterSaleManage/index.jsx
+13
-5
No files found.
config/env.config.js
View file @
8cbfcf0e
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
=
'
yxm
'
;
const
environment
=
'
yxm
2
'
;
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`
,
kdspApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
kdspApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
goodsApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
goodsApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
// kdspOpApi: 'https://kdsp-operation-xyqb.liangkebang.net',
// kdspApi: 'https://sc-op-api-xyqb.liangkebang.net',
// goodsApi: 'https://sc-op-api-xyqb.liangkebang.net',
querysApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
querysApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
// goodsApi: '//192.168.188.111:7000',
prologueDomain
:
`https://mall-
${
environment
}
.liangkebang.net`
,
prologueDomain
:
`https://mall-
${
environment
}
.liangkebang.net`
,
// qiniuHost: 'https://appsync.lkbang.net',
qiniuHost
:
'
https://kdspstatic.q-gp.com/
'
,
qiniuHost
:
'
https://kdspstatic.q-gp.com/
'
,
opapiHost
:
`https://opapi-
${
environment
}
.liangkebang.net`
,
opapiHost
:
`https://opapi-
${
environment
}
.liangkebang.net`
,
wsApi
:
`ws://ws-
${
environment
}
.liangkebang.net`
,
wsApi
:
`ws://ws-
${
environment
}
.liangkebang.net`
,
...
...
src/components/MessageReminder/Complex/index.less
View file @
8cbfcf0e
...
@@ -47,7 +47,8 @@
...
@@ -47,7 +47,8 @@
}
}
.complex-list {
.complex-list {
height: 500px;
min-height: 300px;
max-height: 500px;
margin-top: 20px;
margin-top: 20px;
padding-right: 25px;
padding-right: 25px;
overflow-y: auto;
overflow-y: auto;
...
...
src/components/MessageReminder/Empty/index.less
View file @
8cbfcf0e
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
padding: 73px 0 88px;
padding: 73px 0 88px;
color: @text-color-secondary;
color: @text-color-secondary;
text-align: center;
text-align: center;
background-color: #fff;
img {
img {
display: inline-block;
display: inline-block;
height: 76px;
height: 76px;
...
...
src/components/MessageReminder/Simple/index.jsx
View file @
8cbfcf0e
...
@@ -43,7 +43,7 @@ const Message = props => {
...
@@ -43,7 +43,7 @@ const Message = props => {
</
span
>
</
span
>
</
div
>
</
div
>
<
div
className=
{
styles
.
time
}
>
<
div
className=
{
styles
.
time
}
>
<
span
>
{
message
.
createdAt
}
</
span
>
<
span
>
{
message
.
time
}
</
span
>
</
div
>
</
div
>
<
div
className=
{
styles
.
notice
}
>
<
div
className=
{
styles
.
notice
}
>
<
a
onClick=
{
()
=>
viewDetail
(
message
)
}
>
{
message
.
title
}
,请查看
</
a
>
<
a
onClick=
{
()
=>
viewDetail
(
message
)
}
>
{
message
.
title
}
,请查看
</
a
>
...
...
src/layouts/BasicLayout.jsx
View file @
8cbfcf0e
...
@@ -59,23 +59,18 @@ const BasicLayout = props => {
...
@@ -59,23 +59,18 @@ const BasicLayout = props => {
try
{
try
{
const
token
=
window
.
localStorage
.
getItem
(
'
token
'
);
const
token
=
window
.
localStorage
.
getItem
(
'
token
'
);
const
channelId
=
100001
;
const
channelId
=
100001
;
console
.
log
(
'
666666666666
'
);
const
socket
=
new
Socket
({
const
socket
=
new
Socket
({
url
:
getSocketUrl
({
token
,
channelId
}),
url
:
getSocketUrl
({
token
,
channelId
}),
});
});
socket
.
connection
();
socket
.
connection
();
socket
.
event
.
on
(
'
open
'
,
()
=>
{
socket
.
event
.
on
(
'
open
'
,
()
=>
{
console
.
log
(
'
连接成功3
'
);
console
.
log
(
'
wesocket连接成功
'
);
});
});
socket
.
event
.
on
(
'
message
'
,
msg
=>
{
socket
.
event
.
on
(
'
message
'
,
msg
=>
{
// audioRef.current.click()
dispatch
({
dispatch
({
type
:
'
messageReminder/setUnReadData
'
,
type
:
'
messageReminder/setUnReadData
'
,
payload
:
[
JSON
.
parse
(
msg
.
data
)],
payload
:
[
JSON
.
parse
(
msg
.
data
)],
});
});
// socket.play()
});
});
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
);
console
.
log
(
e
);
...
...
src/pages/AfterSaleManage/index.jsx
View file @
8cbfcf0e
...
@@ -237,7 +237,6 @@ const AfterSale = props => {
...
@@ -237,7 +237,6 @@ const AfterSale = props => {
form
,
form
,
initialValues
:
{
initialValues
:
{
afterTime
,
afterTime
,
orderNo
:
pageQueryOrderNo
,
},
},
formOptions
:
{},
formOptions
:
{},
...
formConfig
,
...
formConfig
,
...
@@ -254,11 +253,21 @@ const AfterSale = props => {
...
@@ -254,11 +253,21 @@ const AfterSale = props => {
type
,
type
,
});
});
setTableParams
({
...
tableParams
,
dealStatus
,
type
});
setTableParams
({
...
tableParams
,
dealStatus
,
type
});
// setTimeout(() => {
// form.submit()
// }, 0)
};
};
// 监听路由query参数变化重新发起请求
useEffect
(()
=>
{
if
(
location
?.
query
)
{
const
{
orderNo
:
orderNumber
}
=
location
?.
query
;
form
.
setFieldsValue
({
orderNo
:
orderNumber
,
});
if
(
actionRef
.
current
)
{
actionRef
.
current
.
reload
();
}
}
},
[
location
]);
const
columns
=
getColumns
({
const
columns
=
getColumns
({
openAudit
,
openAudit
,
viewAppeal
,
viewAppeal
,
...
@@ -304,7 +313,6 @@ const AfterSale = props => {
...
@@ -304,7 +313,6 @@ const AfterSale = props => {
const
res
=
await
searchList
(
requestParams
);
const
res
=
await
searchList
(
requestParams
);
const
{
records
=
[],
total
}
=
res
.
data
;
const
{
records
=
[],
total
}
=
res
.
data
;
console
.
log
(
countRes
);
if
(
countRes
.
code
===
'
0000
'
)
{
if
(
countRes
.
code
===
'
0000
'
)
{
setTabInfoData
(
countRes
.
data
);
setTabInfoData
(
countRes
.
data
);
}
}
...
...
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