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 @@ @@ -372,12 +372,20 @@
372 <span class="qrcode-img">&nbsp;</span> 372 <span class="qrcode-img">&nbsp;</span>
373 </a> 373 </a>
374 <div class="download-app-box"> 374 <div class="download-app-box">
375 - <div class="qr-img"></div>  
376 - <h5 class="qr-words">扫描二维码</h5>  
377 - <h5 class="qr-words">下载YohoBuy手机端</h5>  
378 - <h5 class="qr-more">  
379 - <a href="//www.yohobuy.com/download/app" target="_blank">更多客户端下载</a>  
380 - </h5> 375 + <div class="download-app-left">
  376 + <div class="qr-code-img we-chat-code"></div>
  377 + <h5 class="qr-words">微信扫一扫</h5>
  378 + <h5 class="qr-words">关注"有货YOHOBUY"</h5>
  379 + <p class="qr-more">抽取限量球鞋还可赢免单大奖</p>
  380 + </div>
  381 + <div class="download-app-right">
  382 + <div class="qr-code-img mobile-code"></div>
  383 + <h5 class="qr-words">扫描二维码</h5>
  384 + <h5 class="qr-words">下载YohoBuy手机端</h5>
  385 + <h5 class="qr-more">
  386 + <a href="//www.yohobuy.com/download/app" target="_blank">更多客户端下载</a>
  387 + </h5>
  388 + </div>
381 </div> 389 </div>
382 </div> 390 </div>
383 <div class="layer-box return-top"> 391 <div class="layer-box return-top">
@@ -59,12 +59,22 @@ @@ -59,12 +59,22 @@
59 </li> 59 </li>
60 </ul> 60 </ul>
61 </li> 61 </li>
62 - <li class="phoneapp"> 62 + <li class="we-chat download-code">
  63 + <span class="tag-seprate"></span>
  64 + <span class="iconfont">&#xe704;</span>
  65 + <a href="">关注有货</a>
  66 + <div class="download-app-box">
  67 + <div class="we-chat-img code-img"></div>
  68 + <h5 class="qr-words light">微信扫一扫</h5>
  69 + <h5 class="qr-words">关注公众号，赢免单</h5>
  70 + </div>
  71 + </li>
  72 + <li class="phoneapp download-code">
63 <span class="tag-seprate"></span> 73 <span class="tag-seprate"></span>
64 <span class="icon-phone"></span> 74 <span class="icon-phone"></span>
65 <a href="//www.yohobuy.com/download/app">手机版</a> 75 <a href="//www.yohobuy.com/download/app">手机版</a>
66 <div class="download-app-box"> 76 <div class="download-app-box">
67 - <div class="qr-img"></div> 77 + <div class="qr-img code-img"></div>
68 <h5 class="qr-words">扫描二维码</h5> 78 <h5 class="qr-words">扫描二维码</h5>
69 <h5 class="qr-words">下载有货手机客户端</h5> 79 <h5 class="qr-words">下载有货手机客户端</h5>
70 <h5 class="qr-more"> 80 <h5 class="qr-more">
@@ -87,12 +97,12 @@ @@ -87,12 +97,12 @@
87 {{#if ico}} 97 {{#if ico}}
88 <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}} class="menu-ico"></a> 98 <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}} class="menu-ico"></a>
89 {{^}} 99 {{^}}
90 - <h3 class="name-cn"> 100 + <h5 class="name-cn">
91 <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{cn}}</a> 101 <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{cn}}</a>
92 - </h3>  
93 - <h3 class="name-en"> 102 + </h5>
  103 + <h5 class="name-en">
94 <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{en}}</a> 104 <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{en}}</a>
95 - </h3> 105 + </h5>
96 {{/if}} 106 {{/if}}
97 </li> 107 </li>
98 {{/ navbars}} 108 {{/ navbars}}
No preview for this file type
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -Created by FontForge 20120731 at Tue Mar 28 17:43:41 2017 5 +Created by FontForge 20120731 at Wed Mar 29 14:41:39 2017
6 By admin 6 By admin
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
No preview for this file type
No preview for this file type
@@ -90,6 +90,12 @@ $('.phoneapp').mouseenter(function() { @@ -90,6 +90,12 @@ $('.phoneapp').mouseenter(function() {
90 _hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line 90 _hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); // eslint-disable-line
91 }); 91 });
92 92
  93 +$('.we-chat').mouseenter(function() {
  94 + _hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
  95 +}).click(function() {
  96 + _hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
  97 +});
  98 +
