Merge branch 'release/5.9' of git.yoho.cn:fe/yohobuy-node into release/5.9

@@ -32,6 +32,7 @@ const addTicket = co(function * (uid, sku, count, yohoCoin) {
         };
         };
     }
     }
 
 
+    result.virtualGood = true;
     result.goodsList = _handleGoodsList(_.get(ticketInfo, 'data.goods_list', []));
     result.goodsList = _handleGoodsList(_.get(ticketInfo, 'data.goods_list', []));
     result.last_order_amount = _handleAmount(ticketInfo);
     result.last_order_amount = _handleAmount(ticketInfo);
     Object.assign(result, _handleUseYhoCoin(_.get(ticketInfo, 'data.shopping_cart_data', {})));
     Object.assign(result, _handleUseYhoCoin(_.get(ticketInfo, 'data.shopping_cart_data', {})));

@@ -44,9 +44,12 @@
                         data-price="{{last_price}}" data-num="{{buy_number}}">
                         data-price="{{last_price}}" data-num="{{buy_number}}">
                         <td{{#if @first}} class="border-top"{{/if}}></td>
                         <td{{#if @first}} class="border-top"{{/if}}></td>
                         <td class="border-top aline-left">
                         <td class="border-top aline-left">
-                            <a class="image" href="{{linkToGoods}}">
+                            <a class="image ticket-cover" href="{{linkToGoods}}">
+                                <span class="ticket-image">
                                     <img src="{{image2 goods_images w=64 h=85}}" class="thumb">
                                     <img src="{{image2 goods_images w=64 h=85}}" class="thumb">
-                                <p class="name">
+                                    <span class="ticket-image-tag">虚拟商品</span>
+                                </span>
+                                <p class="ticket-name">
                                     {{product_name}}
                                     {{product_name}}
                                 </p>
                                 </p>
                             </a>
                             </a>

@@ -165,6 +165,8 @@
                     </p>
                     </p>
                     <div class="content">
                     <div class="content">
                         <span>付款方式：{{payMode}}</span>
                         <span>付款方式：{{payMode}}</span>
+                    <br />
+                    <br />
                         <span>电话号码：{{phone}}</span>
                         <span>电话号码：{{phone}}</span>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -46,6 +46,10 @@ function validateUserInfo(info) {
         errTip = '您还没有填写手机号';
         errTip = '您还没有填写手机号';
     }
     }
 
 
+    if (!errTip && !/^\d{11}$/ig.test(info.mobile)) {
+        errTip = '手机号只能是11位数字';
+    }
+
     if (errTip) {
     if (errTip) {
         new dialog.Alert((errTip)).show();
         new dialog.Alert((errTip)).show();
         return false;
         return false;

@@ -865,6 +865,38 @@
         }
         }
     }
     }
 
 
+    .ticket-cover {
+        .ticket-image {
+            display: inline-block;
+            position: relative;
+        }
+
+        .ticket-image-tag {
+            display: block;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            height: 15px;
+            line-height: 16px;
+            text-align: center;
+            color: #fff;
+            background: #333;
+        }
+
+        .ticket-name {
+            display: inline-block;
+            width: 280px;
+            max-height: 68px;
+            font-size: 15px;
+            padding-left: 20px;
+            line-height: 1.5;
+            overflow: hidden;
+            word-break: break-all;
+            vertical-align: top;
+        }
+    }
+
     .use-coupons {
     .use-coupons {
         .tip-box {
         .tip-box {
             width: 60%;
             width: 60%;