Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

@@ -2,6 +2,7 @@
     <div class="order">
     {{# returnsList}}
         {{> common/subtitle}}
+        {{#if list}}
         <div class="table">
             <ul class="header">
                 <li class="info">商品信息</li>
@@ -31,6 +32,9 @@
             </div>
         </div>
         {{/list}}
+        {{^}}
+        <p class="empty-list">您没有退/换货订单!</p>
+        {{/if}}
     {{#if paginationOpts}}
     {{{ pagination paginationOpts }}}
     {{/if}}

@@ -118,7 +118,8 @@ const helpers = {
                 return {
                     id: c.colorId,
                     title: c.colorName,
-                    rgb: c.colorValue ? `url(${c.colorValue})` : '#' + c.colorCode
+                    rgb: c.colorValue ? `url(${c.colorValue})` : '#' + c.colorCode,
+                    bgImg: c.colorValue || ''
                 };
             });
         } else {

@@ -60,6 +60,8 @@ function getOrderList(type, page) {
     }).done(function(res) {
         tableOperation.appendBody(res);
         bindEvent(); // eslint-disable-line
+        countDown.intervalValue = 1000;
+        countDown.showSec = true;
         countDown.start();
     }).fail(function(err) {
         console.log(err);
@@ -346,6 +348,8 @@ function bindEvent() {
 }
 
 bindEvent();
+countDown.intervalValue = 1000;
+countDown.showSec = true;
 countDown.start();
 setOrderTotal();
 

@@ -21,6 +21,7 @@
         img {
             width: 100%;
             height: 100%;
+            margin-top: -1px;
         }
     }
 

@@ -85,7 +85,7 @@
             text-overflow: ellipsis;
             line-height: 18px;
             margin-top: 10px;
-            padding: 0 10px;
+            padding: 0 15px;
         }
 
         .price {

@@ -83,6 +83,7 @@
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
+                padding: 0 15px;
             }
 
             .thumb {

 .returns-wrap {
+    .empty-list {
+        margin-top: 30px;
+        text-align: center;
+    }
     .table {
         width: 100%;
         max-width: 990px;