93 // handlebars模板 99 // handlebars模板
94 centerFn = handlebars.compile($('#simple-account-info-tpl').html() || ''); 100 centerFn = handlebars.compile($('#simple-account-info-tpl').html() || '');
95 loginFn = handlebars.compile($('#header-login-info-tpl').html() || ''); 101 loginFn = handlebars.compile($('#header-login-info-tpl').html() || '');
@@ -396,24 +396,52 @@ @@ -396,24 +396,52 @@
396 .download-app-box { 396 .download-app-box {
397 position: absolute; 397 position: absolute;
398 bottom: -80px; 398 bottom: -80px;
399 - left: -231px;  
400 - width: 231px;  
401 - height: 290px; 399 + left: -412px;
  400 + width: 412px;
  401 + height: 288px;
  402 + padding-left: 23px;
  403 + padding-right: 23px;
402 background-color: #f8f8f8; 404 background-color: #f8f8f8;
403 z-index: 1000; 405 z-index: 1000;
404 display: none; 406 display: none;
405 border: 1px solid #b0b0b0; 407 border: 1px solid #b0b0b0;
  408 + *zoom: 1;
406 409
407 - .qr-img { 410 + &:after {
  411 + display: block;
  412 + content: " ";
  413 + height: 0;
  414 + visibility: hidden;
  415 + font-size: 0;
  416 + clear: both;
  417 + }
  418 +
  419 + .download-app-left,
  420 + .download-app-right {
  421 + float: left;
  422 + width: 182px;
  423 + text-align: center;
  424 + }
  425 +
  426 + .qr-code-img {
408 position: relative; 427 position: relative;
409 - background-image: resolve("layout/qr.png");  
410 - background-repeat: no-repeat;  
411 - background-size: 100% 100%;  
412 margin: 32px auto 15px; 428 margin: 32px auto 15px;
413 width: 143px; 429 width: 143px;
414 height: 147px; 430 height: 147px;
415 } 431 }
416 432
  433 + .we-chat-code {
  434 + background-image: resolve("layout/qr-weixin.png");
  435 + background-repeat: no-repeat;
  436 + background-size: 100% 100%;
  437 + }
  438 +
  439 + .mobile-code {
  440 + background-image: resolve("layout/qr.png");
  441 + background-repeat: no-repeat;
  442 + background-size: 100% 100%;
  443 + }
  444 +
417 .qr-words { 445 .qr-words {
418 height: 25px; 446 height: 25px;
419 line-height: 25px; 447 line-height: 25px;
@@ -428,6 +456,10 @@ @@ -428,6 +456,10 @@
428 font-size: 14px; 456 font-size: 14px;
429 text-align: center; 457 text-align: center;
430 } 458 }
  459 +
  460 + p.qr-more {
  461 + margin-top: 0;
  462 + }
431 } 463 }
432 } 464 }
433 465
@@ -241,20 +241,32 @@ @@ -241,20 +241,32 @@
241 position: absolute; 241 position: absolute;
242 top: 32px; 242 top: 32px;
243 margin-left: -100px; 243 margin-left: -100px;
244 - width: 231px;  
245 - height: 290px; 244 + width: 229px;
  245 + height: 288px;
246 background-color: #f8f8f8; 246 background-color: #f8f8f8;
  247 + border: 1px solid #b0b0b0;
247 z-index: 1000; 248 z-index: 1000;
248 display: none; 249 display: none;
249 250
  251 + .code-img {
  252 + position: relative;
  253 + margin: 32px auto 15px;
  254 + width: 143px;
  255 + height: 147px;
  256 + }
  257 +
250 .qr-img { 258 .qr-img {
251 position: relative; 259 position: relative;
252 background-image: resolve("layout/qr.png"); 260 background-image: resolve("layout/qr.png");
253 background-repeat: no-repeat; 261 background-repeat: no-repeat;
254 background-size: 100% 100%; 262 background-size: 100% 100%;
255 - margin: 32px auto 15px;  
256 - width: 143px;  
257 - height: 147px; 263 + }
  264 +
  265 + .we-chat-img {
  266 + position: relative;
  267 + background-image: resolve("layout/qr-weixin.png");
  268 + background-repeat: no-repeat;
  269 + background-size: 100% 100%;
258 } 270 }
259 271
260 .qr-words { 272 .qr-words {
@@ -272,8 +284,29 @@ @@ -272,8 +284,29 @@
272 } 284 }
273 } 285 }
274 286
275 - .phoneapp:hover {  
276 - background-color: #dcdcdc; 287 + .we-chat.download-code {
  288 + & > a {
  289 + color: #86bf4a;
  290 + }
  291 +
  292 + & > .iconfont {
  293 + font-size: 14px;
  294 + color: #86bf4a;
  295 + }
  296 +
  297 + .light {
  298 + color: #444;
  299 + padding-top: 5px;
  300 + }
  301 +
  302 + .download-app-box {
  303 + height: 268px;
  304 + margin-left: -68px;
  305 + }
  306 + }
  307 +
  308 + .download-code:hover {
  309 + background-color: #eaeceb;
277 310
278 .download-app-box { 311 .download-app-box {
279 display: block; 312 display: block;