fe / yohobuywap-node · Commits

Go to a project

Authored by 李靖
Commit 55af3bd48b02ed215cb1b3749f75586baa5be11a 1 parent 46612bfc

隐藏区域，显示虚拟商品标签

Inline Side-by-side
Showing 9 changed files with 88 additions and 10 deletions
1 <div class="order-good" data-id="{{id}}" data-skn="{{skn}}"> 1 <div class="order-good" data-id="{{id}}" data-skn="{{skn}}">
2 <div class="thumb-wrap"> 2 <div class="thumb-wrap">
3 {{#if link}} 3 {{#if link}}
4 - <a href="{{link}}"><img class="thumb lazy" data-original="{{thumb}}"></a> 4 + <div class="pic-c">
  5 + <a href="{{link}}">
  6 + <img class="thumb lazy" data-original="{{thumb}}">
  7 + </a>
  8 + <p>虚拟商品</p>
  9 + </div>
5 {{else}} 10 {{else}}
6 - <img class="thumb lazy" data-original="{{thumb}}"> 11 + <div class="pic-c">
  12 + <img class="thumb lazy" data-original="{{thumb}}">
  13 + <p>虚拟商品</p>
  14 + </div>
7 {{/if}} 15 {{/if}}
8 <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p> 16 <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
9 </div> 17 </div>
@@ -17,7 +25,7 @@ @@ -17,7 +25,7 @@
17 {{/if}} 25 {{/if}}
18 26
19 {{#if size}} 27 {{#if size}}
20 - <span class="size"> 28 + <span class="size{{#if tickets}} hide{{/if}}">
21 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}} 29 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
22 </span> 30 </span>
23 {{/if}} 31 {{/if}}
@@ -221,6 +221,12 @@ const orderDetailData = (uid, orderCode) => { @@ -221,6 +221,12 @@ const orderDetailData = (uid, orderCode) => {
221 }); 221 });
222 } 222 }
223 223
  224 + if (data.goodsType === 'ticket') {
  225 + obj = _.assign(obj, {
  226 + tickets: true
  227 + });
  228 + }
  229 +
