Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
邱骏
6 years ago
Commit
4d45f94a8de15fdd8e365b30c29e0a7a139dff63
1 parent
702427c8
短信登录增加注册用户判断
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
20 deletions
apps/passport/controllers/sms.js
apps/passport/views/action/reg/reg-success-prize.hbs
package.json
public/img/passport/reg-success-coupon-bg-on-ufo.png
public/js/passport/smslogin/sms-login-new.js
public/scss/passport/reg-success-prize.page.scss
apps/passport/controllers/sms.js
View file @
4d45f94
...
...
@@ -185,6 +185,8 @@ class SmsLogin {
return
;
}
let
isNewUser
=
false
;
// 手机号码已注册 --> 直接登录
req
.
ctx
(
PhoneServiceModel
).
autoSignin
({
profile
:
mobile
,
...
...
@@ -193,10 +195,15 @@ class SmsLogin {
shopping_key
,
from
}).
then
(
info
=>
{
if
(
info
.
code
!==
200
)
{
return
Promise
.
reject
(
info
);
}
if
(
info
.
data
.
nFlag
===
'Y'
)
{
isNewUser
=
true
;
}
res
.
cookie
(
'_LOGIN_TYPE'
,
5
,
{
domain
:
'm.yohobuy.com'
});
...
...
@@ -205,7 +212,8 @@ class SmsLogin {
res
.
json
({
code
:
200
,
message
:
LOGIN_SUCCSS
,
redirect
:
_
.
get
(
authData
,
'refer'
)
||
utils
.
refererLimit
(
req
.
cookies
.
refer
)
redirect
:
_
.
get
(
authData
,
'refer'
)
||
utils
.
refererLimit
(
req
.
cookies
.
refer
),
isNewUser
:
isNewUser
});
delete
req
.
session
.
smsLogin
;
...
...
apps/passport/views/action/reg/reg-success-prize.hbs
View file @
4d45f94
...
...
@@ -13,7 +13,7 @@
<ul>
{{#
each
normalCoupon
}}
<li>
<div
class=
"coupon-info"
>
<div
class=
"coupon-info
{{#if
isUfo
}}
ufo
{{/if}}
"
>
<div
class=
"coupon-left"
>
<p
class=
"coupon-price"
>
{{
amount
}}
</p>
<p
class=
"coupon-condition"
>
{{
useRuleText
}}
</p>
...
...
package.json
View file @
4d45f94
{
"name"
:
"yohobuywap-node"
,
"version"
:
"6.9.8-
1
"
,
"version"
:
"6.9.8-
2
"
,
"private"
:
true
,
"description"
:
"A New Yohobuy Project With Express"
,
"repository"
:
{
...
...
public/img/passport/reg-success-coupon-bg-on-ufo.png
0 → 100644
View file @
4d45f94
11.7 KB
public/js/passport/smslogin/sms-login-new.js
View file @
4d45f94
...
...
@@ -175,8 +175,15 @@ class SmsLoginNew extends Page {
modal
.
show
();
}
console
.
log
(
res
);
setTimeout
(()
=>
{
location
.
href
=
res
.
redirect
;
if
(
res
.
isNewUser
)
{
location
.
href
=
'/regSuccess.html'
;
}
else
{
location
.
href
=
res
.
redirect
;
}
},
1000
);
return
;
}
...
...
public/scss/passport/reg-success-prize.page.scss
View file @
4d45f94
...
...
@@ -97,22 +97,6 @@ body {
overflow
:
hidden
;
}
.not-get
.coupon-info
{
background-image
:
url("img/passport/reg-success-coupon-bg-off.png")
;
}
.not-get
.coupon-left
.coupon-price
{
color
:
#b0b0b0
;
}
.not-get
.coupon-left
.coupon-condition
{
color
:
#b0b0b0
;
}
.not-get
.coupon-right
.coupon-name
{
color
:
#b0b0b0
;
}
.list-title
{
font-size
:
28px
;
color
:
#b0b0b0
;
...
...
@@ -189,6 +173,26 @@ body {
transform
:
translateY
(
-50%
);
border-radius
:
10px
;
}
&
.ufo
{
background-image
:
url("img/passport/reg-success-coupon-bg-on-ufo.png")
;
}
}
.coupon-container
.not-get
.coupon-info
{
background-image
:
url("img/passport/reg-success-coupon-bg-off.png")
;
}
.coupon-container
.not-get
.coupon-left
.coupon-price
{
color
:
#b0b0b0
;
}
.coupon-container
.not-get
.coupon-left
.coupon-condition
{
color
:
#b0b0b0
;
}
.coupon-container
.not-get
.coupon-right
.coupon-name
{
color
:
#b0b0b0
;
}
}
...
...
Please
register
or
login
to post a comment