Merge branch 'feature/yohoCoin' into release/5.2

@@ -432,7 +432,8 @@ var Order = {
             e.$selectExpress.click(function() {
 
                 var expressId = $(this).val();
-
+                //订单金额发生变化，使用有货币重置
+                $('#biprice').removeClass('is-select');
                 e.$loading.show();
 
                 getSelectData(function(d) {
@@ -455,6 +456,7 @@ var Order = {
                                 } else if (expressId === '2') {
                                     $('.express-list.sf').removeClass('hide');
                                 }
+                                
                             } else {
                                 new dialog.Alert(data.message).show();
                             }
@@ -473,7 +475,8 @@ var Order = {
                 var juanText = '';
 
                 $('.play-juan').addClass('is-select');
-
+                //订单金额发生变化，使用有货币重置
+                $('#biprice').removeClass('is-select');
                 getSelectData(function(d) {
 
                     var code = d.couponCode;
@@ -484,10 +487,9 @@ var Order = {
                         $('.play-juan').removeClass('is-select');
 
                     } else {
-
+                        
                         e.$loading.show();
 
-
                         options = {
                             type: 'POST',
                             url: '/cart/index/orderCompute',
@@ -634,7 +636,8 @@ var Order = {
                 var $pan = $('.play-juan-pan');
 
                 if ($('.play-juan').hasClass('is-select')) {
-
+                    //订单金额发生变化，使用有货币重置
+                    $('#biprice').removeClass('is-select');
                     e.$loading.show();
 
                     getSelectData(function(d) {
@@ -660,7 +663,6 @@ var Order = {
 
                                     // $('.use-envelopes input').attr('checked', 'checked');
                                     // $('.red-envelopes').addClass('active');
-
                                 } else {
                                     e.$juantip.html(data.message);
                                 }
@@ -683,6 +685,8 @@ var Order = {
                 var $this = $(this),
                         juanText;
 
+                //订单金额发生变化，使用有货币重置
+                $('#biprice').removeClass('is-select');
                 e.$loading.show();
 
                 $this.attr('disabled', 'disabled');
@@ -700,7 +704,6 @@ var Order = {
                     }
 
                     juanText = $('.play-juan input[value="' + d.couponCode + '"]').next().text();
-
                     options = {
                         type: 'POST',
                         url: '/cart/index/orderCompute',

@@ -202,19 +202,6 @@ var TicketCat = {
             c.winShow($pan);
         });
 
-        //键盘事件，计算有币货抵多少钱
-        $('#biprice').keyup(function() {
-            var val = $(this).val();
-
-            if (!/^\d+$/.test(val + '')) {
-                el.$errorTip.html('请输入一个正整数');
-            } else if (val * 1 > $(this).data('bi') * 1) {
-                el.$errorTip.html('您的有货币不足');
-            } else {
-                el.$errorTip.html('抵扣' + (val / 100).toFixed(2) + '元');
-            }
-        });
-
         // 取消yoho 币
         $('.cancel-bi').click(function() {
             var $pan = $('.play-bi-pan'),

@@ -402,13 +402,13 @@
                     border: 1px solid #000;
                     margin-top: 10px;
                     width: 240px;
-                    padding: 15px 20px;
+                    padding: 5px 10px;
                     text-align: left;
                     font-size: 12px;
                     cursor: auto;
 
                     li {
-                        margin-top: 10px;
+                        margin-top: 5px;
                     }
                 }