Commit 8357d4cc430c5d50367272de344e5c862e4db1a7
1 parent
15793b0a
幸运购
Showing
4 changed files
with
179 additions
and
55 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
... | ... | @@ -139,7 +139,7 @@ Page({ |
139 | 139 | brand_name: '', |
140 | 140 | nation_name: '', |
141 | 141 | |
142 | - //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 | |
142 | + //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 9幸运购 | |
143 | 143 | prom_type: 9, |
144 | 144 | prom_time_text: "", |
145 | 145 | prom_price: null, |
... | ... | @@ -296,10 +296,14 @@ Page({ |
296 | 296 | prom_id = t.group_id; //活动ID |
297 | 297 | |
298 | 298 | if(prom_type) { |
299 | - this.data.prom_type = prom_type; | |
300 | - this.data.prom_id = prom_id; | |
299 | + // this.data.prom_type = prom_type; | |
300 | + // this.data.prom_id = prom_id; | |
301 | + this.setData({ | |
302 | + prom_type, | |
303 | + prom_id, | |
304 | + }); | |
301 | 305 | } |
302 | - | |
306 | + console.log('type********>>',this.data.prom_type); | |
303 | 307 | //-- 自定义海报 -- |
304 | 308 | // getApp().request.promiseGet("/api/weshop/goods/poster/page", { |
305 | 309 | // data: { store_id: os.stoid, type: 1, is_use: 1 } |
... | ... | @@ -4456,8 +4460,9 @@ Page({ |
4456 | 4460 | this.setData({ share_hidden: false,}); |
4457 | 4461 | }; |
4458 | 4462 | |
4459 | - //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团 | |
4460 | - var type = this.data.prom_type; | |
4463 | + //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团 9幸运购 | |
4464 | + var type = 9; | |
4465 | + console.log('type',type); | |
4461 | 4466 | if (type == 6) type = 2; |
4462 | 4467 | if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; |
4463 | 4468 | |
... | ... | @@ -4500,7 +4505,7 @@ Page({ |
4500 | 4505 | var vpath = res.path; |
4501 | 4506 | var context = wx.createCanvasContext('share'); |
4502 | 4507 | // 先画背景 |
4503 | - var pg_path = "../../../images/share/share_bg.png"; | |
4508 | + var pg_path = "../../../../images/share/share_bg.png"; | |
4504 | 4509 | |
4505 | 4510 | // context.fillStyle="#FFFFFF"; |
4506 | 4511 | // context.fillRect(0,0,554 * unit, 899 * unit); |
... | ... | @@ -4530,6 +4535,8 @@ Page({ |
4530 | 4535 | //-- 是自定义海报的情况下 -- |
4531 | 4536 | if(type != 0) { |
4532 | 4537 | |
4538 | + | |
4539 | + | |
4533 | 4540 | if (th.data.poster && parseInt(th.data.poster.style) == 2) { |
4534 | 4541 | //在线上分享人的情况下 |
4535 | 4542 | if (parseInt(th.data.poster.show_headpic)) { |
... | ... | @@ -4544,7 +4551,7 @@ Page({ |
4544 | 4551 | context.fillText(app.globalData.userInfo.nickname, x1, y1); |
4545 | 4552 | var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; |
4546 | 4553 | //强烈推荐 改许程 |
4547 | - var tj_path = "../../../images/share/q_tj.png"; | |
4554 | + var tj_path = "../../../../images/share/q_tj.png"; | |
4548 | 4555 | context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit); |
4549 | 4556 | context.setFontSize(16 * unit); |
4550 | 4557 | context.setLineJoin('round'); //交点设置成圆角 |
... | ... | @@ -4559,15 +4566,22 @@ Page({ |
4559 | 4566 | //--昵称--- |
4560 | 4567 | context.setFontSize(24 * unit); |
4561 | 4568 | context.setFillStyle("black"); |
4562 | - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); | |
4569 | + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 60 * unit); | |
4563 | 4570 | var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; |
4564 | 4571 | //强烈推荐 改许程 |
4565 | - var tj_path = "../../../images/share/q_tj.png"; | |
4566 | - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); | |
4572 | + var tj_path = "../../../../images/share/q_tj.png"; | |
4573 | + let txt_gn = th.data.luckGoInfo.group_num + '人团'; | |
4574 | + let width_gn = ut.measureText(txt_gn, 15); | |
4575 | + context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit); | |
4567 | 4576 | context.setFontSize(16 * unit); |
4568 | 4577 | context.setLineJoin('round'); //交点设置成圆角 |
4569 | 4578 | context.setFillStyle("white"); |
4570 | - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit); | |
4579 | + context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit); | |
4580 | + // 发出幸运购活动邀请 | |
4581 | + context.setFillStyle("#7f7f7f") | |
4582 | + context.setFontSize(21.3 * unit) | |
4583 | + context.fillText("向您发出幸运购邀请", 152 * unit, 90 * unit); | |
4584 | + | |
4571 | 4585 | } |
4572 | 4586 | |
4573 | 4587 | }; |
... | ... | @@ -4602,11 +4616,18 @@ Page({ |
4602 | 4616 | context.fillText("¥", wd1 - 15, 185 * unit); |
4603 | 4617 | context.setFontSize(31 * unit) |
4604 | 4618 | context.fillText(pri0, wd1, 185 * unit); |
4619 | + | |
4620 | + var tj_path = "../../../../images/share/q_tj.png"; | |
4621 | + context.drawImage(tj_path, 315 * unit, 158 * unit, 85 * unit, 30 * unit); | |
4622 | + context.setLineJoin('round'); //交点设置成圆角 | |
4623 | + context.setFontSize(22 * unit); | |
4624 | + context.setFillStyle("blue"); | |
4625 | + context.fillText('参团价', 320 * unit, 168 * unit); | |
4605 | 4626 | |
4606 | 4627 | //---市场价划掉--- |
4607 | 4628 | context.setFillStyle("gray") |
4608 | 4629 | context.setFontSize(22 * unit) |
4609 | - pri0 = "¥" + th.data.data.market_price.toFixed(2); | |
4630 | + pri0 = "零售价:¥" + th.data.data.market_price.toFixed(2); | |
4610 | 4631 | var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; |
4611 | 4632 | context.fillText(pri0, wd2, 213 * unit); |
4612 | 4633 | |
... | ... | @@ -4649,7 +4670,7 @@ Page({ |
4649 | 4670 | //中间的几个字 |
4650 | 4671 | if (th.data.poster && parseInt(th.data.poster.style) == 2) { |
4651 | 4672 | if (parseInt(th.data.poster.show_quality)) { |
4652 | - var g_path = "../../../images/share/s_gou.png"; | |
4673 | + var g_path = "../../../../images/share/s_gou.png"; | |
4653 | 4674 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); |
4654 | 4675 | context.setFillStyle("red") |
4655 | 4676 | context.setFontSize(18 * unit) |
... | ... | @@ -4667,7 +4688,7 @@ Page({ |
4667 | 4688 | } |
4668 | 4689 | |
4669 | 4690 | } else { |
4670 | - var g_path = "../../../images/share/s_gou.png"; | |
4691 | + var g_path = "../../../../images/share/s_gou.png"; | |
4671 | 4692 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); |
4672 | 4693 | context.setFillStyle("red") |
4673 | 4694 | context.setFontSize(18 * unit) |
... | ... | @@ -4733,7 +4754,7 @@ Page({ |
4733 | 4754 | context.stroke(); |
4734 | 4755 | |
4735 | 4756 | //画秒杀的图片 |
4736 | - var miaos_path = '../../../images/share/miao_share.png'; | |
4757 | + var miaos_path = '../../../../images/share/miao_share.png'; | |
4737 | 4758 | context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); |
4738 | 4759 | |
4739 | 4760 | context.setFillStyle("black") |
... | ... | @@ -4770,7 +4791,7 @@ Page({ |
4770 | 4791 | context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); |
4771 | 4792 | |
4772 | 4793 | //绘制成团图片 |
4773 | - var ct_img = "../../../images/share/ct_num.png"; | |
4794 | + var ct_img = "../../../../images/share/ct_num.png"; | |
4774 | 4795 | context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); |
4775 | 4796 | var ct_num = th.data.prom_act.ct_num; |
4776 | 4797 | context.setFontSize(14 * unit) |
... | ... | @@ -4853,7 +4874,80 @@ Page({ |
4853 | 4874 | //---二维吗图--- |
4854 | 4875 | context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); |
4855 | 4876 | } |
4856 | - break | |
4877 | + break; | |
4878 | + | |
4879 | + | |
4880 | + case 9: | |
4881 | + | |
4882 | + //---画线--- | |
4883 | + context.setLineWidth(1 * unit) | |
4884 | + context.moveTo(32 * unit, 680 * unit) | |
4885 | + context.lineTo(520 * unit, 680 * unit) | |
4886 | + context.stroke(); | |
4887 | + | |
4888 | + //---文字--- | |
4889 | + context.setFillStyle("black") | |
4890 | + context.setFontSize(24 * unit) | |
4891 | + context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); | |
4892 | + | |
4893 | + //还差N人,即可成团 | |
4894 | + let group_num = th.data.luckGoInfo.group_num; | |
4895 | + let num_joined = th.data.luckGoInfo.num; | |
4896 | + let delta1 = group_num - num_joined; | |
4897 | + let width_delta1 = ut.measureText(delta1, 15); | |
4898 | + context.setFillStyle("black"); | |
4899 | + context.setFontSize(21.3 * unit); | |
4900 | + context.fillText("还差", 40 * unit, 772 * unit); | |
4901 | + context.setFillStyle("#FF6768"); | |
4902 | + context.setFontSize(21.3 * unit); | |
4903 | + context.fillText(delta1, 86 * unit, 772 * unit); | |
4904 | + context.setFillStyle("black"); | |
4905 | + context.setFontSize(21.3 * unit); | |
4906 | + context.fillText("人,即可成团", (95 + width_delta1) * unit, 772 * unit); | |
4907 | + | |
4908 | + // N人得商品,N人全额退款 | |
4909 | + let group_win = th.data.luckGoInfo.group_win; | |
4910 | + let delta2 = group_num - group_win; | |
4911 | + let width_delta2 = ut.measureText(delta2, 16); | |
4912 | + let width_groupNum = ut.measureText(group_num, 15); | |
4913 | + let width_groupWin = ut.measureText(group_win, 15); | |
4914 | + context.setFillStyle("#FF6768"); | |
4915 | + context.setFontSize(21.3 * unit); | |
4916 | + context.fillText(group_win, 40 * unit, 806 * unit); | |
4917 | + context.setFillStyle("black"); | |
4918 | + context.setFontSize(21.3 * unit); | |
4919 | + context.fillText("人得商品,", (54 + width_groupWin) * unit, 806 * unit); | |
4920 | + context.setFillStyle("#FF6768"); | |
4921 | + context.setFontSize(21.3 * unit); | |
4922 | + context.fillText(delta2, 160 * unit, 806 * unit); | |
4923 | + context.setFillStyle("black"); | |
4924 | + context.setFontSize(21.3 * unit); | |
4925 | + context.fillText("人全额退款", (170 + width_delta2) * unit, 806 * unit); | |
4926 | + | |
4927 | + // 并得帮团惊喜礼品 | |
4928 | + context.setFillStyle("black") | |
4929 | + context.setFontSize(21.3 * unit) | |
4930 | + context.fillText("并得帮团", 40 * unit, 840 * unit); | |
4931 | + context.setFillStyle("#FF6768") | |
4932 | + context.setFontSize(21.3 * unit) | |
4933 | + context.fillText("惊喜礼品", 130 * unit, 840 * unit); | |
4934 | + context.setFillStyle("black") | |
4935 | + context.setFontSize(21.3 * unit) | |
4936 | + context.fillText("!", 220 * unit, 840 * unit); | |
4937 | + | |
4938 | + | |
4939 | + //---二维吗图--- | |
4940 | + //-- 自定义海报 -- | |
4941 | + if (th.data.poster) { | |
4942 | + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; | |
4943 | + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; | |
4944 | + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); | |
4945 | + } else { | |
4946 | + //---二维吗图--- | |
4947 | + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); | |
4948 | + } | |
4949 | + | |
4950 | + break; | |
4857 | 4951 | |
4858 | 4952 | |
4859 | 4953 | } | ... | ... |
pages/index/index/index.js
... | ... | @@ -17,6 +17,7 @@ var d = getApp().globalData; |
17 | 17 | |
18 | 18 | var full_screen = require('full_screen.js'); |
19 | 19 | |
20 | + | |
20 | 21 | Page({ |
21 | 22 | data: { |
22 | 23 | url: o.imghost, |
... | ... | @@ -86,8 +87,6 @@ Page({ |
86 | 87 | }, |
87 | 88 | |
88 | 89 | onLoad: async function (tt) { |
89 | - console.log("进入首页-------------"); | |
90 | - console.log(tt); | |
91 | 90 | var th = this; |
92 | 91 | var first_leader = tt.first_leader; |
93 | 92 | if (!first_leader && tt.scene) { |
... | ... | @@ -139,8 +138,8 @@ Page({ |
139 | 138 | var pages = getCurrentPages(); //获取加载的页面 |
140 | 139 | var currentPage = pages[pages.length - 1]; //获取当前页面的对象 |
141 | 140 | |
142 | - console.log("当前路由"); | |
143 | - console.log(currentPage.route); | |
141 | + // console.log("当前路由"); | |
142 | + // console.log(currentPage.route); | |
144 | 143 | |
145 | 144 | |
146 | 145 | th.setappdata(ob); |
... | ... | @@ -173,7 +172,6 @@ Page({ |
173 | 172 | getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { |
174 | 173 | data: {} |
175 | 174 | }).then(function (data) { |
176 | - // console.log('909090909090----->', data.data.code); | |
177 | 175 | let code = data.data.code; |
178 | 176 | if (code == 0) { |
179 | 177 | |
... | ... | @@ -230,6 +228,7 @@ Page({ |
230 | 228 | if (new_nav == "") { |
231 | 229 | th.is_new(); |
232 | 230 | } |
231 | + // sty | |
233 | 232 | setTimeout(function () { |
234 | 233 | if (getApp().globalData.user_id) getApp().requestCardNum(th); |
235 | 234 | }, 500) |
... | ... | @@ -392,6 +391,7 @@ Page({ |
392 | 391 | active: index //数字是当前页面在tabbar的索引 |
393 | 392 | }) |
394 | 393 | |
394 | + //sty | |
395 | 395 | getApp().requestCardNum(this); |
396 | 396 | } |
397 | 397 | |
... | ... | @@ -421,6 +421,22 @@ Page({ |
421 | 421 | getApp().globalData.isLoad_ad = 1; |
422 | 422 | } |
423 | 423 | }, 1500) |
424 | + | |
425 | + | |
426 | + // 获取幸运购活动列表 | |
427 | + getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { | |
428 | + data: { | |
429 | + store_id: getApp().globalData.setting.stoid, | |
430 | + is_end: 0, | |
431 | + timetype: 1, | |
432 | + } | |
433 | + }).then(res => { | |
434 | + if(res.data.code == 0) { | |
435 | + th.setData({ | |
436 | + luckGo_list: res.data.data.pageData.slice(0,3), | |
437 | + }); | |
438 | + } | |
439 | + }); | |
424 | 440 | |
425 | 441 | |
426 | 442 | |
... | ... | @@ -601,6 +617,14 @@ Page({ |
601 | 617 | }); |
602 | 618 | } |
603 | 619 | }) |
620 | + | |
621 | + | |
622 | + | |
623 | + | |
624 | + | |
625 | + | |
626 | + | |
627 | + | |
604 | 628 | //---调用信息--- |
605 | 629 | // this.requestRecommend(); |
606 | 630 | this.setData({ |
... | ... | @@ -615,6 +639,7 @@ Page({ |
615 | 639 | th.is_new(); |
616 | 640 | } |
617 | 641 | |
642 | + // sty | |
618 | 643 | setTimeout(function () { |
619 | 644 | if (getApp().globalData.user_id) getApp().requestCardNum(th); |
620 | 645 | }, 500) |
... | ... | @@ -1140,6 +1165,8 @@ Page({ |
1140 | 1165 | } |
1141 | 1166 | var url=e.currentTarget.dataset.url; |
1142 | 1167 | getApp().goto(url); |
1143 | - } | |
1168 | + }, | |
1169 | + | |
1170 | + | |
1144 | 1171 | |
1145 | 1172 | }); |
1146 | 1173 | \ No newline at end of file | ... | ... |
pages/index/index/index.wxml
... | ... | @@ -229,43 +229,46 @@ |
229 | 229 | |
230 | 230 | |
231 | 231 | <!--幸运购--> |
232 | - <view class="seckill" wx:if="{{false}}"> | |
233 | - <navigator bindtap="go_pre" data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none"> | |
234 | - <view class="seckill-time"> | |
235 | - <view class="classname flex ai_c"> | |
236 | - <i class="iconfont icon-luck"></i> | |
237 | - <text class="bold fs30">幸运购</text> | |
238 | - </view> | |
239 | - <view class="flex ai_c seckill-list"> | |
240 | - <text class="fs24 xc-marfin-right">查看全部</text> | |
241 | - <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image> | |
232 | + <!--幸运购--> | |
233 | + <view class="seckill"> | |
234 | + <navigator bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none"> | |
235 | + <view class="seckill-time"> | |
236 | + <view class="classname flex ai_c"> | |
237 | + <i class="iconfont icon-luck"></i> | |
238 | + <text class="bold fs30">幸运购</text> | |
239 | + </view> | |
240 | + <view class="flex ai_c seckill-list"> | |
241 | + <text class="fs24 xc-marfin-right">查看全部</text> | |
242 | + <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image> | |
243 | + </view> | |
242 | 244 | </view> |
243 | - </view> | |
244 | - </navigator> | |
245 | - <view class="seckill-list luck"> | |
246 | - <view class="list-item" wx:for="{{3}}"> | |
247 | - <view class="flex ai-center"> | |
248 | - <view class="img-container"><image class="img-block" src="../../../images/bk.png"></image></view> | |
249 | - <view class="pdl20 flex fdc jc_sb f1"> | |
250 | - | |
251 | - <view class="ellipsis-2 name fs28">我是商品</view> | |
252 | - <view> | |
253 | - <view class="flex ai-center"> | |
254 | - <text class="rmb c-red">189.00</text> | |
255 | - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">155</text></view> | |
256 | - </view> | |
257 | - <view class="flex jc_sb"> | |
258 | - <progress class="pdr20 f1 progress" percent="50" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="1人已参团"></progress> | |
259 | - <view class="btn fs26">去参团</view> | |
245 | + </navigator> | |
246 | + <view class="seckill-list luck"> | |
247 | + <view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}"> | |
248 | + <view class="flex ai-center"> | |
249 | + <view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}" | |
250 | + data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view> | |
251 | + <view class="pdl20 flex fdc jc_sb f1"> | |
252 | + | |
253 | + <view class="ellipsis-2 name fs28" data-content="{{item.group_num}}人团">{{item.title}}</view> | |
254 | + <view> | |
255 | + <view class="flex ai-center"> | |
256 | + <text class="rmb c-red">{{filter.price(item.group_price)}}</text> | |
257 | + <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view> | |
258 | + </view> | |
259 | + <view class="flex jc_sb"> | |
260 | + <progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress> | |
261 | + <view class="btn fs26">去参团</view> | |
262 | + <!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 --> | |
263 | + </view> | |
260 | 264 | </view> |
265 | + | |
261 | 266 | </view> |
262 | - | |
263 | 267 | </view> |
268 | + <view class="fs24 pdt10 c-7b">*<text class="c-red">{{item.group_num}}</text>人成团,<text class="c-red">{{item.group_win}}</text>人得商品,<text class="c-red">{{item.group_num - item.group_win}}</text>人全额退款并得<text class="c-red">惊喜礼品</text>!</view> | |
264 | 269 | </view> |
265 | - <view class="fs24 pdt10 c-7b">*<text class="c-red">5</text>人成团,<text class="c-red">5</text>人得商品,<text class="c-red">5</text>人全额退款并得<text class="c-red">惊喜礼品</text>!</view> | |
266 | 270 | </view> |
267 | 271 | </view> |
268 | - </view> | |
269 | 272 | |
270 | 273 | |
271 | 274 | ... | ... |