fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 1ca60e198772670efb2d76f6c6a8c8afbcd01321 2 parents a52c4db7 0d8d1b10

Merge branch 'master' into feature/refund

Inline Side-by-side
Showing 11 changed files with 46 additions and 38 deletions
@@ -105,8 +105,6 @@ const submitTicket = (param) => { @@ -105,8 +105,6 @@ const submitTicket = (param) => {
105 mobile: param.mobile, 105 mobile: param.mobile,
106 use_yoho_coin: param.useYohoCoin, 106 use_yoho_coin: param.useYohoCoin,
107 qhy_union: '' 107 qhy_union: ''
108 - }, {  
109 - code: 200  
110 }).then((result) => { 108 }).then((result) => {
111 return result; 109 return result;
112 }); 110 });
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 {{/if}} 25 {{/if}}
26 26
27 {{#if size}} 27 {{#if size}}
28 - <span class="size{{#if tickets}} hide{{/if}}"> 28 + <span class="size">
29 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}} 29 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
30 </span> 30 </span>
31 {{/if}} 31 {{/if}}
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="swiper-slide"> 18 <div class="swiper-slide">
19 <a class='qrcode-img'><img src="{{qr_image}}"></a> 19 <a class='qrcode-img'><img src="{{qr_image}}"></a>
20 <p><label class='t'>编号:</label>{{ticket_code}}</p> 20 <p><label class='t'>编号:</label>{{ticket_code}}</p>
21 - {{#if isgroup}} 21 + {{#if seat_no}}
22 <p><label class='t'>座位号:</label>{{seat_no}}</p> 22 <p><label class='t'>座位号:</label>{{seat_no}}</p>
23 {{/if}} 23 {{/if}}
24 <p><label class='t'>进场时间:</label>{{entrance_time}}</p> 24 <p><label class='t'>进场时间:</label>{{entrance_time}}</p>
@@ -640,7 +640,7 @@ const _detailDataPkgAsync = (origin, uid, vipLevel, ua) => { @@ -640,7 +640,7 @@ const _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
640 // } 640 // }
641 641
642 // 购票限制 642 // 购票限制
643 - result.cartInfo.limit = 4; 643 + // result.cartInfo.limit = 4;
644 644
645 // 清空活动 645 // 清空活动
646 result.goodsDiscount = []; 646 result.goodsDiscount = [];
@@ -752,14 +752,14 @@ const getNewProductAsyncData = (data) => { @@ -752,14 +752,14 @@ const getNewProductAsyncData = (data) => {
752 } 752 }
753 753
754 // 2017电子门票不显示区域 754 // 2017电子门票不显示区域
755 - let ticketsProps = finalResult.cartInfo.props; 755 + // let ticketsProps = finalResult.cartInfo.props;
756 756
757 - _.forEach(ticketsProps, function(value) {  
758 - if (value.name === '区域') {  
759 - value.ticketHide = true;  
760 - value.name = '';  
761 - }  
762 - }); 757 + // _.forEach(ticketsProps, function(value) {
  758 + // if (value.name === '区域') {
  759 + // value.ticketHide = true;
  760 + // value.name = '';
  761 + // }
  762 + // });
763 return finalResult; 763 return finalResult;
764 }); 764 });
765 }); 765 });
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 {{/if}} 29 {{/if}}
30 30
31 {{#if size}} 31 {{#if size}}
32 - <span class="size{{#if tickets}} hide{{/if}}"> 32 + <span class="size">
33 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}} 33 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
34 </span> 34 </span>
35 {{/if}} 35 {{/if}}
1 { 1 {
2 "name": "m-yohobuy-node", 2 "name": "m-yohobuy-node",
3 - "version": "5.9.13", 3 + "version": "5.9.20",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -23,11 +23,11 @@ @@ -23,11 +23,11 @@
23 </div> 23 </div>
24 <div class="chose-items"> 24 <div class="chose-items">
25 {{#each props}} 25 {{#each props}}
26 - <div class="block-list{{#if ticketHide}} hide{{/if}}"> 26 + <div class="block-list">
27 <span class="name">{{name}}</span> 27 <span class="name">{{name}}</span>
28 <ul class="size-row clearfix"> 28 <ul class="size-row clearfix">
29 {{#each values}} 29 {{#each values}}
30 - <li class="block{{#if ../ticketHide}} chosed hide{{/if}}" data-prop-id="{{../type}}" data-value-id="{{id}}">{{#if ../ticketHide}}{{else}}{{name}}{{/if}}</li> 30 + <li class="block" data-prop-id="{{../type}}" data-value-id="{{id}}">{{name}}</li>
31 {{/each}} 31 {{/each}}
32 </ul> 32 </ul>
33 </div> 33 </div>
@@ -505,14 +505,14 @@ function ticketsConfirm() { @@ -505,14 +505,14 @@ function ticketsConfirm() {
505 } 505 }
506 506
507 // 校验手机号 507 // 校验手机号
508 -$ticketsMobile.blur(function() {  
509 - let reg = /^[0123456789]{1,30}$/;  
510 - let mobile = $ticketsMobile.val();  
511 -  
512 - if (!reg.test(mobile)) {  
513 - tip.show('手机号码不正确！');  
514 - }  
515 -}); 508 +// $ticketsMobile.blur(function() {
  509 +// let reg = /^1[34578]\d{9}$/;
  510 +// let mobile = $ticketsMobile.val();
  511 +
  512 +// if (!reg.test(mobile)) {
  513 +// tip.show('手机号码不正确！');
  514 +// }
  515 +// });
516 516
517 // 留言点击滚动屏幕 517 // 留言点击滚动屏幕
518 $message.on('click', function() { 518 $message.on('click', function() {
@@ -317,10 +317,12 @@ class ChosePanel { @@ -317,10 +317,12 @@ class ChosePanel {
317 return false; 317 return false;
318 } 318 }
319 } 319 }
320 - if (this.modes.tickets && buyNum > this.maxBuyNum) {  
321 - tip.show(`每人只可购买${this.maxBuyNum}张当日门票`); 320 + if (this.modes.tickets && buyNum > selectSku.limitNum) {
  321 + if (selectSku.limitNum) {
  322 + tip.show(`每人只可购买${selectSku.limitNum}张此门票`);
322 return false; 323 return false;
323 } 324 }
  325 + }
324 if (this.modes.limit && buyNum > this.maxBuyNum) { 326 if (this.modes.limit && buyNum > this.maxBuyNum) {
325 tip.show('您选择数量大于限购数量~'); 327 tip.show('您选择数量大于限购数量~');
326 return false; 328 return false;
@@ -445,13 +447,13 @@ class ChosePanel { @@ -445,13 +447,13 @@ class ChosePanel {
445 return $(ele).text(); 447 return $(ele).text();
446 })); 448 }));
447 449
448 - if (this.modes.tickets) {  
449 - let $chosed = $('.block.chosed'); 450 + // if (this.modes.tickets) {
  451 + // let $chosed = $('.block.chosed');
450 452
451 - valueList = Array.from($chosed.not('.hide').map((index, ele) => {  
452 - return $(ele).text();  
453 - }));  
454 - } 453 + // valueList = Array.from($chosed.not('.hide').map((index, ele) => {
  454 + // return $(ele).text();
  455 + // }));
  456 + // }
455 457
456 if (valueList.length) { 458 if (valueList.length) {
457 $noChoose.addClass('hide'); 459 $noChoose.addClass('hide');
@@ -464,11 +466,16 @@ class ChosePanel { @@ -464,11 +466,16 @@ class ChosePanel {
464 466
465 if (selectSku) { 467 if (selectSku) {
466 // 设置left-num文字 468 // 设置left-num文字
467 - let cartInfo = this.data.cartInfo,  
468 - numText; 469 + // let cartInfo = this.data.cartInfo,
  470 + // numText;
  471 + let numText;
469 472
470 - if (this.modes.limit) {  
471 - numText = `限购${cartInfo.limit}件`; 473 + if (selectSku.limitNum) {
  474 + if (selectSku.limitNum) {
  475 + numText = `限购${selectSku.limitNum}件`;
  476 + } else {
  477 + numText = '';
  478 + }
472 } else if (this.modes.soonSoldOut) { 479 } else if (this.modes.soonSoldOut) {
473 numText = '即将售罄'; 480 numText = '即将售罄';
474 } else if (selectSku.storage < 4 && selectSku.storage > 0) { 481 } else if (selectSku.storage < 4 && selectSku.storage > 0) {
@@ -587,6 +587,9 @@ @@ -587,6 +587,9 @@
587 font-size: 34px; 587 font-size: 34px;
588 border-bottom: 1px solid #e0e0e0; 588 border-bottom: 1px solid #e0e0e0;
589 background-color: #fff; 589 background-color: #fff;
  590 + white-space: nowrap;
  591 + overflow: hidden;
  592 + text-overflow: ellipsis;
590 } 593 }
591 594
592 .s-text { 595 .s-text {
@@ -466,14 +466,14 @@ exports.processSkusInfo = (origin) => { @@ -466,14 +466,14 @@ exports.processSkusInfo = (origin) => {
466 valId: size.size_id, 466 valId: size.size_id,
467 valName: size.size_name 467 valName: size.size_name
468 } 468 }
469 - } 469 + },
  470 + limitNum: size.limit_buy_num
470 }); 471 });
471 }); 472 });
472 }); 473 });
473 474
474 dest.defaultThumb = helpers.image(_.get(dest, 'skus[0].thumb', ''), 300, 395); 475 dest.defaultThumb = helpers.image(_.get(dest, 'skus[0].thumb', ''), 300, 395);
475 476
476 -  
477 return dest; 477 return dest;
478 }; 478 };
479 479