Commit 5778d484f2ce1fa4481b558728bb9246ccd6645e
1 parent
18df0fea
暂时再秒杀的情况下,才会显示继续·
Showing
1 changed file
with
25 additions
and
5 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -836,7 +836,6 @@ Page({ | @@ -836,7 +836,6 @@ Page({ | ||
836 | t.data.data.prom_type=ee.data.prom_type; | 836 | t.data.data.prom_type=ee.data.prom_type; |
837 | t.data.data.prom_id=ee.data.prom_id; | 837 | t.data.data.prom_id=ee.data.prom_id; |
838 | } | 838 | } |
839 | - | ||
840 | ee.setData({ | 839 | ee.setData({ |
841 | data: t.data.data, | 840 | data: t.data.data, |
842 | sele_g: t.data.data, | 841 | sele_g: t.data.data, |
@@ -1838,7 +1837,20 @@ Page({ | @@ -1838,7 +1837,20 @@ Page({ | ||
1838 | return false; | 1837 | return false; |
1839 | } | 1838 | } |
1840 | 1839 | ||
1841 | - if(th.data.more_flash && open_store==1){ | 1840 | + var check_up=0; |
1841 | + if(th.data.more_flash){ | ||
1842 | + for(var i in th.data.more_flash){ | ||
1843 | + var item=th.data.more_flash[i]; | ||
1844 | + if(item.prom_type==1){ | ||
1845 | + check_up=1; | ||
1846 | + break | ||
1847 | + } | ||
1848 | + } | ||
1849 | + } | ||
1850 | + | ||
1851 | + | ||
1852 | + | ||
1853 | + if(check_up && open_store==1){ | ||
1842 | th.setData({is_pop_more:1}); | 1854 | th.setData({is_pop_more:1}); |
1843 | }else{ | 1855 | }else{ |
1844 | var ind = t.currentTarget.dataset.ind; | 1856 | var ind = t.currentTarget.dataset.ind; |
@@ -3096,9 +3108,8 @@ Page({ | @@ -3096,9 +3108,8 @@ Page({ | ||
3096 | }); | 3108 | }); |
3097 | } | 3109 | } |
3098 | }) | 3110 | }) |
3099 | - | ||
3100 | - | ||
3101 | } | 3111 | } |
3112 | + | ||
3102 | if (prom_type == 1 && prom_id==0){ | 3113 | if (prom_type == 1 && prom_id==0){ |
3103 | this.setData({ | 3114 | this.setData({ |
3104 | prom_type: 0,isshow: 1, | 3115 | prom_type: 0,isshow: 1, |
@@ -4355,6 +4366,12 @@ Page({ | @@ -4355,6 +4366,12 @@ Page({ | ||
4355 | context.fillText('强烈推荐', 64*unit, 672*unit); | 4366 | context.fillText('强烈推荐', 64*unit, 672*unit); |
4356 | // 7.商品价格 | 4367 | // 7.商品价格 |
4357 | let price = '¥' + this.data.data.shop_price; | 4368 | let price = '¥' + this.data.data.shop_price; |
4369 | + | ||
4370 | + if(this.data.card_field && this.data.data[this.data.card_field]){ | ||
4371 | + price = '¥' + this.data.data[this.data.card_field]; | ||
4372 | + } | ||
4373 | + | ||
4374 | + | ||
4358 | // if (th.data.prom_act) | 4375 | // if (th.data.prom_act) |
4359 | // pri0 = th.data.prom_act.price; | 4376 | // pri0 = th.data.prom_act.price; |
4360 | context.setFontSize(32*unit); | 4377 | context.setFontSize(32*unit); |
@@ -4527,8 +4544,11 @@ Page({ | @@ -4527,8 +4544,11 @@ Page({ | ||
4527 | context.setFontSize(23 * unit) | 4544 | context.setFontSize(23 * unit) |
4528 | context.setFillStyle("red") | 4545 | context.setFillStyle("red") |
4529 | 4546 | ||
4530 | - | ||
4531 | var pri0 = th.data.data.shop_price; | 4547 | var pri0 = th.data.data.shop_price; |
4548 | + if(th.data.card_field && th.data.data[th.data.card_field]){ | ||
4549 | + pri0=th.data.data[th.data.card_field]; | ||
4550 | + } | ||
4551 | + | ||
4532 | if (th.data.prom_act) | 4552 | if (th.data.prom_act) |
4533 | pri0 = th.data.prom_price; | 4553 | pri0 = th.data.prom_price; |
4534 | pri0 = parseFloat(pri0).toFixed(2); | 4554 | pri0 = parseFloat(pri0).toFixed(2); |