Commit 393783adf1b25a598926aa9c7543d4419c4fb113
1 parent
7276bb39
优化多规格
Showing
2 changed files
with
4 additions
and
2 deletions
packageE/pages/cart/cart2/cart2.wxss
| @@ -278,7 +278,8 @@ page { | @@ -278,7 +278,8 @@ page { | ||
| 278 | padding: 0 42rpx; | 278 | padding: 0 42rpx; |
| 279 | border-radius: 36rpx; | 279 | border-radius: 36rpx; |
| 280 | margin-left: 0; | 280 | margin-left: 0; |
| 281 | - margin-right: 0; | 281 | + margin-right: 0; |
| 282 | + border: none; | ||
| 282 | } | 283 | } |
| 283 | 284 | ||
| 284 | .pay-amount { } | 285 | .pay-amount { } |
pages/goods/goodsInfo/goodsInfo.js
| @@ -1984,7 +1984,7 @@ Page({ | @@ -1984,7 +1984,7 @@ Page({ | ||
| 1984 | // }) | 1984 | // }) |
| 1985 | // } | 1985 | // } |
| 1986 | //要包含积分购的普通购买0 3,5,7,10, is_integral_normal积分普通购买字段 | 1986 | //要包含积分购的普通购买0 3,5,7,10, is_integral_normal积分普通购买字段 |
| 1987 | - else if ([0, 3, 5, 7, 10].indexOf(th.data.prom_type) > -1 || newd.is_integral_normal) { | 1987 | + else if ([0, 3, 5, 7, 10].indexOf(th.data.prom_type) > -1 || newd.is_integral_normal || newd.is_pd_normal) { |
| 1988 | newd.prom_type = 0; | 1988 | newd.prom_type = 0; |
| 1989 | newd.prom_id = 0; | 1989 | newd.prom_id = 0; |
| 1990 | 1990 | ||
| @@ -2035,6 +2035,7 @@ Page({ | @@ -2035,6 +2035,7 @@ Page({ | ||
| 2035 | return false; | 2035 | return false; |
| 2036 | //return s.my_warnning("库存不足！", 0, th); | 2036 | //return s.my_warnning("库存不足！", 0, th); |
| 2037 | } | 2037 | } |
| 2038 | + | ||
| 2038 | th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 | 2039 | th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 |
| 2039 | } | 2040 | } |
| 2040 | } | 2041 | } |