Merge branch 'featrue/4.5' into release/4.5

@@ -200,8 +200,13 @@ function reMarginFooter(fixedElement) {
 
 
     window._ozuid = uid;//暴露ozuid
     window._ozuid = uid;//暴露ozuid
 
 
-    if (window._yas) {
+    if (window._yas && $('.buriedpoint')) {
         window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', uid, '', '');
         window._yas(1 * new Date(), '1.0.14', 'yohobuy_m', uid, '', '');
+        $('.buriedpoint').each(function() {
+            $(this).click(function(e) {
+                window._yas.sendMouseEvent(e);
+            });
+        });
     }
     }
 }());
 }());
 
 

@@ -102,7 +102,22 @@
             }
             }
         }
         }
     }
     }
-
+    .dollar{
+        background: #ffffff;
+        padding: 0.5rem 0.75rem;
+        height:1.5rem;
+        line-height:1.5rem;
+        font-size:0.7rem ;
+        .bg-dollar{
+            display: inline-block;
+            width: 0.6rem;
+            height: 0.6rem;
+            background: url('/me/yoho-coin/dollar.png') center center;
+            background-size: 100% 100%;
+            vertical-align: middle;
+        }
+        
+    }
     .opt {
     .opt {
         text-align: right;
         text-align: right;
         border-top: 1px solid #e0e0e0;
         border-top: 1px solid #e0e0e0;

@@ -22,9 +22,9 @@
                 <span class="iconfont">&#xe632;</span>
                 <span class="iconfont">&#xe632;</span>
 
 
                 <p class="beside-icon sub-content">
                 <p class="beside-icon sub-content">
-                    <span class="sub-title">{{orderStatus}}</span>
-                    <span>订单编号：{{orderNum}}</span>
-                    <span class='order-time'>下单时间：{{orderTime}}</span>
+                	<span class="sub-title">订单编号：{{orderNum}}</span>
+                    <span >订单状态：{{orderStatus}}</span>
+                    <span>下单时间：{{orderTime}}</span>
                 </p>
                 </p>
             </div>
             </div>
             {{#if logisticsUrl}}
             {{#if logisticsUrl}}
@@ -76,17 +76,18 @@
                 <span>{{coupon}}</span>
                 <span>{{coupon}}</span>
             </li>
             </li>
             {{/if}}
             {{/if}}
-            {{#if yohoCoin}}
-            <li>
-                YOHO币
-                <span>{{yohoCoin}}</span>
-            </li>
-            {{/if}}
             <li>
             <li>
                 实付金额
                 实付金额
                 <span>{{price}}</span>
                 <span>{{price}}</span>
             </li>
             </li>
         </ul>
         </ul>
+        {{#if yohoCoin}}
+            <p class="dollar">
+                <span class="bg-dollar"></span>
+                共返YOHO币:
+                <span>{{yohoCoin}}</span>个
+            </p>
+        {{/if}}
 
 
         <div class="opt block">
         <div class="opt block">
             {{#unless unreceived}}
             {{#unless unreceived}}
@@ -100,10 +101,10 @@
                 <li>
                 <li>
                     <span class="iconfont count-down-icon">&#xe64a;</span>
                     <span class="iconfont count-down-icon">&#xe64a;</span>
                 </li>
                 </li>
-                <li> 
+                <li>
                     <span class="hours">{{leftTime}}</span>
                     <span class="hours">{{leftTime}}</span>
                 </li>
                 </li>
-            </ul> 
+            </ul>
             <span class="btn btn-cancel">取消订单</span>
             <span class="btn btn-cancel">取消订单</span>
             {{#if payUrl}}
             {{#if payUrl}}
             <a href="{{payUrl}}">
             <a href="{{payUrl}}">