Merge remote-tracking branch 'origin/hotfix/yohocoinuse' into stable

@@ -40,7 +40,15 @@ if ($couponUse.data('name') !== orderInfo('couponName')) {
     orderInfo('couponName', null);
     orderInfo('couponName', null);
 }
 }
 
 
-orderInfo('cartType', queryString.cartType || queryString.carttype || 'ordinary');
+// 来自购物车的链接默认不使用优惠券
+if (document.referrer && document.referrer.indexOf('/cart/index/index') !== -1) {
+    orderInfo('couponCode', null);
+    orderInfo('couponName', null);
+}
+
+if (queryString.cartType || queryString.carttype || !orderInfo('cartType')) {
+    orderInfo('cartType', queryString.cartType || queryString.carttype || 'ordinary');
+}
 
 
 function dispacthTapEvt(e) {
 function dispacthTapEvt(e) {
     var $cur = $(e.target).closest('li');
     var $cur = $(e.target).closest('li');
@@ -234,10 +242,10 @@ $('.coin').on('touchend', function() {
     orderCompute();
     orderCompute();
 });
 });
 
 
-$invoice.on('touchend', function(e) {
+$invoice.on('touchend', '.checkbox', function(e) {
     var $this = $(this);
     var $this = $(this);
 
 
-    orderInfo('invoice', $this.find('.checkbox').hasClass('icon-cb-checked'));
+    orderInfo('invoice', $this.hasClass('icon-cb-checked'));
     e.preventDefault();
     e.preventDefault();
     e.stopPropagation();
     e.stopPropagation();
 });
 });