Merge branch 'feature/yohoCoin' into release/5.2

@@ -241,6 +241,7 @@ var Order = {
                     isExpress = '';
 
             var tipsStr;
+            var isJuan = false;
 
             var envelopesVal;
 
@@ -253,6 +254,7 @@ var Order = {
             for (i = 0; i < dArr.length; i++) {
 
                 if (dArr[i].promotion === '优惠券：') {
+                    isJuan = true;
                     dArr[i].promotion = (tipsStr ? tipsStr : '优惠券') + '<span class="juan-modify">[修改]</span>：';
                 }
 
@@ -275,16 +277,23 @@ var Order = {
             e.$payTotal.html(str);
             e.$toPay.html((data.last_order_amount).toFixed(2));
 
-            //有货币清零状态更新
+            //有货币清零状态更新 start
             $('dl.play-bi-pan').find('dt').removeClass('not-btn');
             $('.not-btn-tip').addClass('hide');
             $('.yohoCoinTip').removeClass('coin-gray');
+            if (data.yohoCoinCompute.yohoCoinNum > 0) {
+                $('.errbitip').html('');
+            }
             if (!data.yohoCoinCompute.yohoCoinClick) {
-                //不可以使用状态
-                $('dl.play-bi-pan').find('dt').addClass('not-btn');
-                $('.not-btn-tip').removeClass('hide');
-                //如果有货币按钮为打开状态，则关闭
-                Order.Common.winHide($('.play-bi-pan'));
+                if (isJuan) {
+                    //不可以使用状态
+                    $('dl.play-bi-pan').find('dt').addClass('not-btn');
+                    $('.not-btn-tip').removeClass('hide');
+                    //如果有货币按钮为打开状态，则关闭
+                    Order.Common.winHide($('.play-bi-pan'));
+                }
+                $('.yohoCoinTip').addClass('coin-gray');
+                $('.errbitip').html(data.yohoCoinCompute.yohoCoinMsg);
             }
             $('#biprice').data({
                 'yoho-coin-num': data.yohoCoinCompute.yohoCoinNum,
@@ -294,6 +303,7 @@ var Order = {
             $('#biprice').find('.totalYohoCoinNum').html(data.yohoCoinCompute.totalYohoCoinNum);
             $('#biprice').find('.yohoCoinNum').html(data.yohoCoinCompute.yohoCoinNum);
             $('#biprice').find('.yohoCoin').html(data.yohoCoinCompute.yohoCoin);
+            //有货币清零状态更新 end
 
             //使用的红包
             envelopesVal = e.$useEnvelopesInput.data('all') - data.use_red_envelopes;

@@ -298,6 +298,7 @@ var TicketCat = {
             i,
             dArr = data.shopping_cart_data.promotion_formula_list,
             str = '',
+            isJuan = false,
             isExpress = '';
 
         for (i = 0; i < dArr.length; i++) {
@@ -321,16 +322,23 @@ var TicketCat = {
         e.$payTotal.html(str);
         e.$toPay.html((data.shopping_cart_data.last_order_amount).toFixed(2));
 
-        //有货币清零状态更新
+        //有货币清零状态更新 start
         $('dl.play-bi-pan').find('dt').removeClass('not-btn');
         $('.not-btn-tip').addClass('hide');
         $('.yohoCoinTip').removeClass('coin-gray');
+        if (data.yohoCoinCompute.yohoCoinNum > 0) {
+            $('.errbitip').html('');
+        }
         if (!data.yohoCoinCompute.yohoCoinClick) {
-            //不可以使用状态
-            $('dl.play-bi-pan').find('dt').addClass('not-btn');
-            $('.not-btn-tip').removeClass('hide');
-            //如果有货币按钮为打开状态，则关闭
-            _this.Common.winHide($('.play-bi-pan'));
+            if (isJuan) {
+                //不可以使用状态
+                $('dl.play-bi-pan').find('dt').addClass('not-btn');
+                $('.not-btn-tip').removeClass('hide');
+                //如果有货币按钮为打开状态，则关闭
+                _this.Common.winHide($('.play-bi-pan'));
+            }
+            $('.yohoCoinTip').addClass('coin-gray');
+            $('.errbitip').html(data.yohoCoinCompute.yohoCoinMsg);
         }
         $('#biprice').data({
             'yoho-coin-num': data.yohoCoinCompute.yohoCoinNum,
@@ -340,6 +348,7 @@ var TicketCat = {
         $('#biprice').find('.totalYohoCoinNum').html(data.yohoCoinCompute.totalYohoCoinNum);
         $('#biprice').find('.yohoCoinNum').html(data.yohoCoinCompute.yohoCoinNum);
         $('#biprice').find('.yohoCoin').html(data.yohoCoinCompute.yohoCoin);
+        //有货币清零状态更新 end
     },
     getSelectData: function() {
         var expressVal = $('.express-list input[name="carriagegroup"]:checked').val();