Commit 38844234 authored by 曹雷's avatar 曹雷

pull

parent ed7abd98
...@@ -5,31 +5,6 @@ ...@@ -5,31 +5,6 @@
<html class="no-js" xmlns:th="http://www.w3.org/1999/xhtml"> <!--<![endif]--> <html class="no-js" xmlns:th="http://www.w3.org/1999/xhtml"> <!--<![endif]-->
<head> <head>
<script type="text/javascript" src="../static/js/browser.js"></script>
<script th:inline="javascript">
/*<![CDATA[*/
var loginUrl1 = [[${loginUrl1}]];
var loginUrl2 = [[${loginUrl2}]];
var loginUrl3 = [[${loginUrl3}]];
var logId = [[${logId}]];
var loginType = [[${loginType}]];
var ctxPath = /*[[@{/}]]*/ '';
function toLogin(idp) {
var info = new Browser();
var baseUrl = ctxPath + "auth/tologin?logId="+logId+"&oauthType=";
if (idp=="dianjiaoguan") {
window.location.href = baseUrl+ "dianjiaoguan&loginUrl=" + encodeURIComponent(loginUrl1)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
} else if (idp=="edenoperation") {
window.location.href = baseUrl+ "edenoperation&loginUrl=" + encodeURIComponent(loginUrl2)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
} else {
window.location.href = baseUrl+idp+"&loginUrl=" + encodeURIComponent(loginUrl3+"&auth_source="+idp)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
}
}
if (loginType.length > 0){
toLogin(loginType);
}
</script>
<meta charset="utf-8" /> <meta charset="utf-8" />
<!--<meta http-equiv="X-UA-Compatible" content="IE=edge">--> <!--<meta http-equiv="X-UA-Compatible" content="IE=edge">-->
<meta content="" name="description" /> <meta content="" name="description" />
...@@ -39,7 +14,6 @@ ...@@ -39,7 +14,6 @@
<link rel="stylesheet" th:href="@{/static/css/bootstrap.min.css}" /> <link rel="stylesheet" th:href="@{/static/css/bootstrap.min.css}" />
<link rel="stylesheet" th:href="@{/static/css/normalize.css}" /> <link rel="stylesheet" th:href="@{/static/css/normalize.css}" />
<script type="text/javascript" th:src="@{/static/js/jquery-1.10.2.min.js}"></script> <script type="text/javascript" th:src="@{/static/js/jquery-1.10.2.min.js}"></script>
<<<<<<< HEAD
<script type="text/javascript" src="@{/static/js/browser.js}"></script> <script type="text/javascript" src="@{/static/js/browser.js}"></script>
<style> <style>
...@@ -111,63 +85,11 @@ ...@@ -111,63 +85,11 @@
<button class="login-btn-idp login-btn-idp-enable" onclick="toLogin('qp')" type="button">青浦区</button> <button class="login-btn-idp login-btn-idp-enable" onclick="toLogin('qp')" type="button">青浦区</button>
<button class="login-btn-idp" disabled="disabled" onclick="toLogin('fx')" type="button">奉贤区</button> <button class="login-btn-idp" disabled="disabled" onclick="toLogin('fx')" type="button">奉贤区</button>
<button class="login-btn-idp" disabled="disabled" onclick="toLogin('cm')" type="button">崇明区</button> <button class="login-btn-idp" disabled="disabled" onclick="toLogin('cm')" type="button">崇明区</button>
=======
<!--<script src="../js/vendor/modernizr-2.6.2.min.js"></script>-->
</head>
<body id="body" style="display: none">
<!--[if lt IE 7]>
<p class="browsehappy">
You are using an <strong>outdated</strong> browser. Please
<a href="http://browsehappy.com/">upgrade your browser</a> to improve
your experience.
</p>
<![endif]-->
<!-- Add your site or application content here -->
<!-- Add your site or application content here -->
<div class="ds">
<div class="ds-header">
<img class="ds-header-img" th:src="@{/static/img/Rlogo.png}" alt="" />
</div>
<div class="ds-content">
<div class="ds-content-mask">
<p class="ds-content-title">发现服务 · 速享之旅</p>
<div class="ds-content-source">
<div class="ds-content-city">
<div class="ds-content-city-float">
<p>市认证源</p>
<button onclick="toLogin('edenoperation')" class="logo-btn city-btn"
style="background: white url('../static/img/logo-shszjc.png')" type="button"></button>
<button onclick="toLogin('dianjiaoguan')" class="logo-btn city-btn"
style="background: white url('../static/img/logo-tyrz.png')" type="button"></button>
</div>
</div>
<div class="ds-divide-line"></div>
<div class="ds-content-district">
<p>区认证源</p>
<div>
<button onclick="toLogin('qpjy')" class="logo-btn idp-btn" style="background: url('../static/img/logo-qp.png')"
type="button"></button>
<button onclick="toLogin('jsjy')" class="logo-btn idp-btn logo-btn-mask" disabled="disabled"
style="background: url('../static/img/logo-js.png')" type="button"></button>
<button onclick="toLogin('hpjy')" class="logo-btn idp-btn logo-btn-mask" disabled="disabled"
style="background: url('../static/img/logo-hp.png')" type="button"></button>
<button onclick="toLogin('fxjy')" class="logo-btn idp-btn logo-btn-mask" disabled="disabled"
style="background: url('../static/img/logo-fx.png')" type="button"></button>
<button onclick="toLogin('pdjy')" class="logo-btn idp-btn logo-btn-mask" disabled="disabled"
style="background: url('../static/img/logo-pd.png')" type="button"></button>
<button onclick="toLogin('ypjy')" class="logo-btn idp-btn logo-btn-mask" disabled="disabled"
style="background: url('../static/img/logo-yp.png')" type="button"></button>
<button onclick="toLogin('cnjy')" class="logo-btn idp-btn logo-btn-mask" disabled="disabled"
style="background: url('../static/img/logo-cn.png')" type="button"></button>
</div>
>>>>>>> 789dd4bcb823cf73303fe6d05b16b8c3f8ab75ad
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<<<<<<< HEAD
<div class="footer"> <div class="footer">
<p class="footer-text">版权所有&copy;上海教育认证中心</p> <p class="footer-text">版权所有&copy;上海教育认证中心</p>
</div> </div>
...@@ -193,15 +115,5 @@ ...@@ -193,15 +115,5 @@
} }
} }
</script> </script>
=======
>>>>>>> 789dd4bcb823cf73303fe6d05b16b8c3f8ab75ad
</body> </body>
<script type="text/javascript">
$(document).ready(function(){
$("#body").show();
});
</script>
</html> </html>
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