Merge branch 'master' into feature/refund

@@ -105,8 +105,6 @@ const submitTicket = (param) => {
         mobile: param.mobile,
         use_yoho_coin: param.useYohoCoin,
         qhy_union: ''
-    }, {
-        code: 200
     }).then((result) => {
         return result;
     });

@@ -25,7 +25,7 @@
             {{/if}}
 
             {{#if size}}
-                <span class="size{{#if tickets}} hide{{/if}}">
+                <span class="size">
                     {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
                 </span>
             {{/if}}

@@ -18,7 +18,7 @@
 		      <div class="swiper-slide">
 		      	<a class='qrcode-img'><img src="{{qr_image}}"></a>
 		      	<p><label class='t'>编号:</label>{{ticket_code}}</p>
-		      	{{#if isgroup}}
+		      	{{#if seat_no}}
 		      	<p><label class='t'>座位号:</label>{{seat_no}}</p>
 		      	{{/if}}
 		      	<p><label class='t'>进场时间:</label>{{entrance_time}}</p>

@@ -640,7 +640,7 @@ const _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
             // }
 
             // 购票限制
-            result.cartInfo.limit = 4;
+            // result.cartInfo.limit = 4;
 
             // 清空活动
             result.goodsDiscount = [];
@@ -752,14 +752,14 @@ const getNewProductAsyncData = (data) => {
             }
 
             // 2017电子门票不显示区域
-            let ticketsProps = finalResult.cartInfo.props;
-
-            _.forEach(ticketsProps, function(value) {
-                if (value.name === '区域') {
-                    value.ticketHide = true;
-                    value.name = '';
-                }
-            });
+            // let ticketsProps = finalResult.cartInfo.props;
+
+            // _.forEach(ticketsProps, function(value) {
+            //     if (value.name === '区域') {
+            //         value.ticketHide = true;
+            //         value.name = '';
+            //     }
+            // });
             return finalResult;
         });
     });

@@ -29,7 +29,7 @@
             {{/if}}
 
             {{#if size}}
-                <span class="size{{#if tickets}} hide{{/if}}">
+                <span class="size">
                     {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
                 </span>
             {{/if}}

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

@@ -23,11 +23,11 @@
             </div>
             <div class="chose-items">
                 {{#each props}}
-                    <div class="block-list{{#if ticketHide}} hide{{/if}}">
+                    <div class="block-list">
                         <span class="name">{{name}}</span> 
                         <ul class="size-row clearfix">
                             {{#each values}}
-                            <li class="block{{#if ../ticketHide}} chosed hide{{/if}}" data-prop-id="{{../type}}" data-value-id="{{id}}">{{#if ../ticketHide}}{{else}}{{name}}{{/if}}</li>
+                            <li class="block" data-prop-id="{{../type}}" data-value-id="{{id}}">{{name}}</li>
                             {{/each}}
                         </ul>
                     </div>

@@ -505,14 +505,14 @@ function ticketsConfirm() {
 }
 
 // 校验手机号
-$ticketsMobile.blur(function() {
-    let reg = /^[0123456789]{1,30}$/;
-    let mobile = $ticketsMobile.val();
-
-    if (!reg.test(mobile)) {
-        tip.show('手机号码不正确！');
-    }
-});
+// $ticketsMobile.blur(function() {
+//     let reg = /^1[34578]\d{9}$/;
+//     let mobile = $ticketsMobile.val();
+
+//     if (!reg.test(mobile)) {
+//         tip.show('手机号码不正确！');
+//     }
+// });
 
 // 留言点击滚动屏幕
 $message.on('click', function() {

@@ -317,9 +317,11 @@ class ChosePanel {
                 return false;
             }
         }
-        if (this.modes.tickets && buyNum > this.maxBuyNum) {
-            tip.show(`每人只可购买${this.maxBuyNum}张当日门票`);
-            return false;
+        if (this.modes.tickets && buyNum > selectSku.limitNum) {
+            if (selectSku.limitNum) {
+                tip.show(`每人只可购买${selectSku.limitNum}张此门票`);
+                return false;
+            }
         }
         if (this.modes.limit && buyNum > this.maxBuyNum) {
             tip.show('您选择数量大于限购数量~');
@@ -445,13 +447,13 @@ class ChosePanel {
             return $(ele).text();
         }));
 
-        if (this.modes.tickets) {
-            let $chosed = $('.block.chosed');
+        // if (this.modes.tickets) {
+        //     let $chosed = $('.block.chosed');
 
-            valueList = Array.from($chosed.not('.hide').map((index, ele) => {
-                return $(ele).text();
-            }));
-        }
+        //     valueList = Array.from($chosed.not('.hide').map((index, ele) => {
+        //         return $(ele).text();
+        //     }));
+        // }
 
         if (valueList.length) {
             $noChoose.addClass('hide');
@@ -464,11 +466,16 @@ class ChosePanel {
 
         if (selectSku) {
             // 设置left-num文字
-            let cartInfo = this.data.cartInfo,
-                numText;
+            // let cartInfo = this.data.cartInfo,
+            //     numText;
+            let numText;
 
-            if (this.modes.limit) {
-                numText = `限购${cartInfo.limit}件`;
+            if (selectSku.limitNum) {
+                if (selectSku.limitNum) {
+                    numText = `限购${selectSku.limitNum}件`;
+                } else {
+                    numText = '';
+                }
             } else if (this.modes.soonSoldOut) {
                 numText = '即将售罄';
             } else if (selectSku.storage < 4 && selectSku.storage > 0) {

@@ -587,6 +587,9 @@
     font-size: 34px;
     border-bottom: 1px solid #e0e0e0;
     background-color: #fff;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .s-text {

@@ -466,14 +466,14 @@ exports.processSkusInfo = (origin) => {
                         valId: size.size_id,
                         valName: size.size_name
                     }
-                }
+                },
+                limitNum: size.limit_buy_num
             });
         });
     });
 
     dest.defaultThumb = helpers.image(_.get(dest, 'skus[0].thumb', ''), 300, 395);
 
-
     return dest;
 };