diff --git a/components/privacy_pop/privacy_pop.js b/components/privacy_pop/privacy_pop.js
index 1ec796c..9e03040 100644
--- a/components/privacy_pop/privacy_pop.js
+++ b/components/privacy_pop/privacy_pop.js
@@ -17,22 +17,24 @@ Component({
   methods: {
     //判断用户有没有同意安全隐私
     check_pri_show(){
-        wx.getPrivacySetting({
-            success: res => {
-                console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
-                if (res.needAuthorization) {
-                    // 需要弹出隐私协议
-                    this.setData({
-                        show_pri: 1
-                    })
-                }else{
-                    this.setData({
-                        show_pri: 0
-                    })
-                    this.triggerEvent('agree_pri');// 调用同意的函数
-                }
-            }
-        })
+        if(wx.getPrivacySetting){
+                wx.getPrivacySetting({
+                    success: res => {
+                        console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
+                        if (res.needAuthorization) {
+                            // 需要弹出隐私协议
+                            this.setData({
+                                show_pri: 1
+                            })
+                        }else{
+                            this.setData({
+                                show_pri: 0
+                            })
+                            this.triggerEvent('agree_pri');// 调用同意的函数
+                        }
+                    }
+                })
+        }
     },
     //--- 分享 ---
     goto:function (e) {
diff --git a/components/store_popup/store_popup.js b/components/store_popup/store_popup.js
index 96d88d7..7f3097c 100644
--- a/components/store_popup/store_popup.js
+++ b/components/store_popup/store_popup.js
@@ -129,6 +129,7 @@ Component({
       getApp().get_user_store(function (e) {
         if (!e) {
           th.data.fir_def_store = {}; //赋值空对象
+          if (func) func();
           return false;
         }
 
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 0a121ad..40fe8dd 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1026,6 +1026,7 @@ Page({
       //-----------循环查找门店-------------
       if (arr.length > 0) {
         for (var j = 0; j < arr.length; j++) {
+
           if (arr[j].pickup_id == pcid) {
             if (item.is_gift != 1) {
                 //确定配送方式
@@ -1044,15 +1045,22 @@ Page({
             }
             switch (dis_t) {
               case 0:
-                e_t = 1;
-                //-- 系统后台有设置要默认的 --
-                if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
+                if(!arr[j].exp_sure){
+                   e_t = 1;
+                   //-- 系统后台有设置要默认的 --
+                   if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
+                   arr[j].exp_type=e_t
+                }
                 break;
               case 1:
                 e_t = 1;
+                arr[j].exp_sure=1
+                arr[j].exp_type=1
                 break;
               case 2:
                 e_t = 0;
+                arr[j].exp_sure=1
+                arr[j].exp_type=0
                 break;
             }
             //如果是物流的话，全部自提的控制要弄成0
@@ -1115,6 +1123,9 @@ Page({
         } else {
           dis_t = item.distr_type;
         }
+
+        let exp_sure=0;
+
         switch (dis_t) {
           case 0:
             e_t = 1;
@@ -1123,9 +1134,11 @@ Page({
             break;
           case 1:
             e_t = 1;
+            exp_sure=1;
             break;
           case 2:
             e_t = 0;
+            exp_sure=1;
             break;
         }
         //如果是物流的话，全部自提的控制要弄成0
@@ -1147,7 +1160,7 @@ Page({
         }
 
 
-          if (back_data && parseFloat(back_data)) {
+        if (back_data && parseFloat(back_data)) {
             c_item.can_usecommise = parseFloat(parseFloat(back_data).toFixed(2));
             cart_commission += c_item.can_usecommise;
           }
@@ -1166,7 +1179,8 @@ Page({
           total_amount: 0,
           order_amount: 0,
           user_note: "",
-          sto: sto
+          sto: sto,
+          exp_sure:1
         };
 
         //-- 把等级卡会优惠多少钱装进去 --
@@ -1209,199 +1223,197 @@ Page({
     //-- 循环计算一下线下取价 --
     for (var k = 0; k < arr.length; k++) {
       var c_item = arr[k];
-      if(!is_change){
+      if (!is_change) {
         //-- 要进行归类一下活动 --
-        await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,0,(show_can_cx)=>{
+        await m_cx.cart_cx_group(th, arr[k].goods, c_item, 0, 0, (show_can_cx) => {
 
-          arr[k].show_can_cx=show_can_cx;
+          arr[k].show_can_cx = show_can_cx;
         })
-      }else{
-          var show_can_cx=this.data.cartlist[k].show_can_cx;
-          //-- 多促销活动的优化 --
-          if(show_can_cx){
-            arr[k].show_can_cx=show_can_cx;
-          }
+      } else {
+        var show_can_cx = this.data.cartlist[k].show_can_cx;
+        //-- 多促销活动的优化 --
+        if (show_can_cx) {
+          arr[k].show_can_cx = show_can_cx;
+        }
       }
 
       //要在多活动确定之后，在来计算
-      for(var jh=0;jh<arr[k].goods.length;jh++){
-          var item1=arr[k].goods[jh]
-          //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
-          if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
-            // th.check_is_youhui(item1.goods_id, item1.pick_id);
-            //增加优惠活动次数限制
-            let limit_num= await th.getprom(item1)  //活动限制次数
-
-            if(!limit_num){
+      for (var jh = 0; jh < arr[k].goods.length; jh++) {
+        var item1 = arr[k].goods[jh]
+        //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
+        if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
+          // th.check_is_youhui(item1.goods_id, item1.pick_id);
+          //增加优惠活动次数限制
+          let limit_num = await th.getprom(item1)  //活动限制次数
+
+          if (!limit_num) {
+            await th.add_prom_goods_map(item1);
+            // item1.prom_id=''
+            // item1.prom_type=''
+          } else {
+            let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id)  //用户已经参与次数
+            if (user_pre_buynum < limit_num) {
               await th.add_prom_goods_map(item1);
-              // item1.prom_id=''
-              // item1.prom_type=''
-            }else{
-              let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id)  //用户已经参与次数
-              if(user_pre_buynum<limit_num){
-                await th.add_prom_goods_map(item1);
-              }else{
-                // await th.add_prom_goods_map(item1);
-                item1.prom_id=''
-                item1.prom_type=''
-              }
+            } else {
+              // await th.add_prom_goods_map(item1);
+              item1.prom_id = ''
+              item1.prom_type = ''
             }
           }
-          //-- 如果组合购的总数量不足的处理 --
-          // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
-          //   item1.prom_type = 0;
-          //   item1.prom_type1 = 0;
-          //   item1.prom_id = 0;
-          //   item1.prom_id1 = 0
-          // }
-
-          //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
-          if (item1.prom_type == 7) {
-            if (!th.data.zuhe_map_good[item1.prom_id]) {
-              var isok = 1;
-              var is_flag = 1;
-              var store_count_ok=1;
-              //如果有组合购
-              var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
-              await getApp().request.promiseGet(url, {}).then(res => {
-                if (res.data.code == 0 && res.data.data) {
-                  //如果活动已经结束
-                  if (res.data.data.is_end == 1) {
-                    isok = 0;
-                  }
-                  if (ut.gettimestamp() > res.data.data.end_time) {
-                    isok = 0;
-                  }
-                  item1.act = res.data.data;
-
-                  //-- 在这里要判断一下活动的组合购总数量 --
-                  if(item1.act.zh_num>0 && item1.act.zh_buy_num>=item1.act.zh_num){
-                    store_count_ok = 0;
-                    no_zh_num[item1.prom_id]=1;
-                    //-- 清理一下活动的状态 --
-                    // item1.prom_type = 0;
-                    // item1.prom_type1 = 0;
-                    // item1.prom_id = 0;
-                    // item1.prom_id1 = 0
-
-                  }else{
-                    th.data.zhhe_act_map[item1.prom_id] = res.data.data;
-                  }
+        }
+        //-- 如果组合购的总数量不足的处理 --
+        // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
+        //   item1.prom_type = 0;
+        //   item1.prom_type1 = 0;
+        //   item1.prom_id = 0;
+        //   item1.prom_id1 = 0
+        // }
 
-                } else {
-                  //未找到商品的活动
-                  is_flag = 0;
+        //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
+        if (item1.prom_type == 7) {
+          if (!th.data.zuhe_map_good[item1.prom_id]) {
+            var isok = 1;
+            var is_flag = 1;
+            var store_count_ok = 1;
+            //如果有组合购
+            var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
+            await getApp().request.promiseGet(url, {}).then(res => {
+              if (res.data.code == 0 && res.data.data) {
+                //如果活动已经结束
+                if (res.data.data.is_end == 1) {
+                  isok = 0;
                 }
-              })
-
-              if (!isok) {
-                getApp().my_warnning("组合购的活动已经过期", 0, th);
-                return false;
-              }
-
-              //------ 先增组合活动的总数量的时候 -------
-              if(store_count_ok) {
-                var url1 = "/api/weshop/prom/zhbuyGoods/page";
-                var req_data = {
-                  page: 1,
-                  pageSize: 2000,
-                  store_id: os.stoid,
-                  zh_id: item1.prom_id,
+                if (ut.gettimestamp() > res.data.data.end_time) {
+                  isok = 0;
                 }
-                await getApp().request.promiseGet(url1, {
-                  data: req_data
-                }).then(res => {
-                  if (ut.ajax_ok(res)) {
-                    var gdlist = res.data.data.pageData;
-                    gdlist.forEach(i => {
-                      if (item1.goods_id == i.goods_id && !is_flag) {
-                        item1.prom_type = 0;
-                        item1.prom_type1 = 0;
-                        item1.prom_id = 0;
-                        item1.prom_id1 = 0
-                      }
-                    })
-                    th.data.zuhe_map_good[item1.prom_id] = gdlist;
-                  }
-                })
-              }
-
-
-
-            }
-            else {
-              item1.act = th.data.zhhe_act_map[item1.prom_id];
-            }
-          }
-          if (item1.prom_type == 10) {
-            if (!th.data.ladder_map[item1.prom_id]) {
-              //如果有预售
-              var isok = 1;
-              var is_flag = 1;
-              var act = null;
-              var url = "/api/weshop/prom/ladderForm/get/" + os.stoid + "/" + item1.prom_id;
-              await getApp().request.promiseGet(url, {}).then(res => {
-                console.log(res, 1000);
-                if (res.data.code == 0 && res.data.data) {
-                  if (res.data.data.isuse != 1) {
-                    isok = 0;
-                  }
-                  //如果活动已经结束
-                  if (res.data.data.is_end == 1) {
-                    isok = 0;
-                  }
-                  //已经结束
-                  if (ut.gettimestamp() > res.data.data.end_time) {
-                    isok = 0;
-                  }
-                  //还未开始
-                  if (ut.gettimestamp() < res.data.data.start_time) {
-                    isok = 0;
-                  }
-                  act = res.data.data;
+                item1.act = res.data.data;
+
+                //-- 在这里要判断一下活动的组合购总数量 --
+                if (item1.act.zh_num > 0 && item1.act.zh_buy_num >= item1.act.zh_num) {
+                  store_count_ok = 0;
+                  no_zh_num[item1.prom_id] = 1;
+                  //-- 清理一下活动的状态 --
+                  // item1.prom_type = 0;
+                  // item1.prom_type1 = 0;
+                  // item1.prom_id = 0;
+                  // item1.prom_id1 = 0
 
                 } else {
-                  //未找到商品的活动
-                  is_flag = 0;
+                  th.data.zhhe_act_map[item1.prom_id] = res.data.data;
                 }
-              })
-              if (!isok) {
-                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
-                getApp().request.delete(url, {});
-                th.data.ladder_map[item1.prom_id] = -1;
-                continue;
+
+              } else {
+                //未找到商品的活动
+                is_flag = 0;
               }
-              th.data.ladder_map[item1.prom_id] = act;
+            })
+
+            if (!isok) {
+              getApp().my_warnning("组合购的活动已经过期", 0, th);
+              return false;
+            }
 
-              //-- 获取阶梯规则 --
-              var url1 = "/api/weshop/prom/ladderList/list";
+            //------ 先增组合活动的总数量的时候 -------
+            if (store_count_ok) {
+              var url1 = "/api/weshop/prom/zhbuyGoods/page";
               var req_data = {
+                page: 1,
+                pageSize: 2000,
                 store_id: os.stoid,
-                form_id: item1.prom_id,
+                zh_id: item1.prom_id,
               }
               await getApp().request.promiseGet(url1, {
                 data: req_data
-              }).then(rs1 => {
-                if (rs1.data.code == 0 && rs1.data.data) {
-                  var gdlist = rs1.data.data;
-                  th.data.ladder_map[item1.prom_id].ladder_list = gdlist;
+              }).then(res => {
+                if (ut.ajax_ok(res)) {
+                  var gdlist = res.data.data.pageData;
+                  gdlist.forEach(i => {
+                    if (item1.goods_id == i.goods_id && !is_flag) {
+                      item1.prom_type = 0;
+                      item1.prom_type1 = 0;
+                      item1.prom_id = 0;
+                      item1.prom_id1 = 0
+                    }
+                  })
+                  th.data.zuhe_map_good[item1.prom_id] = gdlist;
                 }
               })
             }
-          }
 
-          //-- 判断一下，获取搭配购的消息,只有prom_type==5才会判断优惠活动  --
-          if ( item1.prom_type == 5 && (!item1.collocationList || !item1.collocationList.length)) {
-            await th.set_collection(item1, arr[k].goods, jh);
+
+          } else {
+            item1.act = th.data.zhhe_act_map[item1.prom_id];
           }
+        }
+        if (item1.prom_type == 10) {
+          if (!th.data.ladder_map[item1.prom_id]) {
+            //如果有预售
+            var isok = 1;
+            var is_flag = 1;
+            var act = null;
+            var url = "/api/weshop/prom/ladderForm/get/" + os.stoid + "/" + item1.prom_id;
+            await getApp().request.promiseGet(url, {}).then(res => {
+              console.log(res, 1000);
+              if (res.data.code == 0 && res.data.data) {
+                if (res.data.data.isuse != 1) {
+                  isok = 0;
+                }
+                //如果活动已经结束
+                if (res.data.data.is_end == 1) {
+                  isok = 0;
+                }
+                //已经结束
+                if (ut.gettimestamp() > res.data.data.end_time) {
+                  isok = 0;
+                }
+                //还未开始
+                if (ut.gettimestamp() < res.data.data.start_time) {
+                  isok = 0;
+                }
+                act = res.data.data;
 
-          if (item1.collocationList) {
-            if (!arr[k].collocationList) arr[k].collocationList = item1.collocationList;
-            else {
-              var arr_new = [...arr[k].collocationList, ...item1.collocationList];
-              arr[k].collocationList = arr_new;
+              } else {
+                //未找到商品的活动
+                is_flag = 0;
+              }
+            })
+            if (!isok) {
+              var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
+              getApp().request.delete(url, {});
+              th.data.ladder_map[item1.prom_id] = -1;
+              continue;
+            }
+            th.data.ladder_map[item1.prom_id] = act;
+
+            //-- 获取阶梯规则 --
+            var url1 = "/api/weshop/prom/ladderList/list";
+            var req_data = {
+              store_id: os.stoid,
+              form_id: item1.prom_id,
             }
+            await getApp().request.promiseGet(url1, {
+              data: req_data
+            }).then(rs1 => {
+              if (rs1.data.code == 0 && rs1.data.data) {
+                var gdlist = rs1.data.data;
+                th.data.ladder_map[item1.prom_id].ladder_list = gdlist;
+              }
+            })
+          }
+        }
+
+        //-- 判断一下，获取搭配购的消息,只有prom_type==5才会判断优惠活动  --
+        if (item1.prom_type == 5 && (!item1.collocationList || !item1.collocationList.length)) {
+          await th.set_collection(item1, arr[k].goods, jh);
+        }
+
+        if (item1.collocationList) {
+          if (!arr[k].collocationList) arr[k].collocationList = item1.collocationList;
+          else {
+            var arr_new = [...arr[k].collocationList, ...item1.collocationList];
+            arr[k].collocationList = arr_new;
           }
+        }
 
       }
 
@@ -1412,25 +1424,32 @@ Page({
       //计算佣金的商品
       var commission_gds = [];
       for (var c = 0; c < item.length; c++) {
-        if (!item[c].is_gift) {
-          var hr = {
-            goods_id: item[c].goods_id,
-            goods_num: item[c].goods_num,
-            prom_type: item[c].prom_type,
-            prom_id: item[c].prom_id,
 
-          }
-          let req_d1 = {
-            user_id: getApp().globalData.user_id, goods_ids: [hr], store_id: os.stoid
-          }
+        //-- 有开启佣金抵扣的时候 --
+        if (getApp().globalData.userInfo.is_distribut
+            && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
 
-          await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
-            is_json: 1, data: req_d1
-          }).then(grs => {
-            if (grs.data.code == 0) item[c].use_commission = grs.data.data;
-          });
-          commission_gds.push(hr);
+          if (!item[c].is_gift) {
+            var hr = {
+              goods_id: item[c].goods_id,
+              goods_num: item[c].goods_num,
+              prom_type: item[c].prom_type,
+              prom_id: item[c].prom_id,
+
+            }
+            let req_d1 = {
+              user_id: getApp().globalData.user_id, goods_ids: [hr], store_id: os.stoid
+            }
+
+            await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
+              is_json: 1, data: req_d1
+            }).then(grs => {
+              if (grs.data.code == 0) item[c].use_commission = grs.data.data;
+            });
+            commission_gds.push(hr);
+          }
         }
+
         if (th.data.sales_rules != 2) {
           item[c].offline_price = 0;
         }
@@ -1446,22 +1465,24 @@ Page({
         c_item.is_offline = 1;
       }
 
-      //获取购物车的佣金,此处要优化调用接口，获取佣金
-      var req_d = {
-        user_id: getApp().globalData.user_id, goods_ids: commission_gds, store_id: os.stoid
-      }
-      var back_data = null;
-      await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
-        is_json: 1, data: req_d
-      }).then(rs => {
-        if (rs.data.code == 0) back_data = rs.data.data;
-      });
+      //-- 如果有佣金抵扣的时候 --
+      if (commission_gds.length) {
+        //获取购物车的佣金,此处要优化调用接口，获取佣金
+        var req_d = {
+          user_id: getApp().globalData.user_id, goods_ids: commission_gds, store_id: os.stoid
+        }
+        var back_data = null;
+        await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
+          is_json: 1, data: req_d
+        }).then(rs => {
+          if (rs.data.code == 0) back_data = rs.data.data;
+        });
 
-      if (back_data && parseFloat(back_data)) {
-        c_item.can_usecommise = parseFloat(back_data);
-        cart_commission += c_item.can_usecommise;
+        if (back_data && parseFloat(back_data)) {
+          c_item.can_usecommise = parseFloat(back_data);
+          cart_commission += c_item.can_usecommise;
+        }
       }
-
     }
 
     if (cart_commission) {
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index c9b3a3e..ff8e33b 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -552,23 +552,41 @@ Page({
 
           var by_map = null;
 
-          //--要获得商品，该用户买了多少件,同步应用--
-          await getApp().request.promiseGet("/api/weshop/ordergoods/listUserBuyGoodsNum", {
-            data: {
-              store_id: oo.stoid,
-              user_id: user_id,
-              goods_ids: g_arr.join(','),
+          // //--要获得商品，该用户买了多少件,同步应用--
+          // await getApp().request.promiseGet("/api/weshop/ordergoods/listUserBuyGoodsNum", {
+          //   data: {
+          //     store_id: oo.stoid,
+          //     user_id: user_id,
+          //     goods_ids: g_arr.join(','),
+          //
+          //   },
+          // }).then(res => {
+          //   if (ut.ajax_ok2(res)) {
+          //     by_map = {};
+          //     for (let i in res.data.data) {
+          //       let item = res.data.data[i];
+          //       by_map[item.goods_id] = item;
+          //     }
+          //   }
+          // })
+
+          for (let ir = 0; ir < g_arr.length; ir++) {
+                let gg_it=g_arr[ir];
+                await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                  data: {
+                      store_id: oo.stoid,
+                      user_id: user_id,
+                      goods_id: gg_it,
+                      isnew:1
+                  },
+                }).then(tt => {
+                  if (tt.data.code == 0) {
+                      if(!by_map) by_map={};
+                      by_map[gg_it] = tt.data.data;
+                  }
+                })
+          }
 
-            },
-          }).then(res => {
-            if (ut.ajax_ok2(res)) {
-              by_map = {};
-              for (let i in res.data.data) {
-                let item = res.data.data[i];
-                by_map[item.goods_id] = item;
-              }
-            }
-          })
 
           for (var i = 0; i < carr.length; i++) {
             var item = carr[i];
@@ -1464,6 +1482,50 @@ Page({
       t_num = 0,
       text_arr = "";
 
+
+    if(this.data.is_edit){
+      let val=!e.data.checkAllToggle;
+      if (dda && dda.length > 0) {
+          for (var i = 0; i < dda.length; i++) {
+            var item = dda[i].goods;
+
+            var txt0 = "requestData[" + i + "].selected";
+            this.setData({
+              [txt0]: val,
+            });
+
+            for (var j = 0; j < item.length; j++) {
+              let txt = "requestData[" + i + "].goods[" + j + "].selected";
+              e.setData({
+                [txt]: val,
+              });
+            }
+          }
+      }
+      if (sdda && sdda.length > 0) {
+        for (i = 0; i < sdda.length; i++) {
+          var item1 = sdda[i].goods;
+
+          var txt00 = "service_data[" + i + "].selected";
+          this.setData({
+            [txt00]: val,
+          });
+
+          for (j = 0; j < item1.length; j++) {
+            let txt1 = "service_data[" + i + "].goods[" + j + "].selected";
+            e.setData({
+              [txt1]: val,
+            });
+          }
+        }
+      }
+
+      e.setData({
+        checkAllToggle: val,
+      })
+      return false;
+    }
+
     if (e.data.requestData && e.data.requestData.length > 0 &&
       e.data.service_data && e.data.service_data.length > 0) {
       wx.showModal({
@@ -1498,6 +1560,46 @@ Page({
         for (var j = 0; j < item.length; j++) {
           if (item[j].is_gift) continue;
           var obj = JSON.parse(JSON.stringify(item[j]));
+          var gd_info=obj;
+
+          if (!gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected && th.data.sales_rules >= 2) {
+            var ob = {};
+            await th.check_down_line_next(gd_info, i, j, gd_info.erpwareid, function (res) {
+              ob = res;
+            });
+
+            if (ob.code == -1) {
+
+              wx.showToast({
+                title: gd_info.goods_name+'购买数量超出商品库存',
+                icon: 'none',
+              });
+
+              return false;
+            } else {
+              if (th.data.sales_rules == 3) {
+                var goods_id = gd_info.goods_id;
+                var num = 0;
+
+                for (let ii = 0; ii< th.data.requestData.length; ii++) {
+                  if (i == ii) continue;
+                  var it = th.data.requestData[ii].goods.find((e) => {
+                    return e.goods_id == goods_id;
+                  })
+                  if (it && it.selected) num += it.goods_num
+                }
+
+                if (num > ob.CanOutQty) {
+                  wx.showToast({
+                    title:  gd_info.goods_name+'购买数量超出商品库存',
+                    icon: 'none',
+                  });
+                  return false;
+                }
+              }
+            }
+          }
+
 
 
           //-- 判断起购数量 --
@@ -1734,6 +1836,20 @@ Page({
     });
 
     if (!sele) {
+
+      //编辑不管判断了
+      if(this.data.is_edit){
+        for (var im = 0; im < item.length; im++) {
+          let pro_off1 = false
+          var txt = "requestData[" + pitems + "].goods[" + im + "].selected";
+          this.setData({[txt]:1})
+        }
+
+        var txt0 = "requestData[" + pitems + "].selected";
+        this.setData({[txt0]:1})
+        return false;
+      }
+
       var check_is_service_selected = 0;
       for (var ii in garr) {
         for (var ij in garr[ii].goods) {
@@ -1797,7 +1913,7 @@ Page({
         if (ob.code == -1) {
 
           wx.showToast({
-            title: '购买数量超出商品库存',
+            title:  gd_info.goods_name+'购买数量超出商品库存',
             icon: 'none',
           });
 
@@ -1817,7 +1933,7 @@ Page({
 
             if (num > ob.CanOutQty) {
               wx.showToast({
-                title: '购买数量超出商品库存',
+                title:  gd_info.goods_name+'购买数量超出商品库存',
                 icon: 'none',
               });
               return false;
@@ -1963,6 +2079,15 @@ Page({
     var garr = e.data.service_data;
 
     if (!a.selected) {
+
+      //如果是标记的时候
+      if(this.data.is_edit){
+          var txt = "requestData[" + pitems + "].goods[" + item + "].selected";
+          this.setData({[txt]:1})
+          return false;
+      }
+
+
       var check_is_service_selected = 0;
       for (var ii in garr) {
         for (var ij in garr[ii].goods) {
@@ -2127,6 +2252,17 @@ Page({
       iarr = item;
 
     if (!sele) {
+
+      //编辑不管判断了
+      if(this.data.is_edit){
+        for (var im = 0; im < item.length; im++) {
+          let pro_off1 = false
+          var txt = "service_data[" + pitems + "].goods[" + im + "].selected";
+          this.setData({[txt]:1})
+        }
+        return false;
+      }
+
       var check_is_goods_selected = 0;
       for (var ii in garr) {
         for (var ij in garr[ii].goods) {
@@ -2172,6 +2308,16 @@ Page({
     var garr = e.data.requestData;
 
     if (!a.selected) {
+
+      if(this.data.is_edit){
+        var txt = "service_data[" + pitems + "].goods[" + item + "].selected";
+        e.setData({
+          [txt]: 1,
+        });
+        return false;
+      }
+
+
       var check_is_goods_selected = 0;
       for (var ii in garr) {
         for (var ij in garr[ii].goods) {
@@ -3938,6 +4084,51 @@ Page({
     this.setData({
       is_edit: type
     });
+
+    let dda = this.data.requestData;
+    let sdda = this.data.service_data;
+
+    //清空选中的状态
+    if (dda && dda.length > 0) {
+      for (var i = 0; i < dda.length; i++) {
+        var item = dda[i].goods;
+        var txt0 = "requestData[" + i + "].selected";
+        this.setData({
+          [txt0]: 0,
+        });
+
+        for (var j = 0; j < item.length; j++) {
+          let txt = "requestData[" + i + "].goods[" + j + "].selected";
+          this.setData({
+            [txt]: 0,
+          });
+        }
+      }
+    }
+
+    //清空选中的状态
+    if (sdda && sdda.length > 0) {
+      for (i = 0; i < sdda.length; i++) {
+        var item1 = sdda[i].goods;
+        var txt00 = "service_data[" + i + "].selected";
+        this.setData({
+          [txt00]: 0,
+        });
+
+        for (j = 0; j < item1.length; j++) {
+          let txt1 = "service_data[" + i + "].goods[" + j + "].selected";
+          this.setData({
+            [txt1]: 0,
+          });
+        }
+      }
+    }
+
+    this.setData({
+      checkAllToggle: 0,
+    })
+
+
   },
 
   //--多个删除购物车商品---
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 6dbef74..3c76155 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3661,12 +3661,12 @@ Page({
 
                       var pickup_ids=th.data.sele_g.pickup_ids;
                       //不是单独购买的时候，要清空商品pickup_ids
-                      if(!is_normal && th.data.prom_type>0){
+
+                      var py=parseFloat(th.data.prom_type+'');
+                      if(!is_normal && py>0 && [3,5,7,10].indexOf(py)<0 ){
                         pickup_ids=null;
                       }
 
-
-                      var py=parseFloat(th.data.prom_type+'');
                       //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
                       if(!is_normal && [1,2,6].indexOf(py)>-1 && th.data.prom_act.pick_up_lists){
                         pickup_ids=th.data.prom_act.pick_up_lists