diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 6a052b8..311cee3 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -3843,7 +3843,7 @@ Page({ 80 * unit, 160 * unit, 200 * unit, 279 * unit, unit); //------产品的价格------- - context.setFontSize(22 * unit) + context.setFontSize(23 * unit) context.setFillStyle("red") // 7.商品价格 @@ -3856,7 +3856,7 @@ Page({ var wd1 = th.data.screenWidth - ut.measureText(price, 31 * unit) - 25; context.fillText("¥", wd1 - 15, 160 * unit); - context.setFontSize(22 * unit) + context.setFontSize(31 * unit) context.fillText(price, wd1, 165 * unit); //---市场价划掉--- @@ -3875,8 +3875,9 @@ Page({ // context.stroke(); //-- 零售价的优化 -- - var wp= th.data.screenWidth - ut.measureText(price, 22 * unit) - 50; - var hp= 180 * unit + var wp = wd1; + var hp = 203 * unit; + if (th.data.prom_type != 4) wp -= 12; th.draw_pos_price(context,wp,hp,th.data.data.show_price,unit); @@ -3884,24 +3885,24 @@ Page({ //let share_goods_img=th.data.presellForm.share_img; //share_goods_img?share_goods_img:th.data.data.share_goods_img; //---中间大图--- - context.drawImage(th.data.share_goods_img, 70 * unit, 210 * unit, 408 * unit, 408 * unit); + context.drawImage(th.data.share_goods_img, 70 * unit, 220 * unit, 408 * unit, 408 * unit); //---自定义海报 产品质量保证 if(th.data.poster.show_quality==1 ){ - var g_path = "/images/share/s_gou.png"; - context.drawImage(g_path, 56 * unit, 630 * unit, 22 * unit, 22 * unit); + var g_path = "../../../images/share/s_gou.png"; + context.drawImage(g_path, 56 * unit, 644 * unit, 22 * unit, 22 * unit); context.setFillStyle("red") context.setFontSize(18 * unit) - context.fillText("正品保证", 84 * unit, 650 * unit); + context.fillText("正品保证", 84 * unit, 664 * unit); - context.drawImage(g_path, 218 * unit, 630 * unit, 22 * unit, 22 * unit); + context.drawImage(g_path, 218 * unit, 644 * unit, 22 * unit, 22 * unit); context.setFillStyle("red") context.setFontSize(18 * unit) - context.fillText("纯实体店", 246 * unit, 650 * unit); + context.fillText("纯实体店", 246 * unit, 664 * unit); - context.drawImage(g_path, 388 * unit, 630 * unit, 22 * unit, 22 * unit); + context.drawImage(g_path, 388 * unit, 644 * unit, 22 * unit, 22 * unit); context.setFillStyle("red") context.setFontSize(18 * unit) - context.fillText("官方验证", 420 * unit, 650 * unit); + context.fillText("官方验证", 420 * unit, 664 * unit); } @@ -3911,20 +3912,16 @@ Page({ // context.lineTo(520 * unit, 662 * unit) // context.stroke(); - //-- 图片底部文字 -- switch (type){ case 0: //---文字--- - context.setFillStyle("black") - // context.setFontSize(22 * unit) - context.setFontSize(24 * unit) - context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit); + //---文字--- + context.setFillStyle("black"); + context.setFontSize(22 * unit); - context.setFillStyle("black") - context.setFontSize(22 * unit) - context.fillText("优惠乐翻天,精彩就在你身边", 40 * unit, 800 * unit); - context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 840 * unit); + context.fillText("优惠乐翻天,精彩就在你身边", 40 * unit, 776 * unit); + context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 826 * unit); break; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 233be12..858058b 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -6859,8 +6859,17 @@ Page({ // context.fillText("优惠乐翻天,精彩就在你身边", 40 * unit, 816 * unit); // context.setFontSize(18 * unit) // context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 850 * unit); - //---二维吗图--- - context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); + + if (th.data.share_b_img || th.data.poster) { + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); + }else{ + //---二维吗图--- + context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); + } + + break; //普通商品的展示 case 4: