From a52a11ba9a5204ddaac597770c8c9ab9c8e80458 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 28 May 2020 10:00:54 +0800
Subject: [PATCH] 因为赠品，物流和自选，自提和自选的没有办法同时选

---
 pages/cart/cart/cart.js | 3 +++
 1 file changed, 3 insertions(+), 0 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 698cb94..a30d88b 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -404,6 +404,7 @@ Page({
       iarr = item;
     if (!sele && item.length > 0) {
       for (var i = 0; i < iarr.length; i++) {
+        if(iarr[i].is_gift==1) continue;
         if (iarr[i].distr_type != 0) {
           if (fir == 0) {
             fir = iarr[i].distr_type;
@@ -452,6 +453,8 @@ Page({
     //当数量大于1，且是选择的时候
     if (iarr.length > 1 && !a.selected) {
       for (var i = 0; i < iarr.length; i++) {
+        if(iarr[i].is_gift==1) continue;
+
         //---当不是本身选择项目----
         var sel = iarr[i].selected;
         if (iarr[i].distr_type != 0 && (sel || iarr[i].id == a.id)) {
--
libgit2 0.21.4