Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
8bd32c23
Commit
8bd32c23
authored
Jun 11, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
645f20fd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
xgg-saas-platform/app/base/controller/impl/saas/merchantCtl.js
+3
-2
No files found.
xgg-saas-platform/app/base/controller/impl/saas/merchantCtl.js
View file @
8bd32c23
...
...
@@ -5,7 +5,7 @@ class MerchantCtl extends CtlBase {
super
();
this
.
merchantSve
=
system
.
getObject
(
"service.saas.merchantSve"
);
this
.
merchantuserSve
=
system
.
getObject
(
"service.uc.merchantuserSve"
);
this
.
baseUrl
=
"http
s://xxxxxxxxxxxx
"
;
this
.
baseUrl
=
"http
://192.168.210.183:8081/#/
"
;
}
async
dics
(
params
,
pobj2
,
req
)
{
...
...
@@ -39,7 +39,8 @@ class MerchantCtl extends CtlBase {
this
.
doTimeCondition
(
params
,
[
"createBegin"
,
"createEnd"
]);
let
list
=
await
this
.
merchantSve
.
page
(
params
);
for
(
let
item
of
list
.
data
.
rows
)
{
item
.
qrcode
=
encodeURIComponent
(
this
.
baseUrl
+
"?mechtId="
+
system
.
encryption
(
item
.
id
));
let
redds
=
encodeURIComponent
(
system
.
encryption
(
item
.
id
));
item
.
qrcode
=
this
.
baseUrl
+
"?mchtId="
+
encodeURIComponent
(
system
.
encryption
(
item
.
id
));
}
return
list
;
}
catch
(
error
)
{
...
...
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