|
|
@@ -463,7 +463,7 @@ function checkCounts() {
|
|
|
//查询用户信息，响应页面登录信息
|
|
|
var logic = function(data,num){
|
|
|
if(data.result=="ok"){
|
|
|
- //判断是否需要设置cookie
|
|
|
+ //判断是否需要设置cookie
|
|
|
if(data.cValue){
|
|
|
afterLoginSetCookit(data.cName,data.cValue,data.expires)
|
|
|
}
|
|
|
@@ -498,7 +498,8 @@ var logic = function(data,num){
|
|
|
phone: '',
|
|
|
avatar: data.s_headimage || ''
|
|
|
})
|
|
|
- if (typeof window.GuideIntroDialog === 'function') {
|
|
|
+ var skipInit = location.href.indexOf('/notin/page') !== -1
|
|
|
+ if (!skipInit && typeof window.GuideIntroDialog === 'function') {
|
|
|
window.guideIntroDialog = new GuideIntroDialog()
|
|
|
}
|
|
|
try{
|
|
|
@@ -737,7 +738,7 @@ var signout = function(){
|
|
|
clearLoginStorage(/-login-clear/)
|
|
|
afterSignoutClearCookit();
|
|
|
// window.location.href="/";
|
|
|
- var pt = new RegExp("^/article/content/.+$|^/front/dataExport/.+$|^/front/course/codePay$|^/front/course/orderPay$|^/entpc/.+$|^/bid/pc/page/.+$");
|
|
|
+ var pt = new RegExp("^/article/content/.+$|^/front/dataExport/.+$|^/front/common(Footer|Header)|^/front/course/codePay$|^/front/course/orderPay$|^/entpc/.+$|^/bid/pc/page/.+$");
|
|
|
if(pt.test(window.location.pathname)){
|
|
|
window.location.href="/";
|
|
|
}else{
|
|
|
@@ -1878,7 +1879,7 @@ function openLoginDig(type, redirectUrl) {
|
|
|
var injectLogic = logic
|
|
|
logic = function (data, num) {
|
|
|
if (data.result === 'ok') {
|
|
|
- //判断是否需要设置cookie
|
|
|
+ //判断是否需要设置cookie
|
|
|
if(data.cValue){
|
|
|
afterLoginSetCookit(data.cName,data.cValue,data.expires)
|
|
|
}
|
|
|
@@ -1984,7 +1985,7 @@ var loginDialog = {
|
|
|
// $parent.find('.auto-login-checkbox').toggleClass('checked')
|
|
|
// $parent.find('.auto-login-container').toggleClass('checked')
|
|
|
// _this.chcekBindKeep(this)
|
|
|
-
|
|
|
+
|
|
|
// 手机号验证码自动登录、手机号密码自动登录、微信 下次自动登录 状态同步
|
|
|
$('.auto-login-checkbox').toggleClass('checked')
|
|
|
$('.auto-login-container').toggleClass('checked')
|
