Merge remote-tracking branch 'origin/release/5.9' into release/5.9

@@ -43,7 +43,6 @@
                                 <th>我邀请的好友</th>
                                 <th>注册时间</th>
                                 <th>首单购物金额</th>
-                                <th>订单状态</th>
                                 <th>我的奖励</th>
                                 <th>奖励状态</th>
                                 <th>发放时间</th>
@@ -55,9 +54,15 @@
                                     <td>{{nickName}}</td>
                                     <td>{{registerTimeDis}}</td>
                                     <td>{{orderAmountDis}}</td>
-                                    <td>{{paymentStatusDesc}}</td>
                                     <td>{{couponName}}</td>
-                                    <td>{{couponStatusDesc}}</td>
+                                    <td class="coupon-status">{{couponStatusDesc}}
+                                        {{#if paymentStatusDesc}}
+                                            <i class="help-icon"></i>
+                                            <div class="coin-tip-help">
+                                                <p>{{paymentStatusDesc}}</p>
+                                            </div>
+                                        {{/if}}
+                                    </td>
                                     <td>{{couponSendTimeDis}}</td>
                                 </tr>
                             {{/ list}}

 {
   "name": "yohobuy-node",
-  "version": "5.8.8",
+  "version": "5.8.10",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -28,7 +28,8 @@
         }
 
         .tag {
-            width: 100%;
+            width: 252px;
+            margin-left: -1px;
             height: 25px;
             line-height: 25px;
             background-color: #000;
@@ -112,6 +113,52 @@
             padding: 14px 0;
             text-align: center;
         }
+
+        .coupon-status {
+            position: relative;
+        }
+
+        .help-icon {
+            display: block;
+            width: 16px;
+            height: 16px;
+            background: url(/cart/help-mark.png);
+            position: absolute;
+            right: 3%;
+            top: 50%;
+            margin-top: -8px;
+            cursor: pointer;
+
+            &:hover + .coin-tip-help {
+                display: block;
+            }
+        }
+
+        .coin-tip-help {
+            width: 200px;
+            padding: 6px 10px;
+            line-height: 2;
+            border: 1px solid #000;
+            background-color: #fff;
+            text-align: center;
+            position: absolute;
+            top: 38px;
+            right: -100px;
+            display: none;
+            z-index: 1000;
+        }
+
+        .coin-tip-help:before {
+            content: "";
+            width: 12px;
+            height: 6px;
+            background-image: url(../img/sprite.cart.png);
+            background-position: -325px -76px;
+            display: block;
+            position: absolute;
+            top: -6px;
+            right: 106px;
+        }
     }
 
     .spread-rules {