起订量的优化

yvan.ni
1 parent da572fc1
Showing 2 changed files with 26 additions and 15 deletions
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
@@ -4063,8 +4063,9 @@ Page({
       }
-      var mo_num=getApp().get_limit_qty(th.data.bn_goods);
-      var steep=getApp().get_limit_qty(th.data.bn_goods,0,1);
+      var act=await getApp().get_has_cx_act(th.data.bn_goods.goods_id);
+      var mo_num=getApp().get_limit_qty(th.data.bn_goods,act.length);
+      var steep=getApp().get_limit_qty(th.data.bn_goods,act.length,1);
       if ([0,3,5,7,10].indexOf(goods.prom_type)>=-1){
         if(mo_num>goods.goods_num){
@@ -4444,8 +4445,10 @@ Page({
           }
           goods.prom_type=parseInt(goods.prom_type+'');
-          var mo_num=getApp().get_limit_qty(g_item);
-          var steep=getApp().get_limit_qty(g_item,0,1);
+
+          var act=await getApp().get_has_cx_act(g_item.goods_id);
+          var mo_num=getApp().get_limit_qty(g_item,act.length);
+          var steep=getApp().get_limit_qty(g_item,act.length,1);
           if ([0,3,5,7,10].indexOf(goods.prom_type)>=-1){
               if(mo_num>goods.goods_num){
@@ -1774,10 +1774,10 @@ Page({
   },
-  click_set_limit(gd_info,pitems,item){
+  click_set_limit(gd_info,pitems,item,act){
     var th=this;
-    var mo_num=getApp().get_limit_qty(gd_info);
-    var steep=getApp().get_limit_qty(gd_info,0,1);
+    var mo_num=getApp().get_limit_qty(gd_info,act.length);
+    var steep=getApp().get_limit_qty(gd_info,act.length,1);
     if(gd_info.is_integral_normal || gd_info.is_pd_normal || [0,3,5,7,10].indexOf(gd_info.prom_type) > -1){
       var ue = {
@@ -1844,9 +1844,12 @@ Page({
         for (var j = 0; j < item.length; j++) {
           if (item[j].is_gift) continue;
           var obj = JSON.parse(JSON.stringify(item[j]));
+
           //-- 判断起购数量 --
           if(!e.data.checkAllToggle){
-            th.click_set_limit(obj,i,j);
+            //判断是不是有促销活动
+            var act=await getApp().get_has_cx_act(gd_info.goods_id);
+            th.click_set_limit(obj,i,j,act);
           }
           //计算之前先移除组合购的计算
@@ -2089,13 +2092,15 @@ Page({
     }
     let pro_off=false
-
     for (var i = 0; i < item.length; i++) {
       let pro_off1=false
       var txt = "requestData[" + pitems + "].goods[" + i + "].selected";
       var gd_info = item[i];
-       if(!sele) th.click_set_limit(gd_info,pitems,i)
+      if(!sele) {
+         var act=await getApp().get_has_cx_act(gd_info.goods_id);
+         th.click_set_limit(gd_info,pitems,i,act)
+      }
       if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2 && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected) {
         var ob = {};
@@ -2284,9 +2289,10 @@ Page({
       //-- 如果是选中的时候 --
       if(!a.selected){
-
+        //判断是不是有促销活动
+        var act=await getApp().get_has_cx_act(gd_info.goods_id);
         //-- 专门来设置商品订购数量 --
-        th.click_set_limit(gd_info,pitems,item)
+        th.click_set_limit(gd_info,pitems,item,act)
         if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2
             && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 ) {
@@ -3487,9 +3493,11 @@ Page({
             glist += i_arr[j].goods_id + ",";
             ab = 1;
-            //判断商品的起订数量
-            var mo_num=getApp().get_limit_qty(i_arr[j]);
-            var steep=getApp().get_limit_qty(i_arr[j],0,1);
+            //-- 获取促销活动是不是有参与 --
+            var act=await getApp().get_has_cx_act(i_arr[j].goods_id);
+            //-- 判断商品的起订数量 --
+            var mo_num=getApp().get_limit_qty(i_arr[j],act.length);
+            var steep=getApp().get_limit_qty(i_arr[j],act.length,1);
             var py_type= parseInt(i_arr[j].prom_type+'');
             if([0,3,5,7,10].indexOf(py_type)>-1){