-
Status changed to merged
-
mentioned in commit 7ddf51ee82aeeb09b6b6f8de40e458d67ec91ef7
Showing
4 changed files
app.wxss
packageB/pages/luckactivity/index/index.wxss
@@ -97,15 +97,15 @@ page { | @@ -97,15 +97,15 @@ page { | ||
97 | } | 97 | } |
98 | 98 | ||
99 | .icon-zhuanpan { | 99 | .icon-zhuanpan { |
100 | - font-size: 120rpx; | 100 | + font-size: 140rpx; |
101 | color: #FF6768; | 101 | color: #FF6768; |
102 | } | 102 | } |
103 | 103 | ||
104 | .img-container { | 104 | .img-container { |
105 | /* background-color: #dedede; */ | 105 | /* background-color: #dedede; */ |
106 | /* height: 300rpx; */ | 106 | /* height: 300rpx; */ |
107 | - width: 160rpx; | ||
108 | - height: 160rpx; | 107 | + width: 140rpx; |
108 | + height: 140rpx; | ||
109 | line-height: 160rpx; | 109 | line-height: 160rpx; |
110 | text-align: center; | 110 | text-align: center; |
111 | } | 111 | } |
packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -22,7 +22,7 @@ let imgDraw = { | @@ -22,7 +22,7 @@ let imgDraw = { | ||
22 | }, | 22 | }, |
23 | { //1.昵称 | 23 | { //1.昵称 |
24 | "type": "text", | 24 | "type": "text", |
25 | - "text": "", | 25 | + // "text": "", |
26 | "css": { | 26 | "css": { |
27 | "color": "#000000", | 27 | "color": "#000000", |
28 | "width": "400px", | 28 | "width": "400px", |
@@ -158,7 +158,7 @@ let imgDraw = { | @@ -158,7 +158,7 @@ let imgDraw = { | ||
158 | { //12.横线 | 158 | { //12.横线 |
159 | "type": "rect", | 159 | "type": "rect", |
160 | "css": { | 160 | "css": { |
161 | - "background": "#f0f0f0", | 161 | + "background": "#f8f8f8", |
162 | "width": "554px", | 162 | "width": "554px", |
163 | "height": "1px", | 163 | "height": "1px", |
164 | "top": "676px", | 164 | "top": "676px", |
@@ -217,7 +217,7 @@ let imgDraw = { | @@ -217,7 +217,7 @@ let imgDraw = { | ||
217 | 217 | ||
218 | Page({ | 218 | Page({ |
219 | data: { | 219 | data: { |
220 | - imgDraw, | 220 | + imgDraw: imgDraw, |
221 | start: false, | 221 | start: false, |
222 | list: null, | 222 | list: null, |
223 | isLoading: false, // 检测是否已经发送请求,防止重复发送请求 | 223 | isLoading: false, // 检测是否已经发送请求,防止重复发送请求 |
@@ -336,7 +336,7 @@ Page({ | @@ -336,7 +336,7 @@ Page({ | ||
336 | isLogin: true, | 336 | isLogin: true, |
337 | 'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称 | 337 | 'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称 |
338 | }); | 338 | }); |
339 | - // console.log('imghost', this.data.imghost); | 339 | + // console.log('imgDraw.views[1].text+++++++++', imgDraw.views[1], app.globalData.userInfo.nickname); |
340 | let user_id = app.globalData.userInfo.user_id; | 340 | let user_id = app.globalData.userInfo.user_id; |
341 | let store_id = app.globalData.setting.stoid; | 341 | let store_id = app.globalData.setting.stoid; |
342 | let id = this.data.options.id; | 342 | let id = this.data.options.id; |
@@ -372,10 +372,11 @@ Page({ | @@ -372,10 +372,11 @@ Page({ | ||
372 | self.setData({ | 372 | self.setData({ |
373 | 'imgDraw.views[3].text': self.data.luckInfo.act_name,//分享标题 | 373 | 'imgDraw.views[3].text': self.data.luckInfo.act_name,//分享标题 |
374 | // 'imgDraw.views[4].text': '快来一起抽奖吧,精美奖品等着你!',//分享内容 | 374 | // 'imgDraw.views[4].text': '快来一起抽奖吧,精美奖品等着你!',//分享内容 |
375 | - 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 | 375 | + 'imgDraw.views[14].text': util.formar_no_full(luckInfo.begindate) + ' 至 ' + util.formar_no_full(luckInfo.enddate),//活动时间 |
376 | }); | 376 | }); |
377 | 377 | ||
378 | 378 | ||
379 | + | ||
379 | let luckStyle = null; | 380 | let luckStyle = null; |
380 | 381 | ||
381 | 382 | ||
@@ -391,15 +392,16 @@ Page({ | @@ -391,15 +392,16 @@ Page({ | ||
391 | bannerUrl: imghost + template.bannerUrl, //背景图 | 392 | bannerUrl: imghost + template.bannerUrl, //背景图 |
392 | 'blocks[0].imgs[0].src': imghost + ((template&&template.wheelBaseUrl) ? template.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=3'), | 393 | 'blocks[0].imgs[0].src': imghost + ((template&&template.wheelBaseUrl) ? template.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=3'), |
393 | 'buttons[0].imgs[0].src': imghost + ((template&&template.wheelPointerUrl) ? template.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=3'), //指针 | 394 | 'buttons[0].imgs[0].src': imghost + ((template&&template.wheelPointerUrl) ? template.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=3'), //指针 |
394 | - 'imgDraw.views[3].text': template.title, //分享标题 | 395 | + 'imgDraw.views[3].text': template.share_title ? template.share_title:self.data.luckInfo.act_name, //分享标题 |
395 | 'imgDraw.views[5].url': imghost + (template&&template.share_image ? template.share_image:self.data.luckInfo.imageurl), //分享图片 | 396 | 'imgDraw.views[5].url': imghost + (template&&template.share_image ? template.share_image:self.data.luckInfo.imageurl), //分享图片 |
396 | - imgDraw: imgDraw, | 397 | + |
397 | }); | 398 | }); |
398 | 399 | ||
399 | let color = template&&template.colorCode ? template.colorCode:'#da104b'; | 400 | let color = template&&template.colorCode ? template.colorCode:'#da104b'; |
400 | luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; | 401 | luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; |
401 | self.setData({ | 402 | self.setData({ |
402 | luckStyle, | 403 | luckStyle, |
404 | + | ||
403 | }); | 405 | }); |
404 | // self.setData({ | 406 | // self.setData({ |
405 | // template: res.data.data, | 407 | // template: res.data.data, |
@@ -1304,11 +1306,18 @@ Page({ | @@ -1304,11 +1306,18 @@ Page({ | ||
1304 | }, | 1306 | }, |
1305 | 1307 | ||
1306 | showPoster() { | 1308 | showPoster() { |
1307 | - this.setData({ | ||
1308 | - hiddenCanvas: true, | ||
1309 | - showMask: true, | ||
1310 | - showPoster: true, | 1309 | + wx.showLoading({ |
1310 | + title: '生成海报中', | ||
1311 | }); | 1311 | }); |
1312 | + setTimeout(function() { | ||
1313 | + wx.hideLoading(); | ||
1314 | + self.setData({ | ||
1315 | + hiddenCanvas: true, | ||
1316 | + showMask: true, | ||
1317 | + showPoster: true, | ||
1318 | + }); | ||
1319 | + }, 3000); | ||
1320 | + | ||
1312 | }, | 1321 | }, |
1313 | 1322 | ||
1314 | closePoster() { | 1323 | closePoster() { |
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -164,7 +164,7 @@ | @@ -164,7 +164,7 @@ | ||
164 | <block wx:if="{{resultTitle == '谢谢参与'}}"> | 164 | <block wx:if="{{resultTitle == '谢谢参与'}}"> |
165 | <view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view> | 165 | <view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view> |
166 | <view class="pdt10">{{luckInfo.no_luck_remark}}</view> | 166 | <view class="pdt10">{{luckInfo.no_luck_remark}}</view> |
167 | - <view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'/miniapp/images/luckDraw/nolockimg.png')}}" class="img" mode="aspectFit"></image></view> | 167 | + <view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'/miniapp/images/luckDraw/nolockimg.png')}}" class="img" mode="aspectFit" lazy-load></image></view> |
168 | <view class="pdt40 fs26 c9 t-c" wx:if="{{(luckInfo.no_luck_urltype == 1) && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view> | 168 | <view class="pdt40 fs26 c9 t-c" wx:if="{{(luckInfo.no_luck_urltype == 1) && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view> |
169 | </block> | 169 | </block> |
170 | <block wx:else> | 170 | <block wx:else> |
@@ -172,8 +172,8 @@ | @@ -172,8 +172,8 @@ | ||
172 | <view class="pdt10">{{resultTitle}} </view> | 172 | <view class="pdt10">{{resultTitle}} </view> |
173 | <view class="img-container2"> | 173 | <view class="img-container2"> |
174 | <!-- <image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img" mode="aspectFit"></image> --> | 174 | <!-- <image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img" mode="aspectFit"></image> --> |
175 | - <image wx:if="{{wow.luck_goods_img}}" src="{{imghost + wow.luck_goods_img}}" class="img" mode="aspectFit"></image> | ||
176 | - <image src="{{imghost + tool.showDefaultImg(wow.lbtype)}}" class="img" mode="aspectFit" wx:else></image> | 175 | + <image wx:if="{{wow.luck_goods_img}}" src="{{imghost + wow.luck_goods_img}}" class="img" mode="aspectFit" lazy-load></image> |
176 | + <image src="{{imghost + tool.showDefaultImg(wow.lbtype)}}" class="img" mode="aspectFit" lazy-load wx:else></image> | ||
177 | </view> | 177 | </view> |
178 | </block> | 178 | </block> |
179 | </view> | 179 | </view> |
@@ -191,7 +191,7 @@ | @@ -191,7 +191,7 @@ | ||
191 | <!-- 海报 --> | 191 | <!-- 海报 --> |
192 | <view class="poster-container" wx:if="{{showPoster}}"> | 192 | <view class="poster-container" wx:if="{{showPoster}}"> |
193 | <view class="t-r pdb20 white2"><text class="iconfont icon-close fs40" bindtap="closePoster"></text></view> | 193 | <view class="t-r pdb20 white2"><text class="iconfont icon-close fs40" bindtap="closePoster"></text></view> |
194 | - <image src="{{myimg}}" class="poster" show-menu-by-longpress></image> | 194 | + <image src="{{myimg}}" class="poster" show-menu-by-longpress lazy-load></image> |
195 | <view class="pdt10 fs26 white2"><text class="iconfont icon-zhiwen"></text> 长按图片保存至相册</view> | 195 | <view class="pdt10 fs26 white2"><text class="iconfont icon-zhiwen"></text> 长按图片保存至相册</view> |
196 | </view> | 196 | </view> |
197 | 197 | ||
@@ -205,4 +205,4 @@ | @@ -205,4 +205,4 @@ | ||
205 | <qrcode id="qrcode" bind:close="closeQr"></qrcode> | 205 | <qrcode id="qrcode" bind:close="closeQr"></qrcode> |
206 | 206 | ||
207 | 207 | ||
208 | -<painter style="position: absolute; top: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK" /> | ||
209 | \ No newline at end of file | 208 | \ No newline at end of file |
209 | +<painter style="position: absolute; top: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/> | ||
210 | \ No newline at end of file | 210 | \ No newline at end of file |