|
|
@@ -25,8 +25,7 @@
|
|
|
bottom: 4%; */
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
- /* padding-right: 44px; */
|
|
|
- margin: .32rem 0;
|
|
|
+ margin: .16rem 0 0.56rem;
|
|
|
width: 100%;
|
|
|
height: 36px;
|
|
|
}
|
|
|
@@ -94,6 +93,9 @@
|
|
|
.layou_top .info_box > div.active-tip-group::after {
|
|
|
content: unset;
|
|
|
}
|
|
|
+ #header {
|
|
|
+ height: unset;
|
|
|
+ }
|
|
|
#header .cancle{
|
|
|
position: absolute;
|
|
|
top: .84rem;
|
|
|
@@ -107,11 +109,9 @@
|
|
|
height: 100%;
|
|
|
}
|
|
|
.active-tip-group {
|
|
|
- position: relative;
|
|
|
-
|
|
|
+ /* position: relative; */
|
|
|
/* background: url('{{Msg "seo" "cdn"}}/common-module/active/2022.4.1/app.png?v={{Msg "seo" "version"}}') no-repeat; */
|
|
|
margin: 0 auto;
|
|
|
- margin-top: 0.4rem;
|
|
|
width: 6.86rem;
|
|
|
/* height: 2.56rem; */
|
|
|
background-size: contain;
|
|
|
@@ -119,10 +119,9 @@
|
|
|
.active-tip-group img {
|
|
|
width: 100%;
|
|
|
}
|
|
|
-
|
|
|
</style>
|
|
|
<body>
|
|
|
- <div class="page-container">
|
|
|
+ <div class="page-container j-container">
|
|
|
<div class="page-main">
|
|
|
<div id="header" class="header-login">
|
|
|
<!-- <a href="javascript:;" class="cancle"><span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span></a>
|
|
|
@@ -177,34 +176,42 @@
|
|
|
<span id="sendIdentCode">获取验证码</span>
|
|
|
</div>
|
|
|
<button type="button" id="btn" class="disabled btn" />登录</button>
|
|
|
- <div class="forget center">
|
|
|
+ <div class="forget center form-bottom-actions">
|
|
|
<a class="forget-password" href="javascript:void(0)">忘记密码？</a>
|
|
|
- <a href="javascript:void(0)" class="fast-login-open-link" style="display: none;">本机号码一键登录</a>
|
|
|
+ <a class="user-register" href="javascript:void(0)">新用户注册</a>
|
|
|
<!-- <span class="tip">未注册用户验证通过后自动注册</span> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!--微信登录start-->
|
|
|
- <div class="wx">
|
|
|
- <div class="third_title">
|
|
|
- <div class="third_line"></div>
|
|
|
- <div style="padding: 0 12px;">第三方登录</div>
|
|
|
- <div class="third_line"></div>
|
|
|
+ </div>
|
|
|
+ <!--微信登录start-->
|
|
|
+ <!-- <div class="third_title">
|
|
|
+ <div class="third_line"></div>
|
|
|
+ <div style="padding: 0 12px;">第三方登录</div>
|
|
|
+ <div class="third_line"></div>
|
|
|
+ </div> -->
|
|
|
+ <div class="login-placeholder"></div>
|
|
|
+ <div class="footer-container">
|
|
|
+ <div class="third-and-fast-login-container">
|
|
|
+ <div class="fast-login-item">
|
|
|
+ <a href="javascript:void(0)" class="fast-login-open-link" style="display: none;">本机号码一键登录</a>
|
|
|
+ </div>
|
|
|
+ <div class="fast-login-item wx">
|
|
|
+ <div class=" third_wx">
|
|
|
+ <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/images/login_wx.png?v={{Msg "seo" "version"}}">
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="third_wx">
|
|
|
- <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/images/login_wx.png?v={{Msg "seo" "version"}}">
|
|
|
+ <!--微信登录end-->
|
|
|
+ <div class="rules">
|
|
|
+ <label for="ifagree" class="selectlabel">
|
|
|
+ <input type="checkbox" id="ifagree">
|
|
|
+ <span class="checkbox-custom selectcheck"></span>
|
|
|
+ <span class="agreeleft selectcheck">已阅读并同意</span><a id="permission">《使用协议》</a><a id="privacy">《隐私政策》</a>
|
|
|
+ </label>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!--微信登录end-->
|
|
|
- <div class="rules">
|
|
|
- <label for="ifagree" class="selectlabel">
|
|
|
- <input type="checkbox" id="ifagree">
|
|
|
- <span class="checkbox-custom selectcheck"></span>
|
|
|
- <span class="agreeleft selectcheck">已阅读并同意</span><a id="permission">《使用协议》</a><a id="privacy">《隐私政策》</a>
|
|
|
- </label>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
</div>
|
|
|
<div class="toast_readtips" style="display: none;">
|
|
|
<div class="toast_content">
|
|
|
@@ -230,9 +237,19 @@
|
|
|
* @param {Array|String} active_codes_map 广告id标识符--数组集合["jy-wx-course-pay-success"]
|
|
|
* @parRam {String} isAppsion 请求环境、app、weixin、pc
|
|
|
*/
|
|
|
- getActive.getActiveInfo(Activedata,'Applink')
|
|
|
+ getActive.getActiveInfo(Activedata,'Applink', undefined, () => {
|
|
|
+ calcPlaceholderHeight()
|
|
|
+ })
|
|
|
</script>
|
|
|
<script type="text/javascript">
|
|
|
+ function calcPlaceholderHeight() {
|
|
|
+ const containerH = $('.page-container').height()
|
|
|
+ const mainH = $('.page-main').height()
|
|
|
+ const footerH = $('.footer-container').height()
|
|
|
+ const yu = containerH - mainH - footerH - 80
|
|
|
+
|
|
|
+ $('.login-placeholder').css({ height: yu + 'px' })
|
|
|
+ }
|
|
|
// var platform = utils.isWeiXinBrowser ? 'wx' : 'app'
|
|
|
// 注册埋点
|
|
|
function trackClick (c_type) {
|
|
|
@@ -266,9 +283,20 @@
|
|
|
var hideNum = 0
|
|
|
var timer = null
|
|
|
var platform = utils.$envs
|
|
|
+
|
|
|
+ function showWxLoginIcon(f) {
|
|
|
+ if (f) {
|
|
|
+ $('.wx').show()
|
|
|
+ $('.fast-login-open-link').removeClass('no-right-line')
|
|
|
+ } else {
|
|
|
+ $('.wx').hide()
|
|
|
+ $('.fast-login-open-link').addClass('no-right-line')
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// s-- h5状态下隐藏微信登录 --s
|
|
|
if (platform.inH5) {
|
|
|
- $('.wx').hide()
|
|
|
+ showWxLoginIcon(false)
|
|
|
}
|
|
|
// e-- h5状态下隐藏微信登录 -- e
|
|
|
// s-- 删除注册页缓存 -- s
|
|
|
@@ -330,6 +358,10 @@
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ $('.user-register').on('tap', function() {
|
|
|
+ toggleLoginTypeClass('login-code')
|
|
|
+ })
|
|
|
+
|
|
|
function toggleLoginTypeClass (type) {
|
|
|
$(".header-tab>a").removeClass("header-tab-active");
|
|
|
$(".header-tab>a[name=" + type + "]").addClass("header-tab-active");
|
|
|
@@ -337,14 +369,16 @@
|
|
|
$(".login .onePass").show();
|
|
|
$(".login .code").css("display","none");
|
|
|
$(".header-tab>i").css("left",left_2);
|
|
|
- $('.forget-password').show()
|
|
|
+ // $('.forget-password').show()
|
|
|
+ $('.form-bottom-actions.forget').show()
|
|
|
$('.login .forget').addClass('flex')
|
|
|
$('#btn').text('登录')
|
|
|
} else {
|
|
|
$(".login .onePass").hide();
|
|
|
$(".login .code").css("display","table");
|
|
|
$(".header-tab>i").css("left",left_1);
|
|
|
- $('.forget-password').hide()
|
|
|
+ // $('.forget-password').hide()
|
|
|
+ $('.form-bottom-actions.forget').hide()
|
|
|
$('.login .forget').removeClass('flex')
|
|
|
$('#btn').text('登录')
|
|
|
}
|
|
|
@@ -663,11 +697,11 @@
|
|
|
if(kbTimeout != null){
|
|
|
clearTimeout(kbTimeout);
|
|
|
}
|
|
|
- $(".wx").hide();
|
|
|
+ showWxLoginIcon(false)
|
|
|
}
|
|
|
function afterKeyboardHide(){
|
|
|
kbTimeout = setTimeout(function(){
|
|
|
- $(".wx").show();
|
|
|
+ showWxLoginIcon(true)
|
|
|
},300);
|
|
|
}
|
|
|
var kicked = {{.T.kicked}};
|
|
|
@@ -681,7 +715,7 @@
|
|
|
try{
|
|
|
//是否安装了微信
|
|
|
if(JyObj.isInstallWeixin()==0){
|
|
|
- $(".wx").hide();
|
|
|
+ showWxLoginIcon(false)
|
|
|
}
|
|
|
}catch(e){}
|
|
|
if(getUrlParam("flag")=="kicked" || getUrlParam("flag")=="quit"){
|
