From e6622b895aff9098fa18246391596273e85ec7d1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 20 Apr 2022 10:49:47 +0800
Subject: [PATCH] 组合购使用券之后，erp无法调单的优化

---
 pages/cart/cart2/cart2.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 7e1ecdf..565c793 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2913,6 +2913,7 @@ Page({
         if (pdata.length == 0) return;
         var str = JSON.stringify(pdata);
 
+        
         wx.showLoading({ title: "加载中" });
         wx.request({
             url: oo.url + '/api/weshop/order/createWxdOrder',
@@ -4397,7 +4398,7 @@ Page({
         var arr = [];
         //判断是不是有goods_id重复
         for (var i = 0; i < goods.length; i++) {
-            if (goods[i].prom_type != 7 && goods[i].erpwareid == you_item.WareId) {
+            if (goods[i].erpwareid == you_item.WareId) {
                 var gg_ite = {
                     goods_id: goods[i].goods_id,
                     goods_num: goods[i].goods_num,
--
libgit2 0.21.4