Merge branch 'hotfix/cart' into 'release/6.5'

advance-cart-gift



See merge request !1235

@@ -137,7 +137,8 @@ let cartObj = {
             tip.show('请先勾选商品');
             tip.show('请先勾选商品');
             return false;
             return false;
         }
         }
-        if (!cookie.get('_realyGift') && self.handle.cartData.matchGifts && self.handle.cartData.matchGifts.length) {
+        if (cookie.get('_cartType') === 'ordinary' && !cookie.get('_realyGift') &&
+            self.handle.cartData.matchGifts && self.handle.cartData.matchGifts.length) {
             dialog.showDialog({
             dialog.showDialog({
                 dialogText: '您还未选择赠品，是否去选择赠品',
                 dialogText: '您还未选择赠品，是否去选择赠品',
                 hasFooter: {
                 hasFooter: {