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
ed532a51
Commit
ed532a51
authored
Dec 21, 2019
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
5e759c43
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
bpo-web/app/base/controller/impl/econtractCtl.js
+1
-1
bpo-web/app/base/controller/impl/userCtl.js
+3
-8
bpo-web/app/config/settings.js
+8
-0
No files found.
bpo-web/app/base/controller/impl/econtractCtl.js
View file @
ed532a51
...
...
@@ -323,7 +323,7 @@ class EcontractCtl extends CtlBase {
nameA
:
nameA
,
//甲方 必填
nameB
:
eaccount
.
userName
,
//乙方 必填
unit
:
company
.
name
,
//合作单位(国美) 必填---------------------------超出长度风险---目前不知多少长度
signDateA
:
today
,
//甲方签约日期 必填
\
signDateA
:
today
,
//甲方签约日期 必填
signDateB
:
today
//乙方签约日期 必填
}
};
...
...
bpo-web/app/base/controller/impl/userCtl.js
View file @
ed532a51
...
...
@@ -931,6 +931,7 @@ class UserCtl extends CtlBase {
return
domain
+
"/errpage?errmsg="
+
encodeURIComponent
(
encodeURIComponent
(
"用户唯一标识未传入"
));
}
var
homePage
=
settings
.
apiconfig
.
sign3rdHomePage
();
//默认进入的子页面
var
action
=
"?from=3rdh5"
;
var
app
=
await
this
.
cacheManager
[
"AppCache"
].
cacheApp
(
appkey
);
...
...
@@ -940,10 +941,7 @@ class UserCtl extends CtlBase {
req
.
session
.
user
=
existedUser
;
req
.
session
.
app
=
app
;
var
accountId
=
await
this
.
cache3rdAccount
(
existedUser
.
id
,
accountInfo
);
var
url
=
app
.
homePage
+
action
;
if
(
accountId
)
{
url
=
url
+
"&accid="
+
accountId
;
}
var
url
=
homePage
+
action
;
url
=
url
+
"&ecid="
+
ecid
;
return
url
;
}
...
...
@@ -966,10 +964,7 @@ class UserCtl extends CtlBase {
req
.
session
.
user
=
existedUser
;
req
.
session
.
app
=
app
;
var
accountId
=
await
this
.
cache3rdAccount
(
existedUser
.
id
,
accountInfo
);
var
url
=
app
.
homePage
+
action
;
if
(
accountId
)
{
url
=
url
+
"&accid="
+
accountId
;
}
var
url
=
homePage
+
action
;
url
=
url
+
"&ecid="
+
ecid
;
return
url
;
}
...
...
bpo-web/app/config/settings.js
View file @
ed532a51
...
...
@@ -87,6 +87,14 @@ var settings = {
companyAccountId
:
function
()
{
return
"5c25eb4ee3b448da90babec3ce8d1144"
;
},
sign3rdHomePage
:
function
()
{
if
(
settings
.
env
==
"dev"
)
{
return
"http://192.168.18.125:3000/h5"
;
}
else
{
return
"https://bpohhr.gongsibao.com/h5"
;
}
}
},
reqEsDevUrl
:
"http://192.168.4.249:9200/"
,
domain
:
function
()
{
...
...
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