fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit e670f2afeda4a78fb0c0b219791545f500302335 2 parents 5304341f 46971451

Merge branch 'feature/barWeiXin' into release/5.6

Inline Side-by-side
Showing 10 changed files with 116 additions and 27 deletions
... ... @@ -372,12 +372,20 @@
<span class="qrcode-img">&nbsp;</span>
</a>
<div class="download-app-box">
<div class="qr-img"></div>
<h5 class="qr-words">扫描二维码</h5>
<h5 class="qr-words">下载YohoBuy手机端</h5>
<h5 class="qr-more">
<a href="//www.yohobuy.com/download/app" target="_blank">更多客户端下载</a>
</h5>
<div class="download-app-left">
<div class="qr-code-img we-chat-code"></div>
<h5 class="qr-words">微信扫一扫</h5>
<h5 class="qr-words">关注"有货YOHOBUY"</h5>
<p class="qr-more">抽取限量球鞋还可赢免单大奖</p>
</div>
<div class="download-app-right">
<div class="qr-code-img mobile-code"></div>
<h5 class="qr-words">扫描二维码</h5>
<h5 class="qr-words">下载YohoBuy手机端</h5>
<h5 class="qr-more">
<a href="//www.yohobuy.com/download/app" target="_blank">更多客户端下载</a>
</h5>
</div>
</div>
</div>
<div class="layer-box return-top">
... ...
... ... @@ -59,12 +59,22 @@
</li>
</ul>
</li>
<li class="phoneapp">
<li class="we-chat download-code">
<span class="tag-seprate"></span>
<span class="iconfont">&#xe704;</span>
<a href="">关注有货</a>
<div class="download-app-box">
<div class="we-chat-img code-img"></div>
<h5 class="qr-words light">微信扫一扫</h5>
<h5 class="qr-words">关注公众号，赢免单</h5>
</div>
</li>
<li class="phoneapp download-code">
<span class="tag-seprate"></span>
<span class="icon-phone"></span>
<a href="//www.yohobuy.com/download/app">手机版</a>
<div class="download-app-box">
<div class="qr-img"></div>
<div class="qr-img code-img"></div>
<h5 class="qr-words">扫描二维码</h5>
<h5 class="qr-words">下载有货手机客户端</h5>
<h5 class="qr-more">
... ... @@ -87,12 +97,12 @@
{{#if ico}}
<a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}} class="menu-ico"></a>
{{^}}
<h3 class="name-cn">
<h5 class="name-cn">
<a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{cn}}</a>
</h3>
<h3 class="name-en">
</h5>
<h5 class="name-en">
<a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{en}}</a>
</h3>
</h5>
{{/if}}
</li>
{{/ navbars}}
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Tue Mar 28 17:43:41 2017
Created by FontForge 20120731 at Wed Mar 29 14:41:39 2017
By admin
</metadata>
<defs>
... ...
No preview for this file type
No preview for this file type
... ... @@ -90,6 +90,12 @@ $('.phoneapp').mouseenter(function() {
_hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line
});
$('.we-chat').mouseenter(function() {
_hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
}).click(function() {
_hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
});
// handlebars模板
centerFn = handlebars.compile($('#simple-account-info-tpl').html() || '');
loginFn = handlebars.compile($('#header-login-info-tpl').html() || '');
... ...
... ... @@ -396,24 +396,52 @@
.download-app-box {
position: absolute;
bottom: -80px;
left: -231px;
width: 231px;
height: 290px;
left: -412px;
width: 412px;
height: 288px;
padding-left: 23px;
padding-right: 23px;
background-color: #f8f8f8;
z-index: 1000;
display: none;
border: 1px solid #b0b0b0;
*zoom: 1;
.qr-img {
&:after {
display: block;
content: " ";
height: 0;
visibility: hidden;
font-size: 0;
clear: both;
}
.download-app-left,
.download-app-right {
float: left;
width: 182px;
text-align: center;
}
.qr-code-img {
position: relative;
background-image: resolve("layout/qr.png");
background-repeat: no-repeat;
background-size: 100% 100%;
margin: 32px auto 15px;
width: 143px;
height: 147px;
}
.we-chat-code {
background-image: resolve("layout/qr-weixin.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.mobile-code {
background-image: resolve("layout/qr.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.qr-words {
height: 25px;
line-height: 25px;
... ... @@ -428,6 +456,10 @@
font-size: 14px;
text-align: center;
}
p.qr-more {
margin-top: 0;
}
}
}
... ...
... ... @@ -241,20 +241,32 @@
position: absolute;
top: 32px;
margin-left: -100px;
width: 231px;
height: 290px;
width: 229px;
height: 288px;
background-color: #f8f8f8;
border: 1px solid #b0b0b0;
z-index: 1000;
display: none;
.code-img {
position: relative;
margin: 32px auto 15px;
width: 143px;
height: 147px;
}
.qr-img {
position: relative;
background-image: resolve("layout/qr.png");
background-repeat: no-repeat;
background-size: 100% 100%;
margin: 32px auto 15px;
width: 143px;
height: 147px;
}
.we-chat-img {
position: relative;
background-image: resolve("layout/qr-weixin.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.qr-words {
... ... @@ -272,8 +284,29 @@
}
}
.phoneapp:hover {
background-color: #dcdcdc;
.we-chat.download-code {
& > a {
color: #86bf4a;
}
& > .iconfont {
font-size: 14px;
color: #86bf4a;
}
.light {
color: #444;
padding-top: 5px;
}
.download-app-box {
height: 268px;
margin-left: -68px;
}
}
.download-code:hover {
background-color: #eaeceb;
.download-app-box {
display: block;
... ...