1 participants
-
Status changed to merged
-
mentioned in commit 65896cd1e652824c5a655cbdf665e6bdebb25721
-
Dev See merge request !1170
Showing
1 changed file
pages/goods/goodsInfo/goodsInfo.js
| @@ -7434,6 +7434,9 @@ Page({ | @@ -7434,6 +7434,9 @@ Page({ | ||
| 7434 | return false; | 7434 | return false; |
| 7435 | } | 7435 | } |
| 7436 | 7436 | ||
| 7437 | + | ||
| 7438 | + var is_ok=1; | ||
| 7439 | + | ||
| 7437 | if (r_data.ladderLists) { | 7440 | if (r_data.ladderLists) { |
| 7438 | var act_id = r_data.ladderLists[0].form_id; | 7441 | var act_id = r_data.ladderLists[0].form_id; |
| 7439 | //-- 判断会员能不能参与阶梯促销 -- | 7442 | //-- 判断会员能不能参与阶梯促销 -- |
| @@ -7453,11 +7456,13 @@ Page({ | @@ -7453,11 +7456,13 @@ Page({ | ||
| 7453 | prom_type:10 | 7456 | prom_type:10 |
| 7454 | } | 7457 | } |
| 7455 | back(obj); | 7458 | back(obj); |
| 7459 | + is_ok=0 | ||
| 7456 | return false; | 7460 | return false; |
| 7457 | } | 7461 | } |
| 7458 | }) | 7462 | }) |
| 7459 | } | 7463 | } |
| 7460 | - | 7464 | + |
| 7465 | + if(!is_ok) return false; | ||
| 7461 | if(r_data.promGoodsLists){ | 7466 | if(r_data.promGoodsLists){ |
| 7462 | obj = { | 7467 | obj = { |
| 7463 | act_id: r_data.promGoodsLists[0].prom_id, | 7468 | act_id: r_data.promGoodsLists[0].prom_id, |
| @@ -7470,31 +7475,6 @@ Page({ | @@ -7470,31 +7475,6 @@ Page({ | ||
| 7470 | } | 7475 | } |
| 7471 | } | 7476 | } |
| 7472 | }) | 7477 | }) |
| 7473 | - | ||
| 7474 | - | ||
| 7475 | - | ||
| 7476 | - getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, { | ||
| 7477 | - success: function (res) { | ||
| 7478 | - if (res.data.code == 0 && res.data.data) { | ||
| 7479 | - var obj = {}; | ||
| 7480 | - if(res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0){ | ||
| 7481 | - obj = { | ||
| 7482 | - act_id: res.data.data.promGoodsLists[0].prom_id, | ||
| 7483 | - prom_type:3 | ||
| 7484 | - } | ||
| 7485 | - }else if(res.data.data.ladderLists){ | ||
| 7486 | - obj = { | ||
| 7487 | - act_id: res.data.data.ladderLists[0].form_id, | ||
| 7488 | - prom_type:10 | ||
| 7489 | - } | ||
| 7490 | - } | ||
| 7491 | - | ||
| 7492 | - back(obj); | ||
| 7493 | - } else { | ||
| 7494 | - back(0) | ||
| 7495 | - } | ||
| 7496 | - } | ||
| 7497 | - }) | ||
| 7498 | }, | 7478 | }, |
| 7499 | 7479 | ||
| 7500 | go_zh: function (e) { | 7480 | go_zh: function (e) { |