Merge branch 'hotfix/qrCode' into release/seo1113
Showing
9 changed files
with
15 additions
and
24 deletions
@@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
70 | <tr> | 70 | <tr> |
71 | <td>月度购物次数</td> | 71 | <td>月度购物次数</td> |
72 | <td>自然月内达到<span class="ident">1个</span>购物天数且订单已完成</td> | 72 | <td>自然月内达到<span class="ident">1个</span>购物天数且订单已完成</td> |
73 | - <td>20</td> | 73 | + <td>100</td> |
74 | </tr> | 74 | </tr> |
75 | <tr> | 75 | <tr> |
76 | <td>完善资料</td> | 76 | <td>完善资料</td> |
@@ -329,12 +329,16 @@ | @@ -329,12 +329,16 @@ | ||
329 | </a> | 329 | </a> |
330 | <div class="download-app-box"> | 330 | <div class="download-app-box"> |
331 | <div class="download-app-left"> | 331 | <div class="download-app-left"> |
332 | - <div class="qr-code-img we-chat-code"></div> | 332 | + <div class="qr-code-img we-chat-code"> |
333 | + <img src="//img12.static.yhbimg.com/evidenceImages/2017/11/14/10/02c21ad1b55c13f8bcd9ae5b643c3c2374.png"> | ||
334 | + </div> | ||
333 | <h5 class="qr-words">微信扫一扫</h5> | 335 | <h5 class="qr-words">微信扫一扫</h5> |
334 | <h5 class="qr-words">关注公众号,赢免单</h5> | 336 | <h5 class="qr-words">关注公众号,赢免单</h5> |
335 | </div> | 337 | </div> |
336 | <div class="download-app-right"> | 338 | <div class="download-app-right"> |
337 | - <div class="qr-code-img mobile-code"></div> | 339 | + <div class="qr-code-img mobile-code"> |
340 | + <img src="//img11.static.yhbimg.com/evidenceImages/2017/11/14/10/01dce3f4c011e664dcfed9cd836377aeb7.png"> | ||
341 | + </div> | ||
338 | <h5 class="qr-words">下载手机客户端</h5> | 342 | <h5 class="qr-words">下载手机客户端</h5> |
339 | <h5 class="qr-words qr-more"> | 343 | <h5 class="qr-words qr-more"> |
340 | <a href="javascript:void(0);" target="_blank">更多客户端下载</a> | 344 | <a href="javascript:void(0);" target="_blank">更多客户端下载</a> |
public/img/layout/qr-wenle-large.png
0 → 100644
20.8 KB
public/img/layout/qr-wenle-wechat.png
0 → 100644
19 KB
public/img/layout/qr-yifan-large.png
deleted
100644 → 0
25.8 KB
public/img/layout/qr-yifan.png
deleted
100644 → 0
20.2 KB
@@ -471,33 +471,20 @@ | @@ -471,33 +471,20 @@ | ||
471 | float: left; | 471 | float: left; |
472 | width: 130px; | 472 | width: 130px; |
473 | height: 180px; | 473 | height: 180px; |
474 | - padding-top: 140px; | 474 | + padding-top: 10px; |
475 | text-align: center; | 475 | text-align: center; |
476 | background-color: #f4f4f4; | 476 | background-color: #f4f4f4; |
477 | } | 477 | } |
478 | 478 | ||
479 | .qr-code-img { | 479 | .qr-code-img { |
480 | - margin: 0 auto; | 480 | + margin: 10px auto; |
481 | width: 96px; | 481 | width: 96px; |
482 | - height: 168px; | ||
483 | - } | 482 | + height: 96px; |
484 | 483 | ||
485 | - .we-chat-code { | ||
486 | - position: absolute; | ||
487 | - top: -32px; | ||
488 | - left: 18px; | ||
489 | - background-image: resolve("layout/qr-yifan.png"); | ||
490 | - background-repeat: no-repeat; | ||
491 | - background-size: 100% 100%; | 484 | + > img { |
485 | + width: 100%; | ||
486 | + height: 100%; | ||
492 | } | 487 | } |
493 | - | ||
494 | - .mobile-code { | ||
495 | - position: absolute; | ||
496 | - top: -33px; | ||
497 | - right: 18px; | ||
498 | - background-image: resolve("layout/qr-wenle.png"); | ||
499 | - background-repeat: no-repeat; | ||
500 | - background-size: 100% 100%; | ||
501 | } | 488 | } |
502 | 489 | ||
503 | .qr-words { | 490 | .qr-words { |
@@ -331,7 +331,7 @@ | @@ -331,7 +331,7 @@ | ||
331 | 331 | ||
332 | .we-chat-img { | 332 | .we-chat-img { |
333 | position: relative; | 333 | position: relative; |
334 | - background-image: resolve("layout/qr-yifan.png"); | 334 | + background-image: resolve("layout/qr-wenle-wechat.png"); |
335 | background-repeat: no-repeat; | 335 | background-repeat: no-repeat; |
336 | background-size: 100% 100%; | 336 | background-size: 100% 100%; |
337 | } | 337 | } |
@@ -1566,7 +1566,7 @@ | @@ -1566,7 +1566,7 @@ | ||
1566 | .code-img { | 1566 | .code-img { |
1567 | width: 117px; | 1567 | width: 117px; |
1568 | height: 192px; | 1568 | height: 192px; |
1569 | - background-image: resolve("layout/qr-yifan-large.png"); | 1569 | + background-image: resolve("layout/qr-wenle-large.png"); |
1570 | background-repeat: no-repeat; | 1570 | background-repeat: no-repeat; |
1571 | background-size: 100% 100%; | 1571 | background-size: 100% 100%; |
1572 | } | 1572 | } |
-
Please register or login to post a comment