Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
htoooth
8 years ago
Commit
10d61a97c21499813df9ffaff07622078adc7c85
1 parent
e19b9436
set cookie refer
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
17 deletions
apps/passport/controllers/login.js
public/js/passport/login.page.js
public/js/passport/login/index.js
public/js/passport/reg.page.js
public/js/passport/reg/reg.js
apps/passport/controllers/login.js
View file @
10d61a9
...
...
@@ -75,7 +75,7 @@ const common = {
let
refer
=
req
.
query
.
refer
||
req
.
get
(
'Referer'
);
refer
&&
res
.
cookie
(
'refer'
,
encodeURI
(
refer
),
{
domain
:
'yohobuy.com'
domain
:
'
.
yohobuy.com'
});
next
();
},
...
...
@@ -122,11 +122,7 @@ const local = {
areaName
=
area
?
area
.
name
:
''
;
}
let
refer
=
req
.
query
.
refer
;
refer
&&
res
.
cookie
(
'refer'
,
encodeURI
(
refer
),
{
domain
:
'yohobuy.com'
});
let
refer
=
req
.
query
.
refer
||
req
.
cookies
.
refer
||
req
.
get
(
'Referer'
);
PassportHelper
.
getLeftBannerAsync
(
SIGNIN_LEFT_BANNER_CODE
).
then
(
cover
=>
{
res
.
render
(
'login'
,
{
...
...
public/js/passport/login.page.js
View file @
10d61a9
require
(
'./login/index'
);
require
(
'../common'
);
require
(
'./login/index'
);
...
...
public/js/passport/login/index.js
View file @
10d61a9
...
...
@@ -912,6 +912,24 @@ function authUntilThreeTimesAsync() {
});
}
// 设置 refer 信息
function
setRefer
()
{
var
refer
=
queryString
().
refer
||
''
,
// eslint-disable-line
regUrl
;
setCookie
(
'refer'
,
refer
);
// eslint-disable-line
regUrl
=
(
function
()
{
if
(
refer
)
{
return
'/reg.html?refer='
+
refer
;
}
else
{
return
'/reg.html'
;
}
}());
$
(
'.fast-reg'
).
attr
(
'href'
,
regUrl
);
}
/** ************************************************************************/
/* 事件绑定 */
/** ************************************************************************/
...
...
@@ -948,7 +966,7 @@ $(document).on('click', function(e) {
/** ************************************************************************/
// 邮箱自动完成后失去焦点:仅进行本地格式验证格式;
// 邮箱自动完成后失去焦点:仅进行本地格式验证格式;
mailAc
(
$accountInput1
,
function
()
{
return
currentLogin
.
validateAccountLocal
();
});
...
...
@@ -1128,6 +1146,9 @@ if (($accountInput1.val() !== '' ||
$passwordInput
.
focus
();
}
// 设置 refer
setRefer
();
/** ************************************************************************/
/* 结束 */
/** ************************************************************************/
...
...
public/js/passport/reg.page.js
View file @
10d61a9
var
reg
=
require
(
'./reg/reg'
);
reg
.
init
(
'reg'
);
require
(
'../common'
);
reg
.
init
(
'reg'
);
...
...
public/js/passport/reg/reg.js
View file @
10d61a9
...
...
@@ -252,7 +252,6 @@ function validateRule(page, $element, callback) {
regionCode
;
// 根据需求http://redmine.yoho.cn/issues/3117改成上边的正则
// 对应的错误提示语也改了,感觉要不了多久就会改回来
// pwdReg = /^([a-zA-Z0-9\-\+_!@\#$%\^&\*\(\)\:\;\.=\[\]\\\',\?]){6,20}$/gi;
...
...
@@ -279,7 +278,7 @@ function validateRule(page, $element, callback) {
}
}
// 图形验证码校验
// 图形验证码校验
}
else
if
(
$element
.
hasClass
(
'captcha'
))
{
if
(
val
===
''
)
{
validateResult
[
1
].
message
=
'请输入图形验证码'
;
...
...
@@ -304,7 +303,7 @@ function validateRule(page, $element, callback) {
}
// 短信验证码校验
// 短信验证码校验
}
else
if
(
$element
.
hasClass
(
'msg-captcha'
))
{
if
(
val
===
''
)
{
...
...
@@ -329,7 +328,7 @@ function validateRule(page, $element, callback) {
}
}
// 密码校验
// 密码校验
}
else
if
(
$element
.
hasClass
(
'pwd'
))
{
if
(
val
===
''
)
{
validateResult
[
3
].
message
=
'请输入密码'
;
...
...
@@ -349,7 +348,7 @@ function validateRule(page, $element, callback) {
}
return
callback
();
// 二次密码校验
// 二次密码校验
}
else
if
(
$element
.
hasClass
(
'repwd'
))
{
if
(
val
===
''
)
{
validateResult
[
4
].
message
=
'请输入密码确认'
;
...
...
@@ -572,9 +571,9 @@ exports.init = function(page) {
}).
blur
(
function
()
{
/* validateRule($(this), function() {
showErrTip();
showBorder(); // 显示红色边框
});*/
showErrTip();
showBorder(); // 显示红色边框
});*/
});
$regionSelect
.
change
(
function
()
{
...
...
@@ -721,4 +720,15 @@ exports.init = function(page) {
$countDown
.
text
(
countDown
--
);
},
1000
);
}
// 设置 refer 信息
(
function
()
{
var
refer
=
queryString
().
refer
||
''
;
// eslint-disable-line
if
(
refer
)
{
setCookie
(
'refer'
,
refer
);
// eslint-disable-line
}
else
{
setCookie
(
'refer'
,
''
);
// eslint-disable-line
}
}());
};
...
...
Please
register
or
login
to post a comment