224 goods.push(obj); 230 goods.push(obj);
225 231
226 orderDetail = _.assign(orderDetail, { 232 orderDetail = _.assign(orderDetail, {
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 {{#qrcodeData}} 5 {{#qrcodeData}}
6 <div class="qrcode yoho-page"> 6 <div class="qrcode yoho-page">
7 7
8 - <h2 class='qrcode-title'>2016 非常潮流盛世 YO'HOOD门票(限量) {{ticks.length}}件</h2> 8 + <h2 class='qrcode-title'>2017 非常潮流盛世 YO'HOOD门票(限量) {{ticks.length}}件</h2>
9 <p class='qrcode-tip'>提示:凭借二维码入场,每场二维码只可使用一次,请妥善保管;</p> 9 <p class='qrcode-tip'>提示:凭借二维码入场,每场二维码只可使用一次,请妥善保管;</p>
10 <div class='qrcode-wrap'> 10 <div class='qrcode-wrap'>
11 11
@@ -750,6 +750,16 @@ const getNewProductAsyncData = (data) => { @@ -750,6 +750,16 @@ const getNewProductAsyncData = (data) => {
750 discount: discountBuy.bundleInfo.discount 750 discount: discountBuy.bundleInfo.discount
751 }; 751 };
752 } 752 }
  753 +
  754 + // 2017电子门票不显示区域
  755 + let ticketsProps = finalResult.cartInfo.props;
  756 +
  757 + _.forEach(ticketsProps, function(value) {
  758 + if (value.name === '区域') {
  759 + value.ticketHide = true;
  760 + value.name = '';
  761 + }
  762 + });
753 return finalResult; 763 return finalResult;
754 }); 764 });
755 }); 765 });
1 <div class="order-good" data-id="{{id}}"> 1 <div class="order-good" data-id="{{id}}">
2 <div class="thumb-wrap"> 2 <div class="thumb-wrap">
3 - {{#if link}}  
4 - <a href="{{link}}"><img class="thumb" src="{{image thumb 90 120}}"></a> 3 + {{#if link}}
  4 + <div class="pic-c">
  5 + <a href="{{link}}">
  6 + <img class="thumb" src="{{image thumb 90 120}}">
  7 + </a>
  8 + {{#if tickets}}
  9 + <p>虚拟商品</p>
  10 + {{/if}}
  11 + </div>
5 {{else}} 12 {{else}}
6 - <img class="thumb" src="{{image thumb 90 120}}"> 13 + <div class="pic-c">
  14 + <img class="thumb" src="{{image thumb 90 120}}">
  15 + {{#if tickets}}
  16 + <p>虚拟商品</p>
  17 + {{/if}}
  18 + </div>
7 {{/if}} 19 {{/if}}
8 <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p> 20 <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
9 </div> 21 </div>
@@ -17,7 +29,7 @@ @@ -17,7 +29,7 @@
17 {{/if}} 29 {{/if}}
18 30
19 {{#if size}} 31 {{#if size}}
20 - <span class="size"> 32 + <span class="size{{#if tickets}} hide{{/if}}">
21 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}} 33 {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
22 </span> 34 </span>
23 {{/if}} 35 {{/if}}
@@ -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"> 26 + <div class="block-list{{#if ticketHide}} hide{{/if}}">
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" data-prop-id="{{../type}}" data-value-id="{{id}}">{{name}}</li> 30 + <li class="block{{#if ../ticketHide}} chosed hide{{/if}}" data-prop-id="{{../type}}" data-value-id="{{id}}">{{#if ../ticketHide}}{{else}}{{name}}{{/if}}</li>
31 {{/each}} 31 {{/each}}
32 </ul> 32 </ul>
33 </div> 33 </div>
@@ -414,6 +414,14 @@ class ChosePanel { @@ -414,6 +414,14 @@ class ChosePanel {
414 return $(ele).text(); 414 return $(ele).text();
415 })); 415 }));
416 416
  417 + if (this.modes.tickets) {
  418 + let $chosed = $('.block.chosed');
  419 +
  420 + valueList = Array.from($chosed.not('.hide').map((index, ele) => {
  421 + return $(ele).text();
  422 + }));
  423 + }
  424 +
417 if (valueList.length) { 425 if (valueList.length) {
418 $noChoose.addClass('hide'); 426 $noChoose.addClass('hide');
419 $chooseInfo.removeClass('hide'); 427 $chooseInfo.removeClass('hide');
@@ -78,4 +78,21 @@ @@ -78,4 +78,21 @@
78 color: #b0b0b0; 78 color: #b0b0b0;
79 } 79 }
80 } 80 }
  81 +
  82 + .pic-c {
  83 + position: relative;
  84 +
  85 + p {
  86 + position: absolute;
  87 + bottom: 0;
  88 + left: 0;
  89 + color: #fff;
  90 + width: 100%;
  91 + text-align: center;
  92 + height: 35px;
  93 + line-height: 35px;
  94 + background-color: #d0021b;
  95 + font-size: 20px;
  96 + }
  97 + }
81 } 98 }
@@ -250,6 +250,23 @@ @@ -250,6 +250,23 @@
250 border-bottom: 1px solid #e0e0e0; 250 border-bottom: 1px solid #e0e0e0;
251 font-size: 26px; 251 font-size: 26px;
252 252
  253 + .pic-c {
  254 + position: relative;
  255 +
  256 + p {
  257 + position: absolute;
  258 + bottom: 0;
  259 + left: 0;
  260 + color: #fff;
  261 + width: 100%;
  262 + text-align: center;
  263 + height: 35px;
  264 + line-height: 35px;
  265 + background-color: #d0021b;
  266 + font-size: 20px;
  267 + }
  268 + }
  269 +
253 &:last-child { 270 &:last-child {
254 border-bottom: none; 271 border-bottom: none;
255 } 272 }