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

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



See merge request !293

@@ -34,6 +34,13 @@
 		<a href="/">随便逛逛</a>
 		<a href="{{orderUrl}}">查看订单</a>
 	</div>
+	<div class="wx-footer">
+        <div class="icon-pic"></div>
+        <div class="tips">
+        	<div class="copy">你购物，我买单。</div>
+            <div class="intro">微信搜索公众号“有货YOHOBUY"关注赢免单！</div>
+        </div>
+    </div>
 	{{# banner}}
 	{{#data}}
 	<a href="{{url}}" class="ad-pic" alt="{{alt}}">

@@ -32,6 +32,13 @@
 		<a href="/">随便逛逛</a>
 		<a href="{{orderUrl}}">查看订单</a>
 	</div>
+	<div class="wx-footer">
+        <div class="icon-pic"></div>
+        <div class="tips">
+        	<div class="copy">你购物，我买单。</div>
+            <div class="intro">微信搜索公众号“有货YOHOBUY"关注赢免单！</div>
+        </div>
+    </div>
 	{{# banner}}
 	{{#data}}
 	<a href="{{url}}" class="ad-pic" alt="{{alt}}">

@@ -155,13 +155,6 @@
                 {{/if}}
             {{/if}}
         </div>
-        <div class="wx-footer">
-            <div class="iconfont">&#xe63c;</div>
-            <div class="tip">
-            <div class="copy">微信搜索 “<span id="wx-name">Yoho!Buy有货</span>”<a class="copy-wx hide">【点击复制】</a>关注</div>
-                <div class="intro">首次绑定账户可获得50个有货币，更有免单抽奖等着您</div>
-            </div>
-        </div>
     </div>
 
     <div class="reason-mask">

@@ -60,7 +60,6 @@
         width: 100%;
         height: 102px;
         background-color: #fff;
-        border-bottom: solid 1px #e0e0e0;
         padding: 0 25px;
 
         a {
@@ -141,4 +140,36 @@
         position: absolute;
         z-index: 3;
     }
+
+    .wx-footer {
+        width: 100%;
+        min-height: 95px;
+        background-color: #fff;
+        border-bottom: solid 1px #e0e0e0;
+        padding: 0 25px 20px;
+
+        .icon-pic {
+            width: 49px;
+            height: 49px;
+            background-image: resolve("home/wechat.png");
+            background-size: 100%;
+            float: left;
+        }
+
+        .tips {
+            margin-left: 20px;
+            float: left;
+            width: 520px;
+
+            .copy {
+                font-size: 24px;
+                color: #444;
+            }
+
+            .intro {
+                font-size: 18px;
+                color: #b0b0b0;
+            }
+        }
+    }
 }

@@ -368,46 +368,4 @@
             float: right;
         }
     }
-
-    .wx-footer {
-        width: 100%;
-        height: 95px;
-        background-color: #fff;
-        border-top: solid 1px #e0e0e0;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 1;
-        padding: 20px 25px;
-
-        .iconfont {
-            color: #e0e0e0;
-            font-size: 35px;
-            float: left;
-            width: 50px;
-        }
-
-        .tip {
-            margin-left: 20px;
-            float: left;
-            width: 520px;
-
-            .copy {
-                font-size: 24px;
-                color: #444;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-
-            .intro {
-                font-size: 18px;
-                color: #b0b0b0;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-        }
-    }
 }