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

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

@@ -86,8 +86,8 @@
     {{!-- 在线客服和返回顶部 --}}
     {{!-- 在线客服和返回顶部 --}}
     <div class="service-top">
     <div class="service-top">
         <a class="service" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">
         <a class="service" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">
-            <span class="iconfont">&#xe61c;</span>
-            <span class="hover-text hide">在线<br>客服</span>
+            <span class="iconfont hide">&#xe61c;</span>
+            <span class="hover-text">在线<br>客服</span>
         </a>
         </a>
         <div class="return-top hide">
         <div class="return-top hide">
             <span class="iconfont bold">&#xe617;</span>
             <span class="iconfont bold">&#xe617;</span>

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

@@ -8,7 +8,7 @@
             </label>
             </label>
         </div>
         </div>
         <div class="item product">货品</div>
         <div class="item product">货品</div>
-        <div class="item price">价格</div>
+        <div class="item price">单价</div>
         <div class="item num">数量</div>
         <div class="item num">数量</div>
         <div class="item pro-total-price">总价</div>
         <div class="item pro-total-price">总价</div>
         <div class="item actions">操作</div>
         <div class="item actions">操作</div>

@@ -7,7 +7,7 @@
             </p>
             </p>
         {{^}}
         {{^}}
             <p class="info-text">
             <p class="info-text">
-                温馨提示: 亲爱的顾客，您还没有<a href="/passport/login">登录</a>哦， 所有的商品价购、活动信息以登录后显示为准。
+                温馨提示: 亲爱的顾客，您还没有<a href="/passport/login">登录</a>哦， 所有的商品价格、活动信息以登录后显示为准。
                 <span class="iconfont pull-right close">&#xe608;</span>
                 <span class="iconfont pull-right close">&#xe608;</span>
             </p>
             </p>
         {{/if}}
         {{/if}}

@@ -25,11 +25,11 @@ require('../common/return-top'); // return-top
 lazyLoad($('.banner-img'));
 lazyLoad($('.banner-img'));
 
 
 // 浮动在线客服和返回顶部的鼠标移入移出切换效果
 // 浮动在线客服和返回顶部的鼠标移入移出切换效果
-$('.service, .return-top').hover(function() {
-    $(this).find('.iconfont').addClass('hide').end().find('.hover-text').removeClass('hide');
-}, function() {
-    $(this).find('.iconfont').removeClass('hide').end().find('.hover-text').addClass('hide');
-});
+function toggleShow(e) {
+    $(e.target).find('span').toggleClass('hide');
+}
+
+$('.service, .return-top').hover(toggleShow, toggleShow);
 
 
 // repos service-return when window resize
 // repos service-return when window resize
 $(window).resize(reposServiceTop);
 $(window).resize(reposServiceTop);

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

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