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
f932ffea
Commit
f932ffea
authored
Jun 25, 2023
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 解决senty问题
parent
4ad59101
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
7 deletions
+16
-7
env.config.js
config/env.config.js
+1
-1
index.jsx
src/pages/Admin/index.jsx
+4
-2
model.js
src/pages/GoodsManage/model.js
+3
-3
upload.jsx
src/pages/PaymentMange/ToExamine/upload.jsx
+5
-0
websocket.js
src/utils/websocket.js
+3
-1
No files found.
config/env.config.js
View file @
f932ffea
import
RoleType
,
{
isPlatForm
}
from
'
./role.config
'
;
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
environment
=
'
yxm2
'
;
const
environment
=
'
sc
'
;
const
envAPi
=
{
api
:
`https://security-
${
environment
}
.liangkebang.net`
,
//'https://security-xyqb.liangkebang.net',
...
...
src/pages/Admin/index.jsx
View file @
f932ffea
...
...
@@ -20,8 +20,10 @@ const Admin = props => {
const
showPendingDeliveryOrderList
=
props
.
permissions
[
PENDING_DELIVERY_ORDER
.
LIST
];
useEffect
(()
=>
{
const
qurey
=
async
()
=>
{
const
{
data
}
=
await
getPendingNum
();
setpendingNum
(
data
);
const
res
=
await
getPendingNum
();
if
(
res
?.
data
)
{
setpendingNum
(
res
.
data
);
}
};
qurey
();
},
[]);
...
...
src/pages/GoodsManage/model.js
View file @
f932ffea
...
...
@@ -17,12 +17,12 @@ const Model = {
const
productCategoryId
=
payload
?.
productCategoryId
||
[];
params
.
productCategoryId
=
(
productCategoryId
.
length
&&
productCategoryId
[
productCategoryId
.
length
-
1
])
||
''
;
const
{
data
}
=
yield
call
(
api
.
searchList
,
params
);
if
(
!
data
)
return
;
const
res
=
yield
call
(
api
.
searchList
,
params
);
if
(
res
&&
!
res
.
data
)
return
;
yield
put
({
type
:
'
saveData
'
,
payload
:
{
tableData
:
data
,
tableData
:
res
.
data
,
},
});
},
...
...
src/pages/PaymentMange/ToExamine/upload.jsx
View file @
f932ffea
...
...
@@ -62,6 +62,10 @@ class PicturesWall extends React.Component {
const
vm
=
this
;
// eslint-disable-next-line new-cap
const
data
=
`
${
UUID
.
createUUID
()}
.
${
suffix
}
`
;
if
(
!
token
)
{
message
.
error
(
'
上传失败,请刷新页面重试!
'
);
return
;
}
const
observable
=
qiniu
.
upload
(
file
,
data
,
token
);
const
observer
=
{
next
()
{
...
...
@@ -121,6 +125,7 @@ class PicturesWall extends React.Component {
customRequest=
{
this
.
customRequest
}
listType=
"text"
fileList=
{
fileList
}
disabled=
{
status
!==
1
}
onRemove=
{
status
===
1
?
this
.
clearFileList
:
''
}
accept=
".pdf,.doc,.docx,.zip,.rar,.png,.jpeg"
>
...
...
src/utils/websocket.js
View file @
f932ffea
...
...
@@ -116,7 +116,9 @@ class Socket extends EventEmitter {
return
;
}
const
sendValue
=
typeof
value
===
'
string
'
?
value
:
JSON
.
stringify
(
value
);
this
.
socket
.
send
(
sendValue
);
if
(
this
.
socket
.
readyState
===
this
.
socket
.
OPEN
)
{
this
.
socket
.
send
(
sendValue
);
}
}
};
...
...
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