有货币使用提示语

郝肖肖
Commit eeca848d206914e887320443cfa9e9647dd6e80e 1 parent 3f329109
Showing 3 changed files with 4 additions and 17 deletions
web-static/js/order/ensure.js
web-static/js/order/ticket-ensure.js
yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
--- a/web-static/js/order/ensure.js
View file @eeca848
+++ b/web-static/js/order/ensure.js
View file @eeca848
@@ -520,7 +520,6 @@ var Order = {
                 var pan = $(this).parents('dl.pan');
                 var juanText;
-                $('.errbitip').html('');
                 $('#biprice').addClass('is-select');
                 getSelectData(function(d) {
@@ -529,12 +528,6 @@ var Order = {
                         juanText = $('.play-juan input[value="' + d.couponCode + '"]').next().text();
                     }
-                    if (d.yohoCoin * 1 <= 0) {
-                        $('.errbitip').html('请输入一个正整数');
-                        $('#biprice').removeClass('is-select');
-                        return false;
-                    }
-
                     e.$loading.show();
                     options = {
                         type: 'POST',
@@ -542,7 +535,7 @@ var Order = {
                         data: d,
                         success: function(data) {
                             var result = data.data;
-
+                            $('.errbitip').html('');
                             e.$loading.hide();
                             if (data.code === 200) {
                                 if (result.yohoCoinCompute && !result.yohoCoinCompute.yohoCoinClick) {
--- a/web-static/js/order/ticket-ensure.js
View file @eeca848
+++ b/web-static/js/order/ticket-ensure.js
View file @eeca848
@@ -166,14 +166,8 @@ var TicketCat = {
             var pan = $(this).parents('dl.pan');
             var selectData = {};
-            $('.errbitip').html('');
             $('#biprice').addClass('is-select');
             selectData = _this.getSelectData();
-            if (selectData.yohoCoin * 1 <= 0) {
-                $('.errbitip').html('请输入一个正整数');
-                $('#biprice').removeClass('is-select');
-                return false;
-            }
             el.$loading.show();
             $.ajax({
@@ -182,7 +176,7 @@ var TicketCat = {
                 data: selectData,
                 success: function(data) {
                     var result = data.data;
-
+                    $('.errbitip').html('');
                     el.$loading.hide();
                     if (data.code === 200) {
                         if (result.yohoCoinCompute && !result.yohoCoinCompute.yohoCoinClick) {
--- a/yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
View file @eeca848
+++ b/yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
View file @eeca848
@@ -1617,13 +1617,13 @@ class CartModel
         ];
         if ($yohoCoinData['totalYohoCoinNum'] < 100) {
-            $yohoCoinData['yohoCoinMsg'] = "共{$yohoCoinData['totalYohoCoinNum']}有货币，满{$orderCompute['yoho_coin_pay_rule']['num_limit']}可用";
+            $yohoCoinData['yohoCoinMsg'] = "抱歉，您的有货币不足，有货币满{$orderCompute['yoho_coin_pay_rule']['num_limit']}个方可使用";
         } else if ($yohoCoinData['useYohoCoin'] > 0 || $yohoCoinData['yohoCoin'] > 0) {
             $yohoCoinData['yohoCoinMsg'] = '可抵¥' . ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']);
             $yohoCoinData['yohoCoinClick'] = 1;
             $yohoCoinData['yohoCoinNum'] = ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']) * 100;
         } else {
-            $yohoCoinData['yohoCoinMsg'] = "不满足有货币使用条件";
+            $yohoCoinData['yohoCoinMsg'] = "抱歉，您的订单实付款不满足有货币使用条件";
         }
         return $yohoCoinData;
     }