fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit bacc7a133128abfa3e7b95758f5a3b96b375a00c 1 parent c584cb24

有货币不可使用，提示

Inline Side-by-side
Showing 4 changed files with 47 additions and 60 deletions
@@ -366,12 +366,12 @@ @@ -366,12 +366,12 @@
366 </dl> 366 </dl>
367 {{/if}} 367 {{/if}}
368 <dl class="play-bi-pan pan"> 368 <dl class="play-bi-pan pan">
369 - <dt>使用有货币支付</dt> 369 + <dt class="{{#unless yohoCoinCompute.yohoCoinClick}}not-btn{{/unless}}">使用有货币支付</dt>
370 <dd> 370 <dd>
371 <ul class="play-pan" id="biprice" data-yoho-coin-num={{yohoCoinCompute.yohoCoinNum}} data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}> 371 <ul class="play-pan" id="biprice" data-yoho-coin-num={{yohoCoinCompute.yohoCoinNum}} data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}>
372 <li> 372 <li>
373 <div class="float-left"> 373 <div class="float-left">
374 - 有货币满<span class="sign-amount num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>个即可使用，每次使用有货币为<span class="sign-amount num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>的整数陪 374 + 有货币满<span class="sign-amount num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>个即可使用，每次使用有货币为<span class="sign-amount num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>的整数倍
375 </div> 375 </div>
376 <div class="float-right yoho-coin-help">? 376 <div class="float-right yoho-coin-help">?
377 <div class="yoho-coin-help-dialog hide"> 377 <div class="yoho-coin-help-dialog hide">
@@ -389,8 +389,7 @@ @@ -389,8 +389,7 @@
389 </div> 389 </div>
390 </li> 390 </li>
391 <li> 391 <li>
392 - 您当前共有有货币<span class="sign-amount totalYohoCoinNum">{{yohoCoinCompute.totalYohoCoinNum}}</span>个，  
393 - 可用<span class="sign-amount yohoCoinNum">{{yohoCoinCompute.yohoCoinNum}}</span> 个 392 + 您当前共有有货币<span class="sign-amount totalYohoCoinNum">{{yohoCoinCompute.totalYohoCoinNum}}</span>个，可用<span class="sign-amount yohoCoinNum">{{yohoCoinCompute.yohoCoinNum}}</span> 个
394 </li> 393 </li>
395 <li> 394 <li>
396 本次使用有货币<span class="sign-amount yohoCoinNum">{{yohoCoinCompute.yohoCoinNum}}</span>个 抵扣<span class="sign-amount yohoCoin">¥{{yohoCoinCompute.yohoCoin}}</span> 395 本次使用有货币<span class="sign-amount yohoCoinNum">{{yohoCoinCompute.yohoCoinNum}}</span>个 抵扣<span class="sign-amount yohoCoin">¥{{yohoCoinCompute.yohoCoin}}</span>
@@ -405,6 +404,7 @@ @@ -405,6 +404,7 @@
405 </div> 404 </div>
406 </li> 405 </li>
407 </ul> 406 </ul>
  407 + <div class="errbitip red"></div>
