From aa4ffa027de7c652566deaac741ea2b5837f81ef Mon Sep 17 00:00:00 2001 From: taiyuan Date: Fri, 6 Aug 2021 15:52:28 +0800 Subject: [PATCH] 大转盘修改 --- packageB/pages/luckactivity/luckinfo/luckinfo.js | 645 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------- packageB/pages/luckactivity/luckinfo/luckinfo.json | 3 ++- packageB/pages/luckactivity/luckinfo/luckinfo.wxml | 39 ++++++++++++++++++++++++--------------- packageB/pages/luckactivity/luckinfo/luckinfo.wxss | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 567 insertions(+), 175 deletions(-) diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index d36d23b..381e508 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1,10 +1,223 @@ +var util = require("../../../../utils/util.js"); var WxParse = require('../../../../utils/wxParse/wxParse.js'); const app = getApp(); let imghost = app.globalData.setting.imghost; let self = null; +let imgDraw = { + "width": "554px", + "height": "899px", + "background": "http://jmh.xinda100.cn/public/images/share_bg.png", + "views": [ + { //0.头像 + "type": "image", + "url": "", + "css": { + "background": "white", + "width": "80px", + "height": "80px", + "top": "24px", + "left": "40px", + "borderRadius": "80px", + } + }, + { //1.昵称 + "type": "text", + "text": "", + "css": { + "color": "#000000", + "width": "400px", + "top": "25px", + "left": "140px", + "fontSize": "26px", + "maxLines": "1", + } + }, + { //2.强烈推荐 + "type": "text", + "text": "强烈推荐", + "css": { + "color": "#fff", + "background": "#FF6768", + "width": "110px", + "height": "26px", + "lineHeight": "26px", + "top": "70px", + "left": "140px", + "borderRadius": "10px", + "fontSize": "18px", + "textAlign": "center" + + } + }, + { //3.分享标题 + "type": "text", + "text": "", + "css": { + "color": "red", + "width": "554px", + "padding": "20px", + "left": "20px", + "top": "140px", + "fontSize": "28px", + "textAlign": "center", + "maxLines": "1", + "fontWeight": "bold", + } + }, + { //4.分享内容 + "type": "text", + "text": "分享内容分享内容分享内容分享内容分享内容分享内容分享内容分享内容分享内容", + "css": { + "color": "#000000", + "width": "554px", + "padding": "20px", + "left": "20px", + "top": "190px", + "fontSize": "26px", + "textAlign": "center", + "maxLines": "1", + } + }, + { //5.分享图片 + "type": "image", + "url": "", + "css": { + "width": "554px", + "height": "350px", + "top": "240px", + "mode": "scaleToFill", + } + }, + { //6 + "type": "image", + "url": "/images/share/s_gou.png", + "css": { + "width": "30px", + "height": "30px", + "top": "620px", + "left": "18px", + "rotate": "0", + "borderRadius": "30px", + } + }, + { //7 + "type": "text", + "text": "正品保障", + "css": { + "color": "red", + "width": "110px", + "top": "620px", + "left": "52px", + "fontSize": "22px", + } + }, + { //8 + "type": "image", + "url": "/images/share/s_gou.png", + "css": { + "width": "30px", + "height": "30px", + "top": "620px", + "left": "208px", + "borderRadius": "30px", + } + }, + { //9 + "type": "text", + "text": "纯实体店", + "css": { + "color": "red", + "width": "129px", + "top": "620px", + "left": "243px", + "fontSize": "22px", + } + }, + { //10 + "type": "image", + "url": "/images/share/s_gou.png", + "css": { + "width": "30px", + "height": "30px", + "top": "620px", + "left": "410px", + "borderRadius": "30px", + } + }, + { //11 + "type": "text", + "text": "官方验证", + "css": { + "color": "red", + "width": "121px", + "top": "620px", + "left": "450px", + "fontSize": "22px", + } + }, + { //12.横线 + "type": "rect", + "css": { + "background": "#f0f0f0", + "width": "554px", + "height": "1px", + "top": "676px", + "left": "0px", + } + }, + { //13 + "type": "text", + "text": "特惠活动时间仅限", + "css": { + "color": "#000000", + "width": "245px", + "top": "730px", + "left": "28px", + "fontSize": "24px", + "textAlign": "left" + } + }, + { //14.时间 + "type": "text", + "text": "", + "css": { + "width": "377px", + "top": "770px", + "left": "28px", + "fontSize": "24px", + } + }, + { //15 + "type": "text", + "text": "长按识别小程序码有惊喜哦！", + "css": { + "color": "#7c7c7c", + "width": "348px", + "top": "810px", + "left": "27px", + "fontSize": "24px", + } + }, + + { //16.码 + "type": "image", + "url": "", + "css": { + "width": "150px", + "height": "150px", + "top": "705px", + "left": "380px", + "mode": "scaleToFill" + } + }, + + ] + }; + Page({ data: { + imgDraw: imgDraw, start: false, list: null, isLoading: false, // 检测是否已经发送请求,防止重复发送请求 @@ -12,6 +225,8 @@ Page({ pageNum: 1, // 当前页数 imghost: imghost, num: 3, + canStart: false, + prizes: [], defaultConfig: { @@ -63,6 +278,7 @@ Page({ // }); // console.log('imghost+++++', imghost); self = this; + let first_leader = null; this.data.options = options; // this.setData({ // options, @@ -72,28 +288,58 @@ Page({ wx.setNavigationBarTitle({ title: options.title, }); + + app.isLogin().then(function(data) {//进入页面前已经授权登录成功 self.setData({ userInfo: data, - // imghost, }); }); + + + + //从分享的跳转过来 + if (options.id == undefined || options.id == null || options.id == '') { + var scene = decodeURIComponent(options.scene); + scene = scene.split('_'); + first_leader = scene[0]; + this.data.options.id = scene[1]; + }; + + if(first_leader) { + console.log("log---", first_leader); + app.globalData.first_leader = first_leader; + //调用接口判断是不是会员 + app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid +"/" + first_leader,{}).then(res=>{ + if(res.data.code==0){ + app.globalData.guide_id = res.data.data.id; + } + }) + }; + + + + + }, onShow() { + console.log('show~~`'); if(app.globalData.userInfo) { if(!this.data.isLogin) { - this.setData({ userInfo: app.globalData.userInfo, isLogin: true, + 'imgDraw.views[0].url': app.globalData.userInfo.head_pic,//头像 + 'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称 }); - // console.log('imghost', this.data.imghost); let user_id = app.globalData.userInfo.user_id; let store_id = app.globalData.setting.stoid; let id = this.data.options.id; let url = `/api/weshop/marketing/marketingLuckForm/getLuckInfo/${store_id}/${id}/${user_id}`; + + app.request.get(url, { @@ -116,31 +362,32 @@ Page({ if(luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板 - let url = `/api/weshop/marketing/marketingLuckTemplate/get/${store_id}/${luckInfo.template_id}`; + let url = `/api/weshop/marketing/marketingLuckTemplate/get/0/${luckInfo.template_id}`; app.request.get(url, { success: function(res) { - // console.log('prizes//////', res.data.data); - self.setData({ - template: res.data.data, - bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图 - 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘 - 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针 - }); + // if(res.data.code == 0) { + self.setData({ + template: res.data.data, + bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图 + 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘 + 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针 + 'imgDraw.views[3].text': (res.data.data&&res.data.data.title) ? res.data.data.tilte : self.data.luckInfo.act_name,//分享标题 + 'imgDraw.views[4].text': (res.data.data&&res.data.data.share_content) ? res.data.data.share_content : '快来一起抽奖吧，精美奖品等着你！',//分享标题 + 'imgDraw.views[5].url': imghost + ((res.data.data&&res.data.data.share_image) ? res.data.data.share_image:self.data.luckInfo.imageurl),//分享图片 + 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 + }); + // }; + }, }); } else { - // wx.hideLoading(); + if(luckInfo && luckInfo.store_bannerUrl) { self.setData({ bannerUrl: imghost + luckInfo.store_bannerUrl, }); }; - // self.setData({ - // showMask2: false, - // hiddenCanvas: false, - // }); - }; @@ -149,7 +396,6 @@ Page({ title: self.data.luckInfo.msgInfo, icon: 'none', }); - // return; }; }, @@ -211,6 +457,24 @@ Page({ }, }); + let mainUrl = app.globalData.setting.url; + // let stoid = app.globalData.setting.stoid; + let cj_id = this.data.options.id; + // let user_id = app.globalData.userInfo.user_id; + + wx.getImageInfo({ + src: `${mainUrl}/api/wx/open/app/user/getWeAppEwm/${store_id}?sceneValue=${user_id}_${cj_id}&pageValue=packageB/pages/luckactivity/luckinfo/luckinfo`, + success (res) { + if(res.data.code != -1) { + self.setData({ + 'imgDraw.views[16].url': res.path, + }); + }; + + } + }); + + }; }; }, @@ -234,7 +498,7 @@ Page({ if(length == 1) { [0,2,4,6].map(function(item, index) { prizes[item] = { - id: award[0].id, + id: award[0].record_id, lbtype: award[0].lbtype, fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -258,7 +522,7 @@ Page({ if(length == 2) { [0,4].map(function(item, index) { prizes[item] = { - id: award[0].id, + id: award[0].record_id, lbtype: award[0].lbtype, fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -274,7 +538,7 @@ Page({ [2,6].map(function(item, index) { prizes[item] = { - id: award[1].id, + id: award[1].record_id, lbtype: award[1].lbtype, fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -298,7 +562,7 @@ Page({ if(length == 3) { [0,4].map(function(item, index) { prizes[item] = { - id: award[0].id, + id: award[0].record_id, lbtype: award[0].lbtype, fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -314,7 +578,7 @@ Page({ [1,5].map(function(item, index) { prizes[item] = { - id: award[1].id, + id: award[1].record_id, lbtype: award[1].lbtype, fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -330,7 +594,7 @@ Page({ [2,6].map(function(item, index) { prizes[item] = { - id: award[2].id, + id: award[2].record_id, lbtype: award[2].lbtype, fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -355,7 +619,7 @@ Page({ if(length == 4) { [0,2,4,6].map(function(item, index) { prizes[item] = { - id: award[index].id, + id: award[index].record_id, lbtype: award[index].lbtype, fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -379,7 +643,7 @@ Page({ if(length == 5) { [0,2,3,5,6].map(function(item, index) { prizes[item] = { - id: award[index].id, + id: award[index].record_id, lbtype: award[index].lbtype, fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -403,7 +667,7 @@ Page({ if(length == 6) { prizes = award.map(function(item, index) { return { - id: item.id, + id: item.record_id, lbtype: item.lbtype, fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ @@ -503,146 +767,183 @@ Page({ return; }; - - if(this.data.luckInfo.user_LuckNumDay > 0 || this.data.luckInfo.vip_act_num == 0) { - // console.log('start choujiang'); - // let start = false; - if(!this.data.start) { - this.data.start = true; - // 获取抽奖组件实例 - const $lucky = this.selectComponent('#myLucky'); - // 调用play方法开始旋转 - $lucky.play(); + // 获取积分 + app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', { + isShowLoading: false, + data: { + storeId: app.globalData.setting.stoid, + userId: app.globalData.userInfo.user_id, + LuckId: this.data.options.id, + }, + }) + .then(function(res) { + if(res.data.code == -1) { + //积分不足，弹出提示 + self.data.luckInfo.msgInfo = res.data.msg + wx.showToast({ + title: res.data.msg, + icon: 'none', + }); + return; + }; + + if(res.data.code == 0) { - // 获取抽奖结果 - app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', { - isShowLoading: false, - data: { - storeId: app.globalData.setting.stoid, - userId: app.globalData.userInfo.user_id, - LuckId: this.data.options.id, - }, - success: function(res) { + if(self.data.luckInfo.user_LuckNumDay > 0 || self.data.luckInfo.vip_act_num == 0) { + console.log('start choujiang'); + // let start = false; + if(!self.data.start) { + self.data.start = true; + // 获取抽奖组件实例 + const $lucky = self.selectComponent('#myLucky'); + // 调用play方法开始旋转 + $lucky.play(); - if(res.data.code == 0) { - console.log('开始摇奖', res.data.data); - if(self.data.luckInfo.vip_act_num != 0) { - self.setData({ - 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, - // isActive: true, - }); - }; - - self.setData({ - // 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, - isActive: true, - wow: res.data.data, - }); - // console.log('请求成功', res.data.data); - let luckyId = res.data.data.id; - let indexArr = self.luckyIndex(self.data.prizes, luckyId); - // console.log('抽奖奖品id', luckyId); - // console.log('奖品列表', self.data.prizes); - // console.log('奖品对应的索引数组', indexArr); - let random = Math.random() * indexArr.length >> 0; - // console.log('random', random); - let index = indexArr[random]; - setTimeout(() => { - $lucky.stop(index); - self.data.start = false; - }, 3000); - - - //获取兑奖记录 - // app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { - // isShowLoading: false, - // data: { - // store_id: app.globalData.setting.stoid, - // user_id: app.globalData.userInfo.user_id, - // luck_formid: self.data.options.id, - // luck_state: 1 - // }, - // success: function(res) { - // if(res.data.code == 0) { - // // console.log('res===>', res.data.data.pageData); - // self.setData({ - // record: res.data.data.pageData, - // }); - // }; - // }, - // }); - - - } else { - let thxIndexArr = self.data.thxIndexArr; - const random = Math.random() * thxIndexArr.length >> 0; - const index = thxIndexArr[random]; - // console.log('谢谢参与数组', thxIndexArr); - // console.log('请求出错产生谢谢参与的随机数', index); - setTimeout(() => { - $lucky.stop(index); - self.data.start = false; - }, 3000); - - + // 获取抽奖结果 + app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', { + isShowLoading: false, + data: { + storeId: app.globalData.setting.stoid, + userId: app.globalData.userInfo.user_id, + LuckId: self.data.options.id, + }, + success: function(res) { + + if(res.data.code == 0) { + console.log('开始摇奖', res.data.data); + if(self.data.luckInfo.vip_act_num != 0) { + self.setData({ + 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, + // isActive: true, + }); + }; + + self.setData({ + // 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, + isActive: true, + wow: res.data.data, + }); + // console.log('请求成功', res.data.data); + let luckyId = res.data.data.id; + let indexArr = self.luckyIndex(self.data.prizes, luckyId); + // console.log('抽奖奖品id', luckyId); + // console.log('奖品列表', self.data.prizes); + // console.log('奖品对应的索引数组', indexArr); + let random = Math.random() * indexArr.length >> 0; + // console.log('random', random); + let index = indexArr[random]; + setTimeout(() => { + $lucky.stop(index); + self.data.start = false; + }, 3000); + + + //获取兑奖记录 + // app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { + // isShowLoading: false, + // data: { + // store_id: app.globalData.setting.stoid, + // user_id: app.globalData.userInfo.user_id, + // luck_formid: self.data.options.id, + // luck_state: 1 + // }, + // success: function(res) { + // if(res.data.code == 0) { + // // console.log('res===>', res.data.data.pageData); + // self.setData({ + // record: res.data.data.pageData, + // }); + // }; + // }, + // }); + + + } else { + let thxIndexArr = self.data.thxIndexArr; + const random = Math.random() * thxIndexArr.length >> 0; + const index = thxIndexArr[random]; + // console.log('谢谢参与数组', thxIndexArr); + // console.log('请求出错产生谢谢参与的随机数', index); + setTimeout(() => { + $lucky.stop(index); + self.data.start = false; + }, 3000); + + + + + if(res.data.code == -1) { + wx.showToast({ + title: res.data.msg, + icon: 'none', + }); + self.data.luckInfo.msgInfo = res.data.msg; + return; + // self.data.start = true; + }; + + + if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) { + self.setData({ + 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, + }); + }; + + + }; + + }, - if(res.data.code == -1) { + fail: function(res) { + // console.log('出错'); wx.showToast({ - title: res.data.msg, - icon: 'none', + title: '数据请求失败', + icon: 'error', }); - self.data.luckInfo.msgInfo = res.data.msg; - return; - // self.data.start = true; - }; - // console.log('请求出错'); - if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) { - self.setData({ - 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, - }); - }; - + let thxIndexArr = self.data.thxIndexArr; + const random = Math.random() * thxIndexArr.length >> 0; + const index = thxIndexArr[random]; + setTimeout(() => { + $lucky.stop(index); + self.data.start = false; + }, 3000); + }, - }; - }, - - fail: function(res) { - // console.log('出错'); - wx.showToast({ - title: '数据请求失败', - icon: 'error', }); - let thxIndexArr = self.data.thxIndexArr; - const random = Math.random() * thxIndexArr.length >> 0; - const index = thxIndexArr[random]; - setTimeout(() => { - $lucky.stop(index); - self.data.start = false; - }, 3000); - }, + + } - }); + + } else { + wx.showToast({ + title: '你今天的抽奖次数已用完啦！~', + icon: 'none', + }); + }; - } - - - } else { - wx.showToast({ - title: '你今天的抽奖次数已用完啦！~', - icon: 'none', - }); - }; + }; + }); + + + + + }, end (event) { // 中奖奖品详情 - console.log('00000000~',event.detail.lbtype); + console.log('抽奖结果：',event.detail); let no_luck_urltype = this.data.luckInfo.no_luck_urltype; - let lbtype; + let lbtype = null; + let good_id = null; let resultTitle = event.detail.fonts[0].text.replace('\n',''); + if(event.detail.id) { + console.log('~~~~~~----++++++',event.detail.id); + good_id = event.detail.id; + }; if(event.detail.lbtype == 5) { lbtype = 5; } else { @@ -656,6 +957,7 @@ Page({ resultTitle, showPopup: false, currentLbtype: lbtype, + good_id, }); @@ -691,7 +993,7 @@ Page({ }); }; } else if((self.data.luckInfo.give_type == 2)) { - if(self.data.luckInfo.give_integral > 0) { + if(self.data.luckInfo.give_growth > 0) { wx.showToast({ title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, icon: 'none', @@ -708,7 +1010,7 @@ Page({ }); }; } else if((self.data.luckInfo.give_type == 2)) { - if(self.data.luckInfo.give_integral > 0) { + if(self.data.luckInfo.give_growth > 0) { wx.showToast({ title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, icon: 'none', @@ -887,20 +1189,30 @@ Page({ }, showQr(e) { + let id = null; let store_id = app.globalData.setting.stoid; - let id = e.currentTarget.dataset.id; + if(e && e.currentTarget.dataset.id) { + id = e.currentTarget.dataset.id; + } else { + id = this.data.good_id; + }; let url = `/api/weshop/marketing/marketingLuckList/updateGoodsVerifyCode/${store_id}/${id}`; + console.log('good_id', id, url); app.request.put(url, { success: function(res) { if(res.data.code == 0) { let data = res.data.data; - console.log('data!!!!', data); let barcode = self.selectComponent("#qrcode"); barcode.open({val: data}); self.setData({ hiddenCanvas: true, showPopup: false, }); + } else { + wx.showToast({ + title: res.data.msg, + icon: 'none', + }); }; }, @@ -917,7 +1229,32 @@ Page({ clickReceive() { this.setData({ showResult: false, + showMask: false, + }); + this.showQr(); + }, + + showPoster() { + this.setData({ + hiddenCanvas: true, + showMask: true, + showPoster: true, + }); + }, + + closePoster() { + this.setData({ + showMask: false, + showPoster: false, + hiddenCanvas: false, + }); + }, + + + + onImgOK(e) { + this.setData({ + myimg: e.detail.path, }); - this.showPopup(); }, }) \ No newline at end of file diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.json b/packageB/pages/luckactivity/luckinfo/luckinfo.json index e8748c5..27a7638 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.json +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.json @@ -2,7 +2,8 @@ "usingComponents": { "lucky-wheel":"/packageB/miniprogram_npm/mini-luck-draw/lucky-wheel/index", "qrcode": "/components/my-qrcode/my-qrcode", - "nodata": "/components/nodata/nodata" + "nodata": "/components/nodata/nodata", + "painter": "/packageB/components/painter/painter" }, "enablePullDownRefresh": false, "navigationBarTitleText": "幸运大转盘" diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index e49b1a8..8608cd8 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -1,6 +1,6 @@ - + @@ -35,17 +35,17 @@ hiddenCanvas="{{hiddenCanvas}}" /> - 今天你有 不限次 抽奖机会 - 今天你还有 {{filter.show_default(luckInfo.user_LuckNumDay, '0')}} 次抽奖机会 + 今天你有 不限次 抽奖机会 + 今天你还有 {{filter.show_default(luckInfo.user_LuckNumDay, '0')}} 次抽奖机会 - + - + @@ -64,19 +64,19 @@ - + - + 活动时间： {{filter.format_time(luckInfo.begindate, 1) + ' 至 ' + filter.format_time(luckInfo.enddate, 1)}} - + 活动说明：