Authored by 毕凯

Merge branch 'hotfix/raffle' into 'release/5.4.1'

修改订单详情页底部提示文字跟样式



See merge request !293
@@ -34,6 +34,13 @@ @@ -34,6 +34,13 @@
34 <a href="/">随便逛逛</a> 34 <a href="/">随便逛逛</a>
35 <a href="{{orderUrl}}">查看订单</a> 35 <a href="{{orderUrl}}">查看订单</a>
36 </div> 36 </div>
  37 + <div class="wx-footer">
  38 + <div class="icon-pic"></div>
  39 + <div class="tips">
  40 + <div class="copy">你购物,我买单。</div>
  41 + <div class="intro">微信搜索公众号“有货YOHOBUY"关注赢免单!</div>
  42 + </div>
  43 + </div>
37 {{# banner}} 44 {{# banner}}
38 {{#data}} 45 {{#data}}
39 <a href="{{url}}" class="ad-pic" alt="{{alt}}"> 46 <a href="{{url}}" class="ad-pic" alt="{{alt}}">
@@ -32,6 +32,13 @@ @@ -32,6 +32,13 @@
32 <a href="/">随便逛逛</a> 32 <a href="/">随便逛逛</a>
33 <a href="{{orderUrl}}">查看订单</a> 33 <a href="{{orderUrl}}">查看订单</a>
34 </div> 34 </div>
  35 + <div class="wx-footer">
  36 + <div class="icon-pic"></div>
  37 + <div class="tips">
  38 + <div class="copy">你购物,我买单。</div>
  39 + <div class="intro">微信搜索公众号“有货YOHOBUY"关注赢免单!</div>
  40 + </div>
  41 + </div>
35 {{# banner}} 42 {{# banner}}
36 {{#data}} 43 {{#data}}
37 <a href="{{url}}" class="ad-pic" alt="{{alt}}"> 44 <a href="{{url}}" class="ad-pic" alt="{{alt}}">
@@ -155,13 +155,6 @@ @@ -155,13 +155,6 @@
155 {{/if}} 155 {{/if}}
156 {{/if}} 156 {{/if}}
157 </div> 157 </div>
158 - <div class="wx-footer">  
159 - <div class="iconfont">&#xe63c;</div>  
160 - <div class="tip">  
161 - <div class="copy">微信搜索 “<span id="wx-name">Yoho!Buy有货</span><a class="copy-wx hide">【点击复制】</a>关注</div>  
162 - <div class="intro">首次绑定账户可获得50个有货币,更有免单抽奖等着您</div>  
163 - </div>  
164 - </div>  
165 </div> 158 </div>
166 159
167 <div class="reason-mask"> 160 <div class="reason-mask">
@@ -60,7 +60,6 @@ @@ -60,7 +60,6 @@
60 width: 100%; 60 width: 100%;
61 height: 102px; 61 height: 102px;
62 background-color: #fff; 62 background-color: #fff;
63 - border-bottom: solid 1px #e0e0e0;  
64 padding: 0 25px; 63 padding: 0 25px;
65 64
66 a { 65 a {
@@ -141,4 +140,36 @@ @@ -141,4 +140,36 @@
141 position: absolute; 140 position: absolute;
142 z-index: 3; 141 z-index: 3;
143 } 142 }
  143 +
  144 + .wx-footer {
  145 + width: 100%;
  146 + min-height: 95px;
  147 + background-color: #fff;
  148 + border-bottom: solid 1px #e0e0e0;
  149 + padding: 0 25px 20px;
  150 +
  151 + .icon-pic {
  152 + width: 49px;
  153 + height: 49px;
  154 + background-image: resolve("home/wechat.png");
  155 + background-size: 100%;
  156 + float: left;
  157 + }
  158 +
  159 + .tips {
  160 + margin-left: 20px;
  161 + float: left;
  162 + width: 520px;
  163 +
  164 + .copy {
  165 + font-size: 24px;
  166 + color: #444;
  167 + }
  168 +
  169 + .intro {
  170 + font-size: 18px;
  171 + color: #b0b0b0;
  172 + }
  173 + }
  174 + }
144 } 175 }
@@ -368,46 +368,4 @@ @@ -368,46 +368,4 @@
368 float: right; 368 float: right;
369 } 369 }
370 } 370 }
371 -  
372 - .wx-footer {  
373 - width: 100%;  
374 - height: 95px;  
375 - background-color: #fff;  
376 - border-top: solid 1px #e0e0e0;  
377 - position: fixed;  
378 - bottom: 0;  
379 - left: 0;  
380 - right: 0;  
381 - z-index: 1;  
382 - padding: 20px 25px;  
383 -  
384 - .iconfont {  
385 - color: #e0e0e0;  
386 - font-size: 35px;  
387 - float: left;  
388 - width: 50px;  
389 - }  
390 -  
391 - .tip {  
392 - margin-left: 20px;  
393 - float: left;  
394 - width: 520px;  
395 -  
396 - .copy {  
397 - font-size: 24px;  
398 - color: #444;  
399 - overflow: hidden;  
400 - text-overflow: ellipsis;  
401 - white-space: nowrap;  
402 - }  
403 -  
404 - .intro {  
405 - font-size: 18px;  
406 - color: #b0b0b0;  
407 - overflow: hidden;  
408 - text-overflow: ellipsis;  
409 - white-space: nowrap;  
410 - }  
411 - }  
412 - }  
413 } 371 }