测试优化

yvan.ni
1 parent 27dfae19
Showing 2 changed files with 27 additions and 8 deletions
packageA/pages/cart2_ser/cart2_ser.js
pages/goods/goodsInfo/goodsInfo.js
@@ -634,7 +634,7 @@ Page({
 												});
 												setTimeout(function () {
 													wx.reLaunch({
-														url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+														url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id,
 													})
 												}, 1000)
@@ -653,6 +653,7 @@ Page({
 							     	}
 							)
+							
 							// getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
 							// 	data: {
@@ -1110,6 +1110,8 @@ Page({
               //-- 更新默认购买的数量 ---
               var mo_num=getApp().get_limit_qty(t.data.data);
+
+
               ee.setData({goodsInputNum:mo_num})
               ee.setData({mo_num:mo_num})
@@ -2403,11 +2405,11 @@ Page({
   //----------增加购买数量-----------
   addCartNum: function (t) {
-
      var add_num=1;
      var p_type=parseInt(this.data.prom_type)
      if([1,2,4,6,8,9].indexOf(p_type)==-1 || this.data.openSpecModal_inte_normal == 1 || this.data.is_normal == 1){
-       add_num=getApp().get_limit_qty(this.data.sele_g,0,1);
+
+         add_num = getApp().get_limit_qty(this.data,this.data.sele_g, 0, 1);
      }
      this.checkCartNum(this.data.goodsInputNum + add_num);
@@ -2418,7 +2420,9 @@ Page({
     var add_num=1;
     var p_type=parseInt(this.data.prom_type)
     if([1,2,4,6,8,9].indexOf(p_type)==-1 || this.data.openSpecModal_inte_normal == 1 || this.data.is_normal == 1){
-      add_num=getApp().get_limit_qty(this.data.sele_g,0,1);
+      if(!th.data.prom_goods && !th.data.jieti_prom && !th.data.zh_act && !th.data.collocationGoods) {
+        add_num = getApp().get_limit_qty(this.data.sele_g, 0, 1);
+      }
     }
     this.checkCartNum(this.data.goodsInputNum - add_num);
   },
@@ -2444,8 +2448,10 @@ Page({
   //------检查数量是不是超出限购------
   checkCartNum: function (t) {
     var th = this;
+
     var mo_num=getApp().get_limit_qty(th.data.sele_g);
     var steep=getApp().get_limit_qty(th.data.sele_g,0,1);
+
     this.get_buy_num(this.data.sele_g, async function () {
       //--判断商品是否超出限购--
@@ -2530,9 +2536,24 @@ Page({
             e = th.data.def_pick_store.CanOutQty;
           }
         }
+      }
-
+      //--- 促销活动也不控制起订量, 这里很重要的一个控制，起订量的 ----
+      if([0,3,5,7,10].indexOf(p_type)>-1){
+          if(th.data.prom_goods || th.data.jieti_prom || th.data.zh_act || th.data.collocationGoods){
+              mo_num=1;steep=1;
+          }else{
+            if(t<mo_num) t=mo_num;
+            if(t>mo_num && (t-mo_num)%steep!=0){
+              wx.showToast({
+                title: '购买数必须是起订量的倍数',
+                icon: 'none',
+              });
+              t=mo_num+ parseInt((e-mo_num)/steep)*steep;
+            }
+          }
       }
+
       if (!e) e = 0;
       //库存不足，不增加
       if (e < t) {
@@ -2556,10 +2577,7 @@ Page({
         return false;
       }
-
       //var steep=getApp().get_limit_qty(th.data.sele_g,0,1);
-
-
       t > e || 0 == e ? t = e : t < 1 && (t = 1);