Merge branch 'test' into 'qa'

Test See merge request !1171

Merge branch 'test' into 'qa'
Test See merge request !1171
后端研发-苏明海
2 parents c646aed3 74de3b79
Showing 1 changed file with 6 additions and 26 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -7434,6 +7434,9 @@ Page({
             return false;
           }
  
+
+          var is_ok=1;
+
           if (r_data.ladderLists) {
             var act_id = r_data.ladderLists[0].form_id;
             //-- 判断会员能不能参与阶梯促销 --
@@ -7453,11 +7456,13 @@ Page({
                   prom_type:10
                 }
                 back(obj);
+                is_ok=0
                 return false;
               }
             })
           }
-
+          
+          if(!is_ok) return  false;
           if(r_data.promGoodsLists){
             obj = {
               act_id: r_data.promGoodsLists[0].prom_id,
@@ -7470,31 +7475,6 @@ Page({
         }
       }
     })
-
-
-
-    getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, {
-      success: function (res) {
-        if (res.data.code == 0 && res.data.data) {
-          var obj = {};
-          if(res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0){
-            obj = {
-              act_id: res.data.data.promGoodsLists[0].prom_id,
-              prom_type:3
-            }
-          }else if(res.data.data.ladderLists){
-            obj = {
-              act_id: res.data.data.ladderLists[0].form_id,
-              prom_type:10
-            }
-          }
-
-          back(obj);
-        } else {
-          back(0)
-        }
-      }
-    })
   },
  
   go_zh: function (e) {