Commit ccea7b80e24b64dd1640258749f896b6ac02d9b2
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
10 additions
and
10 deletions
pages/cart/cart/cart.js
| ... | ... | @@ -408,11 +408,11 @@ Page({ |
| 408 | 408 | } |
| 409 | 409 | act=res.data.data; |
| 410 | 410 | |
| 411 | - }else{ | |
| 412 | - //未找到商品的活动 | |
| 413 | - isok = 0; | |
| 414 | 411 | } |
| 415 | - | |
| 412 | + // else{ | |
| 413 | + // //未找到商品的活动 | |
| 414 | + // isok = 0; | |
| 415 | + // } | |
| 416 | 416 | }) |
| 417 | 417 | if (!isok){ |
| 418 | 418 | var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| ... | ... | @@ -453,12 +453,12 @@ Page({ |
| 453 | 453 | item.buyqty=t_item.buyqty; |
| 454 | 454 | item.zh_b_num=promgoodsbuynum; |
| 455 | 455 | item.act=th.data.zuhe_map[item.prom_id]; |
| 456 | - }else{ | |
| 457 | - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | |
| 458 | - getApp().request.delete(url, {}); | |
| 459 | - th.data.zuhe_map[item.prom_id]=-1; | |
| 460 | - continue; | |
| 461 | - } | |
| 456 | + }//else{ | |
| 457 | + // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | |
| 458 | + // getApp().request.delete(url, {}); | |
| 459 | + // th.data.zuhe_map[item.prom_id]=-1; | |
| 460 | + // continue; | |
| 461 | + // } | |
| 462 | 462 | } |
| 463 | 463 | else if(item.prom_type == 0) { |
| 464 | 464 | //如果有优惠活动，要更新活动 | ... | ... |