408 </dd> 408 </dd>
409 </dl> 409 </dl>
410 410
@@ -113,6 +113,10 @@ var Order = { @@ -113,6 +113,10 @@ var Order = {
113 113
114 var pan = $(this).parent('dl.pan'); 114 var pan = $(this).parent('dl.pan');
115 115
  116 + if ($(this).hasClass('not-btn')) {
  117 + return false;
  118 + }
  119 +
116 if (pan.find('dd').is(':hidden')) { 120 if (pan.find('dd').is(':hidden')) {
117 c.winShow(pan); 121 c.winShow(pan);
118 122
@@ -273,16 +277,18 @@ var Order = { @@ -273,16 +277,18 @@ var Order = {
273 e.$toPay.html((data.last_order_amount).toFixed(2)); 277 e.$toPay.html((data.last_order_amount).toFixed(2));
274 278
275 //有货币清零状态更新 279 //有货币清零状态更新
276 - $('#biprice').val(accMul(100, data.yohoCoinCompute.useYohoCoin));  
277 - if (~~data.yohoCoinCompute.useYohoCoin === 0) {  
278 - $('.errbitip').text('');  
279 - } else {  
280 - $('.errbitip').text('抵扣' + data.yohoCoinCompute.useYohoCoin.toFixed(2) + '元'); 280 + $('dl.play-bi-pan').find('dt').removeClass('not-btn');
  281 + if (!data.yohoCoinCompute.yohoCoinClick) {
  282 + $('dl.play-bi-pan').find('dt').addClass('not-btn');
281 } 283 }
  284 + $('#biprice').data('.yoho-coin-click', data.yohoCoinCompute.yohoCoinClick);
  285 + $('#biprice').find('.num-limit-coin').html(data.yohoCoinCompute.yoho_coin_pay_rule.num_limit);
  286 + $('#biprice').find('.totalYohoCoinNum').html(data.yohoCoinCompute.totalYohoCoinNum);
  287 + $('#biprice').find('.yohoCoinNum').html(data.yohoCoinCompute.yohoCoinNum);
  288 + $('#biprice').find('.yohoCoin').html(data.yohoCoinCompute.yohoCoin);
282 289
283 //使用的红包 290 //使用的红包
284 envelopesVal = e.$useEnvelopesInput.data('all') - data.use_red_envelopes; 291 envelopesVal = e.$useEnvelopesInput.data('all') - data.use_red_envelopes;
285 -  
286 if (~~data.use_red_envelopes > 0) { 292 if (~~data.use_red_envelopes > 0) {
287 e.$useEnvelopes.find('span').html('-¥' + data.use_red_envelopes.toFixed(2)); 293 e.$useEnvelopes.find('span').html('-¥' + data.use_red_envelopes.toFixed(2));
288 e.$useEnvelopes.find('input').attr('data-use', data.use_red_envelopes); 294 e.$useEnvelopes.find('input').attr('data-use', data.use_red_envelopes);
@@ -380,7 +386,7 @@ var Order = { @@ -380,7 +386,7 @@ var Order = {
380 386
381 var $juangroupInput = $('.play-juan.is-select input[name="juangroup"]:checked'); 387 var $juangroupInput = $('.play-juan.is-select input[name="juangroup"]:checked');
382 var expressVal = $('.express-list input[name="carriagegroup"]:checked').val(); 388 var expressVal = $('.express-list input[name="carriagegroup"]:checked').val();
383 - var biVal = $('#biprice.is-select').val(); 389 + var biVal = $('#biprice.is-select').data('yoho-coin-num');
384 var codeVal = $juangroupInput.val(); 390 var codeVal = $juangroupInput.val();
385 var cartType = $('.address-manage').attr('cart-type'); 391 var cartType = $('.address-manage').attr('cart-type');
386 var redEnvelopes = $('.use-envelopes input:checked').attr('data-use'); 392 var redEnvelopes = $('.use-envelopes input:checked').attr('data-use');
@@ -501,18 +507,18 @@ var Order = { @@ -501,18 +507,18 @@ var Order = {
501 507
502 // 优惠券修改 508 // 优惠券修改
503 $(document).on('click', '.juan-modify', function() { 509 $(document).on('click', '.juan-modify', function() {
504 -  
505 -  
506 - var $pan = $('.play-juan-pan');  
507 -  
508 - c.winShow($pan); 510 + c.winShow($('.play-juan-pan'));
509 }); 511 });
510 512
511 e.$biok.click(function() { 513 e.$biok.click(function() {
512 -  
513 var pan = $(this).parents('dl.pan'); 514 var pan = $(this).parents('dl.pan');
514 var juanText; 515 var juanText;
515 516
  517 + if (!$('#biprice').data('yoho-coin-click')) {
  518 + $('.errbitip').html('抱歉，您的订单实付款不满足有货币使用条件');
  519 + return true;
  520 + }
  521 +
516 $('#biprice').addClass('is-select'); 522 $('#biprice').addClass('is-select');
517 523
518 getSelectData(function(d) { 524 getSelectData(function(d) {
@@ -521,43 +527,34 @@ var Order = { @@ -521,43 +527,34 @@ var Order = {
521 juanText = $('.play-juan input[value="' + d.couponCode + '"]').next().text(); 527 juanText = $('.play-juan input[value="' + d.couponCode + '"]').next().text();
522 } 528 }
523 529
524 - //if (d.yohoCoin * 1 === 0) {  
525 - if (!/^\d+$/.test(d.yohoCoin + '') || d.yohoCoin * 1 === 0) { 530 + if (d.yohoCoin * 1 <= 0) {
526 $('.errbitip').html('请输入一个正整数'); 531 $('.errbitip').html('请输入一个正整数');
527 $('#biprice').removeClass('is-select'); 532 $('#biprice').removeClass('is-select');
  533 + return false;
528 534
529 - } else if (d.yohoCoin * 1 > $('.play-pan em').text() * 1) {  
530 -  
531 - $('.errbitip').html('您的有货币不足');  
532 - $('#biprice').removeClass('is-select');  
533 -  
534 - } else {  
535 - e.$loading.show();  
536 -  
537 - options = {  
538 - type: 'POST',  
539 - url: '/cart/index/orderCompute',  
540 - data: d,  
541 - success: function(data) { 535 + }
542 536
543 - e.$loading.hide(); 537 + e.$loading.show();
  538 + options = {
  539 + type: 'POST',
  540 + url: '/cart/index/orderCompute',
  541 + data: d,
  542 + success: function(data) {
544 543
545 - if (data.code === 200) { 544 + e.$loading.hide();
546 545
547 - u.render(data.data, juanText);  
548 - c.winHide(pan); 546 + if (data.code === 200) {
549 547
550 - //$('.play-bi-pan dt').hide(); 548 + u.render(data.data, juanText);
  549 + c.winHide(pan);
551 550
552 - } else {  
553 - $('.errbitip').html(data.message);  
554 - $('#biprice').removeClass('is-select');  
555 - } 551 + } else {
  552 + $('.errbitip').html(data.message);
  553 + $('#biprice').removeClass('is-select');
556 } 554 }
557 - };  
558 -  
559 - $.ajax(options);  
560 - } 555 + }
  556 + };
  557 + $.ajax(options);
561 558
562 }); 559 });
563 }); 560 });
@@ -570,21 +567,6 @@ var Order = { @@ -570,21 +567,6 @@ var Order = {
570 567
571 c.winShow($pan); 568 c.winShow($pan);
572 }); 569 });
573 - //不须要手动输入有货币了。  
574 - // e.$bp.keyup(function() {  
575 -  
576 -  
577 - // var val = $(this).val();  
578 -  
579 - // //if (val * 1 < 0 || val.indexOf('.') > 0) {  
580 - // if (!/^\d+$/.test(val + '')) {  
581 - // e.$errorTip.html('请输入一个正整数');  
582 - // } else if (val * 1 > $(this).data('bi') * 1) {  
583 - // e.$errorTip.html('您的有货币不足');  
584 - // } else {  
585 - // e.$errorTip.html('抵扣' + (val / 100).toFixed(2) + '元');  
586 - // }  
587 - // });  
588 570
589 // 取消yoho 币 571 // 取消yoho 币
590 $('.cancel-bi').click(function() { 572 $('.cancel-bi').click(function() {
@@ -152,6 +152,11 @@ @@ -152,6 +152,11 @@
152 margin-bottom:5px; 152 margin-bottom:5px;
153 } 153 }
154 154
  155 + .pan dt.not-btn {
  156 + background: resolve(/order/not-btn.png) no-repeat center center;
  157 + cursor: auto;
  158 + }
  159 +
155 .pan dd { 160 .pan dd {
156 display: none; 161 display: none;
157 border: 1px #ccc solid; 162 border: 1px #ccc solid;