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

@@ -65,6 +65,7 @@ const getOrderList = (req, res) => {
             page: 'order',
             isMe: true,
             orderList: result.order.orderList,
+            paginationOpts: result.order.paginationOpts,
             orderData: result.order.orderData
         });
     });

@@ -7,7 +7,7 @@
             {{> order/goods-box}}
             <div class="common-column special-border">
                 <p class="bold">¥{{amount}}</p>
-                <p class="subtext">{{paymentTypeStr}}</p>
+                <p class="subtext no-pointer">{{paymentTypeStr}}</p>
                 {{#if isRefundOrder}}
                 <p class="subtext refund-tag">换货订单</p>
                 {{/if}}

@@ -19,7 +19,6 @@ var confirmReceive = require('./order/confirm-receive');
 // 订单剩余时间显示及倒计时
 var countDown = require('./order/countdown');
 
-require('../common/foreach-polyfill');
 
 // 更新表格
 var tableOperation = {
@@ -41,6 +40,8 @@ var typeMap = {
     delivering: 3
 };
 
+require('../common/foreach-polyfill');
+
 // 个人中心共用代码加载
 require('./me');
 
@@ -150,9 +151,9 @@ function updateTableContent($el) {
 
 // 绑定分页点击事件
 function bindPaginationClick() {
-    $('.blk-pagination li').off('click').on('click', function(e) {
+    $('.blk-pagination a').off('click').on('click', function(e) {
         var $this = $(this);
-        var page = $this.find('a').attr('href').split('=')[1];
+        var page = $this.attr('href').split('=')[1];
         var type = getCurrentTabType();
 
         e.preventDefault();

@@ -14,6 +14,10 @@
         margin: $space 0;
     }
 
+    .no-pointer {
+        cursor: auto !important;
+    }
+
     .refund-tag {
         width: 55%;
         padding: 5px 0;
@@ -122,7 +126,7 @@
 
             .iconfont {
                 font-weight: normal;
-                color: #000000;
+                color: #000;
             }
 
             &.last {