Commit 7cfd83718f49b13d9f6bf47ee602bd4f06959571
1 parent
92f11f65
搭配购预存款使用显示优化
Showing
1 changed file
with
10 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -2644,9 +2644,13 @@ Page({ | @@ -2644,9 +2644,13 @@ Page({ | ||
2644 | } | 2644 | } |
2645 | let cart_yc = await th.beforAdvancesum(cart_item) | 2645 | let cart_yc = await th.beforAdvancesum(cart_item) |
2646 | 2646 | ||
2647 | + console.log('购物车--------'); | ||
2647 | if (!cart_item.yck_off) { | 2648 | if (!cart_item.yck_off) { |
2648 | cart_item.yck_off = cart_yc.yck_off | 2649 | cart_item.yck_off = cart_yc.yck_off |
2649 | } | 2650 | } |
2651 | + if(cart_yc.yck*1==0){ | ||
2652 | + cart_item.yck_off = 0 | ||
2653 | + } | ||
2650 | cart_item.yck = cart_yc.yck | 2654 | cart_item.yck = cart_yc.yck |
2651 | cart_item.yckid = cart_yc.yckid | 2655 | cart_item.yckid = cart_yc.yckid |
2652 | cart_item.pre_json = cart_yc.pre_json | 2656 | cart_item.pre_json = cart_yc.pre_json |
@@ -2876,6 +2880,7 @@ Page({ | @@ -2876,6 +2880,7 @@ Page({ | ||
2876 | 2880 | ||
2877 | //搭配的计算要用购物的车计算方法 | 2881 | //搭配的计算要用购物的车计算方法 |
2878 | // if (good.prom_type == 5 ) { | 2882 | // if (good.prom_type == 5 ) { |
2883 | + | ||
2879 | if (good.prom_type == 5 ) { | 2884 | if (good.prom_type == 5 ) { |
2880 | if( th.data.old_cartlist && th.data.old_cartlist.length > 0){ | 2885 | if( th.data.old_cartlist && th.data.old_cartlist.length > 0){ |
2881 | th.calculatePrice(); | 2886 | th.calculatePrice(); |
@@ -3249,6 +3254,7 @@ Page({ | @@ -3249,6 +3254,7 @@ Page({ | ||
3249 | } | 3254 | } |
3250 | 3255 | ||
3251 | if (th.data.bn_goods.keyid) { | 3256 | if (th.data.bn_goods.keyid) { |
3257 | + | ||
3252 | let cart_yc = await th.beforAdvancesum({ | 3258 | let cart_yc = await th.beforAdvancesum({ |
3253 | order_amount: order_m, | 3259 | order_amount: order_m, |
3254 | goods: [{ | 3260 | goods: [{ |
@@ -3260,10 +3266,13 @@ Page({ | @@ -3260,10 +3266,13 @@ Page({ | ||
3260 | keyid: th.data.bn_goods.keyid | 3266 | keyid: th.data.bn_goods.keyid |
3261 | } | 3267 | } |
3262 | }) | 3268 | }) |
3263 | - | 3269 | + |
3264 | if (!good.yck_off) { | 3270 | if (!good.yck_off) { |
3265 | good.yck_off = cart_yc.yck_off | 3271 | good.yck_off = cart_yc.yck_off |
3266 | } | 3272 | } |
3273 | + if(cart_yc.yck*1==0){ | ||
3274 | + good.yck_off = 0 | ||
3275 | + } | ||
3267 | good.yck = cart_yc.yck | 3276 | good.yck = cart_yc.yck |
3268 | good.yckid = cart_yc.yckid | 3277 | good.yckid = cart_yc.yckid |
3269 | good.pre_json = cart_yc.pre_json | 3278 | good.pre_json = cart_yc.pre_json |