Merge branch 'feature/shoppingCart' into release/5.4.1

@@ -75,6 +75,7 @@
 </script>
 </script>
 
 
 <script id="invoice-chose-tpl" type="text/html">
 <script id="invoice-chose-tpl" type="text/html">
+    <div class="invoice-close"><i class="iconfont">&#xe60d;</i></div>
     <p class="invoice-header">发票信息</p>
     <p class="invoice-header">发票信息</p>
     <ul class="invoice-type">
     <ul class="invoice-type">
         <li class="el-invoice focus">电子发票</li>
         <li class="el-invoice focus">电子发票</li>

@@ -60,7 +60,7 @@ Hbs.registerHelper('round', function(num, precision) {
 
 
 // 订单计算
 // 订单计算
 // 传有货币数量则使用有货币，否者不使用，更改订单总价有货币使用数量重置为0
 // 传有货币数量则使用有货币，否者不使用，更改订单总价有货币使用数量重置为0
-function compute(coin) {
+function compute(coin, cb) {
     var reqData = {
     var reqData = {
         cartType: order.cartType,
         cartType: order.cartType,
         coin: coin ? coin : 0
         coin: coin ? coin : 0
@@ -112,6 +112,11 @@ function compute(coin) {
 
 
             // update promotion formula list
             // update promotion formula list
             $balanceDetail.html(promotionTpl(res));
             $balanceDetail.html(promotionTpl(res));
+
+            // callback
+            if (cb && typeof cb === 'function') {
+                return cb();
+            }
         } else if (data.code === 317) {
         } else if (data.code === 317) {
             if (coupon.$errorTip) {
             if (coupon.$errorTip) {
                 coupon.$errorTip.text(data.message);
                 coupon.$errorTip.text(data.message);
@@ -479,30 +484,25 @@ coupon = {
             that.cancelTicketUse();
             that.cancelTicketUse();
         }).on('change', '.coupon-code', function() {
         }).on('change', '.coupon-code', function() {
             that.$errorTip.empty();
             that.$errorTip.empty();
-        }).on('click', '.opt-area > label', function() {
+        }).on('click', '.sure-use-ticket', function() {
+            that.close();
+        }).on('click', '.sure-use-code', function() {
             var $this = $(this);
             var $this = $(this);
-            var couponId, data;
+            var couponId;
 
 
-            if ($this.hasClass('sure-use-ticket')) {
-                data = that.$radios.filter('.on').data();
-
-                if (data) {
-                    that.$ticketUseTip.find('.price').text('- ¥' + data.price);
-                    that.$ticketUseTip.removeClass('hide');
-                    couponId = data.id;
-                }
-            } else {
-                couponId = $this.siblings('.coupon-code').val();
-            }
+            couponId = $this.siblings('.coupon-code').val();
 
 
             if (couponId) {
             if (couponId) {
                 order.couponCode = couponId;
                 order.couponCode = couponId;
 
 
                 // 重新计算订单价格
                 // 重新计算订单价格
-                compute();
+                compute(0, function() {
+                    that.close();
+                });
             }
             }
         }).on('click', '.coupon-radio', function() {
         }).on('click', '.coupon-radio', function() {
-            var $this = $(this);
+            var $this = $(this),
+                data, couponId;
 
 
             if ($this.hasClass('on')) {
             if ($this.hasClass('on')) {
                 return;
                 return;
@@ -512,6 +512,20 @@ coupon = {
                 that.$radios.filter('.on').removeClass('on');
                 that.$radios.filter('.on').removeClass('on');
             }
             }
             $this.addClass('on');
             $this.addClass('on');
+            data = $this.data();
+
+            if (data) {
+                that.$ticketUseTip.find('.price').text('- ¥' + data.price);
+                that.$ticketUseTip.removeClass('hide');
+                couponId = data.id;
+            }
+
+            if (couponId) {
+                order.couponCode = couponId;
+
+                // 重新计算订单价格
+                compute();
+            }
         });
         });
     },
     },
     cancelTicketUse: function() {
     cancelTicketUse: function() {
@@ -531,6 +545,9 @@ coupon = {
             delete order.couponCode;
             delete order.couponCode;
             compute(); // 重新计算订单价格
             compute(); // 重新计算订单价格
         }
         }
+    },
+    close: function() {
+        this.$el.children('.locker-switch').trigger('click');
     }
     }
 };
 };
 
 
@@ -584,6 +601,7 @@ $('.locker-switch').click(function() {
 
 
 (function() {
 (function() {
     var $redSureBtn = $('#red-packet-sure');
     var $redSureBtn = $('#red-packet-sure');
+    var $redPacketBox = $('#red-packet-box');
     var used;
     var used;
 
 
     if (!$redSureBtn.length) {
     if (!$redSureBtn.length) {
@@ -598,12 +616,15 @@ $('.locker-switch').click(function() {
         $redSureBtn.siblings('.radio-btn').addClass('on');
         $redSureBtn.siblings('.radio-btn').addClass('on');
     }
     }
 
 
-    $('#red-packet-box').on('click', '.radio-btn', function() {
+    $redPacketBox.on('click', '.radio-btn', function() {
         $(this).toggleClass('on');
         $(this).toggleClass('on');
     }).on('click', '.sure-btn', function() {
     }).on('click', '.sure-btn', function() {
         var $this = $(this),
         var $this = $(this),
             num = $this.data('num');
             num = $this.data('num');
 
 
+        // 触发关闭事件
+        $redPacketBox.prev().children('.locker-switch').trigger('click');
+
         if (!num) {
         if (!num) {
             return;
             return;
         }
         }

@@ -100,6 +100,10 @@ function bindInvoiceEvent($el) {
         $goodsTypeWrap.find('.on').removeClass('on');
         $goodsTypeWrap.find('.on').removeClass('on');
         $this.addClass('on');
         $this.addClass('on');
     });
     });
+
+    $el.on('click', '.invoice-close', function() {
+        $('.btn-close', $el).trigger('click');
+    });
 }
 }
 
 
 function bindInvoiceInfo($el, info) {
 function bindInvoiceInfo($el, info) {

@@ -713,7 +713,7 @@
                 b {
                 b {
                     display: inline-block;
                     display: inline-block;
                     vertical-align: bottom;
                     vertical-align: bottom;
-                    max-width: 120px;
+                    max-width: 110px;
                     margin-right: 10px;
                     margin-right: 10px;
                     overflow: hidden;
                     overflow: hidden;
                     text-overflow: ellipsis;
                     text-overflow: ellipsis;

@@ -1521,6 +1521,21 @@
     color: #444;
     color: #444;
     background-color: #fff;
     background-color: #fff;
 
 
+    > .close {
+        display: none;
+    }
+
+    .invoice-close {
+        position: absolute;
+        top: 10px;
+        right: 12px;
+        cursor: pointer;
+
+        .iconfont {
+            font-size: 32px;
+        }
+    }
+
     .radio-btn {
     .radio-btn {
         &:before {
         &:before {
             content: '';
             content: '';
@@ -1540,15 +1555,6 @@
         }
         }
     }
     }
 
 
-    > .close {
-        top: 10px;
-        right: 12px;
-
-        .iconfont {
-            font-size: 32px;
-        }
-    }
-
     > .content {
     > .content {
         text-align: left;
         text-align: left;
     }
     }