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
9 years ago
Commit
57bff9a71df9e6dac2f011381cdf33ede9a83767
1 parent
bbb975f8
add animate
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
15 deletions
apps/passport/views/action/login/index.hbs
apps/product/models/detail-service.js
config/common.js
public/img/passport/qrcode-example.png
public/img/sprite.passport.png
public/js/passport/login/index.js
public/scss/passport/_login.css
apps/passport/views/action/login/index.hbs
View file @
57bff9a
...
...
@@ -135,7 +135,10 @@
<li
class=
"relative clearfix center"
>
<div
id=
"qrcode-placeholder"
style=
"width: 270px;height: 140px;"
></div>
<div
id=
"qrcode-container"
class=
"qrcode"
></div>
<div
id=
"qrcode-helper"
class=
"qrcode-helper hide"
></div>
<div
id=
"qrcode-hover"
class=
"qrcode-hover"
></div>
<div
id=
"qrcode-overlay"
></div>
</li>
...
...
apps/product/models/detail-service.js
View file @
57bff9a
...
...
@@ -339,6 +339,8 @@ const _getSkuDataByProductBaseInfo = (data) => {
// 默认第一张图片
if
(
pos
===
0
)
{
defaultImage
=
helpers
.
image
(
cur
.
colorImage
,
420
,
560
);
console
.
log
(
cur
.
colorImage
);
console
.
log
(
defaultImage
);
}
// 商品的尺码列表
...
...
config/common.js
View file @
57bff9a
...
...
@@ -16,8 +16,8 @@ module.exports = {
siteUrl
:
'http://www.yohobuy.com'
,
domains
:
{
favApi
:
'http://192.168.102.31:8092/brower'
,
api
:
'http://api-test3.yohops.com:9999/'
,
service
:
'http://service-test3.yohops.com:9999/'
,
api
:
'http://api-test1.yohops.com:9999/'
,
service
:
'http://service-test1.yohops.com:9999/'
,
search
:
'http://192.168.102.216:8080/yohosearch/'
},
subDomains
:
{
...
...
public/img/passport/qrcode-example.png
View file @
57bff9a
6.45 MB
|
W:
|
H:
24.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
public/img/sprite.passport.png
View file @
57bff9a
36.3 KB
|
W:
|
H:
43.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
public/js/passport/login/index.js
View file @
57bff9a
...
...
@@ -1093,12 +1093,19 @@ $deviceSwitcher.on('click', function() {
}
});
$qrCodeContainer
.
on
(
'mouseenter'
,
function
()
{
$qrCodeOverLayer
.
addClass
(
'qrcode-overlay-helper'
);
});
$qrCodeOverLayer
.
on
(
'mouseleave'
,
function
()
{
$qrCodeOverLayer
.
removeClass
(
'qrcode-overlay-helper'
);
// 鼠标移动到上面
$
(
'#qrcode-hover'
).
hover
(
function
()
{
$qrCodeContainer
.
stop
(
false
,
true
).
animate
({
left
:
'-=65'
},
{
complete
:
function
()
{
$
(
'#qrcode-helper'
).
removeClass
(
'hide'
);
}
});
},
function
()
{
$qrCodeContainer
.
stop
(
false
,
true
).
animate
({
left
:
'+=65'
},
{
start
:
function
()
{
$
(
'#qrcode-helper'
).
addClass
(
'hide'
);
}
});
});
$qrCodeOverLayer
.
on
(
'click'
,
'#qrcode-refresh-btn'
,
function
()
{
...
...
public/scss/passport/_login.css
View file @
57bff9a
...
...
@@ -266,9 +266,11 @@
}
.qrcode
{
position
:
absolute
;
height
:
140px
;
width
:
140px
;
margin
:
0
auto
;
left
:
65px
;
top
:
0
;
}
.qrcode-overlay
{
...
...
@@ -279,12 +281,13 @@
height
:
160px
;
}
.qrcode-
overlay-
helper
{
.qrcode-helper
{
position
:
absolute
;
background
:
url(/passport/qrcode-example.png)
no-repeat
!important
;
top
:
0
;
width
:
296px
;
height
:
160px
;
top
:
-14px
;
right
:
-45px
;
width
:
167px
;
height
:
150px
;
}
.qrcode-overlay-success
{
...
...
@@ -296,6 +299,14 @@
height
:
140px
;
}
.qrcode-hover
{
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
270px
;
height
:
140px
;
}
.qrcode-overlay-fail
{
position
:
absolute
;
background
:
url(/passport/qrcode-blank.png)
no-repeat
!important
;
...
...
@@ -311,7 +322,7 @@
}
.qrcode-err-tip
{
margin-top
:
40px
;
margin-top
:
40px
;
margin-bottom
:
10px
;
font-weight
:
bold
;
font-size
:
13px
;
...
...
@@ -332,6 +343,6 @@
font-size
:
13px
;
line-height
:
@
height
;
cursor
:
pointer
;
border-radius
:
5px
border-radius
:
5px
}
}
...
...
Please
register
or
login
to post a comment