Merge branch 'feature/order-save' of git.dev.yoho.cn:web/yohobuy into feature/order-save

Conflicts:
	web-static/js/order/save.js

@@ -72,19 +72,20 @@ var Order = {
             });
             });
 
 
             /*使用优惠卷支付 下面的文本框*/
             /*使用优惠卷支付 下面的文本框*/
-            e.$jc.focus(function() {
-                $(this).prev('label').prev(':radio').attr('checked', true);
-            }).change(function() {
-                $(this).prev('label').prev(':radio').val($(this).val());
+            e.$jc.on('focus change', function(event) {
+                var radio = $(this).prev('label').prev(':radio');
+
+                if (event.type === 'focus') {
+                    radio.attr('checked', true);
+                } else {
+                    radio.val($(this).val());
+                }
+
             });
             });
 
 
             /*使用YOHO币支付*/
             /*使用YOHO币支付*/
             e.$bp.data('tobi', e.$tobi.html());
             e.$bp.data('tobi', e.$tobi.html());
-            e.$bp.keyup(function() {
-                var bi = c.enterNUM($(this).val(), $(this).data('tobi'));
-
-                $(this).val(bi);
-            }).change(function() {
+            e.$bp.on('keyup change', function() {
                 var bi = c.enterNUM($(this).val(), $(this).data('tobi'));
                 var bi = c.enterNUM($(this).val(), $(this).data('tobi'));
 
 
                 $(this).val(bi);
                 $(this).val(bi);
@@ -140,8 +141,8 @@ var Order = {
             var i = 0;
             var i = 0;
 
 
             e.$total.html('0.00');
             e.$total.html('0.00');
+            e.$statistics.find('em').html('0.00');
             e.$statistics.slice(3, 5).hide();
             e.$statistics.slice(3, 5).hide();
-            e.$statistics.slice(0, 5).find('em').html('0.00');
 
 
             $.each(d, function(key) {
             $.each(d, function(key) {
                 if (d.hasOwnProperty(key)) {
                 if (d.hasOwnProperty(key)) {
@@ -192,7 +193,7 @@ var Order = {
         }
         }
     },
     },
     /*业务逻辑*/
     /*业务逻辑*/
-    Submit: {
+    Bll: {
         e: {
         e: {
             $juanok: $('#juansubmit'),
             $juanok: $('#juansubmit'),
             $juantip: $('.errtip', '.play-juan-pan'),
             $juantip: $('.errtip', '.play-juan-pan'),
@@ -207,15 +208,15 @@ var Order = {
 
 
             /*点击 优惠卷支付 确认按钮*/
             /*点击 优惠卷支付 确认按钮*/
             e.$juanok.click(function() {
             e.$juanok.click(function() {
-                var $jgroup = $('input[name="juangroup"]:checked');
+                var code = $('input[name="juangroup"]:checked').val();
                 var pan = $(this).parents('.pan');
                 var pan = $(this).parents('.pan');
 
 
-                if ($jgroup.val()) {
+                if (code) {
                     options = {
                     options = {
                         url: '/Order/save/priceByCode',
                         url: '/Order/save/priceByCode',
                         type: 'post',
                         type: 'post',
                         data: {
                         data: {
-                            code: $jgroup.val()
+                            code: code
                         },
                         },
                         success: function(data) {
                         success: function(data) {
                             if (data.code === 200) {
                             if (data.code === 200) {
@@ -254,9 +255,9 @@ Order.Data.activity = 0;
 Order.Data.carriage = 0;
 Order.Data.carriage = 0;
 
 
 Order.UI.init();
 Order.UI.init();
-Order.Submit.init();
+Order.Bll.init();
 
 
 
 
 address.newAddress();
 address.newAddress();
 address.modifyAddress();
 address.modifyAddress();
-address.saveAddress();
+address.saveAddress();