Merge branch 'feature/yohoCoin' into release/5.2

@@ -50,7 +50,6 @@ var Order = {
         e: {
             $pan: $('.pan'),
             $jc: $('#juancode'),
-            $bp: $('#biprice'),
             $statistics: $('li', '.play-total'),
             $tobi: $('p em', '.play-bi-pan .play-pan'),
             $cancel: $('.cancel', '.btn-group'),
@@ -376,7 +375,6 @@ var Order = {
             $biok: $('#bisubmit'),
             $carriageGroup: $('input[name="carriagegroup"]'),
             $selectExpress: $('.express-list input'),
-            $bp: $('#biprice'),
             $errorTip: $('.errbitip'),
             $useEnvelopes: $('.use-envelopes'),
             $hasEnvelopes: $('.has-envelopes span'),
@@ -395,7 +393,7 @@ var Order = {
 
                 var $juangroupInput = $('.play-juan.is-select input[name="juangroup"]:checked');
                 var expressVal = $('.express-list input[name="carriagegroup"]:checked').val();
-                var biVal = $('#biprice.is-select').data('yoho-coin-num') * 1;
+                var biVal = $('#biprice.is-select').data('yoho-coin-num') * 1 || 0;
                 var codeVal = $juangroupInput.val();
                 var cartType = $('.address-manage').attr('cart-type');
                 var redEnvelopes = $('.use-envelopes input:checked').attr('data-use');
@@ -603,17 +601,8 @@ var Order = {
                                 if (data.code === 200) {
                                     u.render(data.data, juanText);
                                     c.winHide($pan);
-
-                                    $('#biprice').val('0');
-
-                                    //$('.play-bi-pan dt').hide();
                                     $('#biprice').removeClass('is-select');
-
                                     $('.errbitip').html('');
-
-                                    // $('.use-envelopes input').attr('checked', 'checked');
-                                    // $('.red-envelopes').addClass('active');
-
                                 } else {
                                     $('.errbitip').html(data.message);
                                 }
@@ -625,7 +614,6 @@ var Order = {
 
                 } else {
                     c.winHide($pan);
-                    $('#biprice').val('0');
                 }
 
             });

@@ -234,7 +234,6 @@ var TicketCat = {
                         _this.render(data.data);
                         c.winHide($pan);
 
-                        $('#biprice').val('0');
                         $('#biprice').removeClass('is-select');
                         $('.errbitip').html('');
                     } else {
@@ -344,7 +343,7 @@ var TicketCat = {
     },
     getSelectData: function() {
         var expressVal = $('.express-list input[name="carriagegroup"]:checked').val();
-        var biVal = $('#biprice.is-select').data('yoho-coin-num') * 1;
+        var biVal = $('#biprice.is-select').data('yoho-coin-num') * 1 || 0;
         var cartType = $('.address-manage').attr('cart-type');
         var resultData;
 

@@ -355,6 +355,10 @@
 
         .play-bi-pan {
 
+            .errbitip {
+                text-align: left;
+            }
+
             .play-pan {
                 width: 100%;