Commit 959f0740b2653614ad4bc017824430632ae17720
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
3 additions
and
2 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
| @@ -853,7 +853,8 @@ Page({ | @@ -853,7 +853,8 @@ Page({ | ||
| 853 | return; | 853 | return; |
| 854 | }; | 854 | }; |
| 855 | wx.showLoading({ | 855 | wx.showLoading({ |
| 856 | - title: '抽奖中' | 856 | + title: '准备开始抽奖', |
| 857 | + mask: true, | ||
| 857 | }); | 858 | }); |
| 858 | // 获取积分 | 859 | // 获取积分 |
| 859 | app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', { | 860 | app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', { |
| @@ -890,6 +891,7 @@ Page({ | @@ -890,6 +891,7 @@ Page({ | ||
| 890 | const $lucky = self.selectComponent('#myLucky'); | 891 | const $lucky = self.selectComponent('#myLucky'); |
| 891 | // 调用play方法开始旋转 | 892 | // 调用play方法开始旋转 |
| 892 | $lucky.play(); | 893 | $lucky.play(); |
| 894 | + wx.hideLoading(); | ||
| 893 | // 获取抽奖结果 | 895 | // 获取抽奖结果 |
| 894 | app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', { | 896 | app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', { |
| 895 | isShowLoading: false, | 897 | isShowLoading: false, |
| @@ -1045,7 +1047,6 @@ Page({ | @@ -1045,7 +1047,6 @@ Page({ | ||
| 1045 | 1047 | ||
| 1046 | }, | 1048 | }, |
| 1047 | end (event) { | 1049 | end (event) { |
| 1048 | - wx.hideLoading(); | ||
| 1049 | // 中奖奖品详情 | 1050 | // 中奖奖品详情 |
| 1050 | // console.log('抽奖结果：',event.detail); | 1051 | // console.log('抽奖结果：',event.detail); |
| 1051 | let no_luck_urltype = this.data.luckInfo.no_luck_urltype; | 1052 | let no_luck_urltype = this.data.luckInfo.no_luck_urltype; |