Merge branch 'develop' into test

@@ -106,7 +106,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
                 });
                 orderInfo('couponCode', null);
                 orderInfo('couponName', null);
-                history.go(0);
+                window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
             } else {
                 tip.show(data.message);
             }