|
@@ -73,14 +73,17 @@
|
|
|
th:onclick="'javascript:onLine(\'/home/login\');'">登 录
|
|
th:onclick="'javascript:onLine(\'/home/login\');'">登 录
|
|
|
</button>
|
|
</button>
|
|
|
<!--<button type="button" class="button"-->
|
|
<!--<button type="button" class="button"-->
|
|
|
- <!--th:onclick="'javascript:register(\'注册\',\'/home/toRegister\',\'800\',\'500\');'">注 册-->
|
|
|
|
|
|
|
+ <!--th:onclick="'javascript:register(\'注册\',\'/home/toRegister\',\'800\',\'500\');'">注 册-->
|
|
|
<!--</button>-->
|
|
<!--</button>-->
|
|
|
- <button type="button" class="button"
|
|
|
|
|
- th:onclick="'javascript:register(\'注册\',\'/home/chooseRegister\',\'800\',\'500\');'">注 册
|
|
|
|
|
|
|
+ <!-- 20200703 注释老的注册功能-->
|
|
|
|
|
+ <!-- <button type="button" class="button"
|
|
|
|
|
+ th:onclick="'javascript:register(\'注册\',\'/home/chooseRegister\',\'800\',\'500\');'">注 册
|
|
|
|
|
+ </button>-->
|
|
|
<!-- 注释代码为注册功能维护中 -->
|
|
<!-- 注释代码为注册功能维护中 -->
|
|
|
-<!-- <button type="button" class="button"-->
|
|
|
|
|
-<!-- onclick="javascript:alert('注册功能维护中, 敬请谅解...');">注 册-->
|
|
|
|
|
- </button>
|
|
|
|
|
|
|
+ <!--<button type="button" class="button"
|
|
|
|
|
+ onclick="javascript:alert('注册功能维护中, 敬请谅解...');">注 册
|
|
|
|
|
+ </button>-->
|
|
|
|
|
+
|
|
|
<span style="color: #2976CE;text-decoration: underline;cursor: pointer;font-size: 15px; margin: 10px 0;"
|
|
<span style="color: #2976CE;text-decoration: underline;cursor: pointer;font-size: 15px; margin: 10px 0;"
|
|
|
th:onclick="'javascript:reset(\'忘记密码\',\'/home/toReset\',\'800\',\'500\');'">忘记密码
|
|
th:onclick="'javascript:reset(\'忘记密码\',\'/home/toReset\',\'800\',\'500\');'">忘记密码
|
|
|
</span>
|
|
</span>
|
|
@@ -179,24 +182,24 @@
|
|
|
}
|
|
}
|
|
|
//进入工业厂房
|
|
//进入工业厂房
|
|
|
if (industrialCarrier) {
|
|
if (industrialCarrier) {
|
|
|
- window.location.href = pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home';
|
|
|
|
|
|
|
+ window.location.href = pagePath.substring(0, pagePath.lastIndexOf("/")) + '/industry/home/#/home';
|
|
|
// window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
|
|
// window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
//进入工业用地
|
|
//进入工业用地
|
|
|
- if (industrialLand){
|
|
|
|
|
- window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
|
|
|
|
|
|
|
+ if (industrialLand) {
|
|
|
|
|
+ window.open(pagePath.substring(0, pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
//进入新门户首页
|
|
//进入新门户首页
|
|
|
- if (platformHome){
|
|
|
|
|
|
|
+ if (platformHome) {
|
|
|
window.location.href = pagePath + '/index';
|
|
window.location.href = pagePath + '/index';
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//个人用户登录直接进入首页
|
|
//个人用户登录直接进入首页
|
|
|
- if (result.obj.userType === 5){
|
|
|
|
|
- if (activityUrl){
|
|
|
|
|
|
|
+ if (result.obj.userType === 5) {
|
|
|
|
|
+ if (activityUrl) {
|
|
|
window.location.href = activityUrl;
|
|
window.location.href = activityUrl;
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -204,7 +207,7 @@
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (result.obj.firstLogin == null || result.obj.firstLogin == 0) {
|
|
|
|
|
|
|
+ if (result.obj.firstLogin == null || result.obj.firstLogin == 0) {
|
|
|
//第一次登录 取后台改密码
|
|
//第一次登录 取后台改密码
|
|
|
window.location.href = pagePath + "/admin/home";
|
|
window.location.href = pagePath + "/admin/home";
|
|
|
//window.open(pagePath + "/admin/home");
|
|
//window.open(pagePath + "/admin/home");
|
|
@@ -253,7 +256,7 @@
|
|
|
|
|
|
|
|
function register(title, url, w, h) {
|
|
function register(title, url, w, h) {
|
|
|
var index = layer_show(title, pagePath + url, w, h);
|
|
var index = layer_show(title, pagePath + url, w, h);
|
|
|
- console.log("登录页:"+index);
|
|
|
|
|
|
|
+ console.log("登录页:" + index);
|
|
|
//默认全屏
|
|
//默认全屏
|
|
|
layer.full(index);
|
|
layer.full(index);
|
|
|
}
|
|
}
|