- 
Status changed to merged 
- 
mentioned in commit 06483c986e7250068a03ac6aa9e67c97a253f3d7 
- 
Dev See merge request !302 
Showing
3 changed files
pages/user/assistance/assistance.js
| ... | ... | @@ -78,7 +78,8 @@ Page({ | 
| 78 | 78 | storeId: store_id | 
| 79 | 79 | } | 
| 80 | 80 | }) | 
| 81 | - } | |
| 81 | + }else | |
| 82 | + getApp().my_warnning("暂无此活动或您不符合商家设置的会员参与对象,无法参与!", 0, th); | |
| 82 | 83 | return ut.null_promise(); | 
| 83 | 84 | }).then(res => { | 
| 84 | 85 | if ( res && res.data &&res.data.code == 0) | 
| ... | ... | @@ -150,6 +151,11 @@ Page({ | 
| 150 | 151 | go_task: function() { | 
| 151 | 152 | var th = this; | 
| 152 | 153 | var help_id = th.data.help_id; | 
| 154 | + if (!help_id){ | |
| 155 | + getApp().my_warnning("暂无此活动或您不符合商家设置的会员参与对象,无法参与!", 0, th); | |
| 156 | + return false; | |
| 157 | + } | |
| 158 | + | |
| 153 | 159 | getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id); | 
| 154 | 160 | }, | 
| 155 | 161 | switch_head: function(e) { | ... | ... | 
pages/user/assistance/friend_assistance.js
| ... | ... | @@ -43,10 +43,10 @@ Page({ | 
| 43 | 43 | |
| 44 | 44 | }, | 
| 45 | 45 | |
| 46 | - // 跳转到助力成功页 | |
| 46 | + // 跳转到助力首页,我也要参加 | |
| 47 | 47 | participate_activity: function() { | 
| 48 | 48 | wx.navigateTo({ | 
| 49 | - url: '/pages/user/assistance/assistance_success?helpid='+this.data.helpId, | |
| 49 | + url: '/pages/user/assistance/assistance', | |
| 50 | 50 | }) | 
| 51 | 51 | }, | 
| 52 | 52 | ... | ... | 
pages/user/index/index.wxml
| ... | ... | @@ -257,13 +257,11 @@ | 
| 257 | 257 | <!-- </view> --> | 
| 258 | 258 | </view> | 
| 259 | 259 | </view> | 
| 260 | - | |
| 261 | - | |
| 260 | + </view> | |
| 261 | + | |
| 262 | 262 | <!-- 显示商品 --> | 
| 263 | 263 | <!-- 好物推荐 --> | 
| 264 | 264 | <goods_recommend id="goods_recommend"></goods_recommend> | 
| 265 | - | |
| 266 | - </view> | |
| 267 | 265 | </view> | 
| 268 | 266 | |
| 269 | 267 | <!--弹出层内容,其中的“我知道”中绑定让弹出层消失的函数:bindtap="hide"--> | ... | ... | 
