Merge branch 'feature/cart' into 'release/5.4.1'

订单结算页 BUG 修复



See merge request !245

@@ -24,7 +24,7 @@ exports.orderEnsure = (req, res, next) => {
     });
 
     let uid = req.user.uid;
-    let returnUrl = helpers.urlFormat('/cart/index/new');
+    let returnUrl = helpers.urlFormat('/cart/index/index');
     let cartType = req.query.cartType;
     let orderInfo;
 
@@ -47,6 +47,8 @@ exports.orderEnsure = (req, res, next) => {
 
     if (limitProductCode) {
         headerData.backUrl = req.get('Referer') || returnUrl;
+    } else {
+        headerData.backUrl = returnUrl;
     }
 
     let orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber);
@@ -243,7 +245,7 @@ exports.selectCoupon = (req, res) => {
 
     let headerData = headerModel.setNav({
         navTitle: '选择优惠券',
-        backUrl: helpers.urlFormat('/cart/new/orderEnsure'),
+        backUrl: helpers.urlFormat('/cart/index/new/orderEnsure'),
         navBtn: false
     });
 

@@ -91,7 +91,7 @@
         <ul class="sale-invoice">
             {{#if isOrdinaryCart}}
             <li class="coupon">
-                <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/selectCoupon{{/if}}">
+                <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/new/selectCoupon{{/if}}">
                     <span class="title">优惠券</span>
                     {{# coupon}}
                     <span class="coupon-count">

@@ -362,7 +362,7 @@ if (!orderInfo('addressId')) {
 $('.delivery-id').on('touchend', 'li', function() {
     orderInfo('deliveryId', $(this).data('id'));
 
-    //实付金额发生变化，使用有货币为0
+    // 实付金额发生变化，使用有货币为0
     orderInfo('yohoCoin', 0);
     $('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio');
 
@@ -462,7 +462,7 @@ $('.dispatch').on('touchend', 'h3', function() {
 });
 
 $subBlock.on('touchstart', 'li', function() {
-    //送货时间提示语li，不响应事件
+    // 送货时间提示语li，不响应事件
     if ($(this).hasClass('dispatch-time-info')) {
         return true;
     }
@@ -470,7 +470,12 @@ $subBlock.on('touchstart', 'li', function() {
     $.each($(this).parents('ul').find('i'), function() {
         $(this).parents('ul').find('i').removeClass('icon-cb-radio').addClass('icon-radio');
     });
-    $(this).parents('ul').hide();
+    let self = $(this);
+
+    setTimeout(function() {
+        self.parents('ul').hide();
+    }, 300);
+
     $('.down').removeClass('hide');
     $('.up').addClass('hide');
     $('.dispatch h3').removeClass('border-none');

@@ -565,6 +565,11 @@
             padding-bottom: 0;
             margin-bottom: -0.5rem;
             border-bottom: none;
+
+            a {
+                display: inline-block;
+                width: 100%;
+            }
         }
 
         .more-jit {