Commit 899061b60aaba7c014c26c0ef69c758a84580b3e
1 parent
ef1f42fa
去掉冲突部分
Showing
1 changed file
with
0 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -9096,7 +9096,6 @@ Page({ | @@ -9096,7 +9096,6 @@ Page({ | ||
| 9096 | mark:true | 9096 | mark:true |
| 9097 | }) | 9097 | }) |
| 9098 | //-- 重新计算一下价格 -- | 9098 | //-- 重新计算一下价格 -- |
| 9099 | ->>>>>>> dev_oa_fuordercx | ||
| 9100 | this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0}); | 9099 | this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0}); |
| 9101 | }, | 9100 | }, |
| 9102 | 9101 |