Commit ed532a51 by 王昆

gsb

parent 5e759c43
...@@ -323,7 +323,7 @@ class EcontractCtl extends CtlBase { ...@@ -323,7 +323,7 @@ class EcontractCtl extends CtlBase {
nameA: nameA, //甲方 必填 nameA: nameA, //甲方 必填
nameB: eaccount.userName, //乙方 必填 nameB: eaccount.userName, //乙方 必填
unit: company.name, //合作单位(国美) 必填---------------------------超出长度风险---目前不知多少长度 unit: company.name, //合作单位(国美) 必填---------------------------超出长度风险---目前不知多少长度
signDateA: today, //甲方签约日期 必填\ signDateA: today, //甲方签约日期 必填
signDateB: today //乙方签约日期 必填 signDateB: today //乙方签约日期 必填
} }
}; };
......
...@@ -931,6 +931,7 @@ class UserCtl extends CtlBase { ...@@ -931,6 +931,7 @@ class UserCtl extends CtlBase {
return domain + "/errpage?errmsg=" + encodeURIComponent(encodeURIComponent("用户唯一标识未传入")); return domain + "/errpage?errmsg=" + encodeURIComponent(encodeURIComponent("用户唯一标识未传入"));
} }
var homePage = settings.apiconfig.sign3rdHomePage();
//默认进入的子页面 //默认进入的子页面
var action = "?from=3rdh5"; var action = "?from=3rdh5";
var app = await this.cacheManager["AppCache"].cacheApp(appkey); var app = await this.cacheManager["AppCache"].cacheApp(appkey);
...@@ -940,10 +941,7 @@ class UserCtl extends CtlBase { ...@@ -940,10 +941,7 @@ class UserCtl extends CtlBase {
req.session.user = existedUser; req.session.user = existedUser;
req.session.app = app; req.session.app = app;
var accountId = await this.cache3rdAccount(existedUser.id, accountInfo); var accountId = await this.cache3rdAccount(existedUser.id, accountInfo);
var url = app.homePage + action; var url = homePage + action;
if (accountId) {
url = url + "&accid=" + accountId;
}
url = url + "&ecid=" + ecid; url = url + "&ecid=" + ecid;
return url; return url;
} }
...@@ -966,10 +964,7 @@ class UserCtl extends CtlBase { ...@@ -966,10 +964,7 @@ class UserCtl extends CtlBase {
req.session.user = existedUser; req.session.user = existedUser;
req.session.app = app; req.session.app = app;
var accountId = await this.cache3rdAccount(existedUser.id, accountInfo); var accountId = await this.cache3rdAccount(existedUser.id, accountInfo);
var url = app.homePage + action; var url = homePage + action;
if (accountId) {
url = url + "&accid=" + accountId;
}
url = url + "&ecid=" + ecid; url = url + "&ecid=" + ecid;
return url; return url;
} }
......
...@@ -87,6 +87,14 @@ var settings = { ...@@ -87,6 +87,14 @@ var settings = {
companyAccountId: function() { companyAccountId: function() {
return "5c25eb4ee3b448da90babec3ce8d1144"; 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/", reqEsDevUrl: "http://192.168.4.249:9200/",
domain: function () { domain: function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment