Commit 57e194caf333ad8ac093bf8a244e5377cddda952
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
3 additions
and
3 deletions
packageA/pages/checkin/checkin.js
| @@ -192,9 +192,9 @@ Page({ | @@ -192,9 +192,9 @@ Page({ | ||
| 192 | data: { | 192 | data: { |
| 193 | store_id: app.globalData.setting.stoid, | 193 | store_id: app.globalData.setting.stoid, |
| 194 | user_id: app.globalData.user_id, | 194 | user_id: app.globalData.user_id, |
| 195 | - daynum: self.data.res.getBQIntegral, | 195 | + daynum: self.data.res.getBQIntegral1, |
| 196 | bqnum: self.data.res.getbqnum2, | 196 | bqnum: self.data.res.getbqnum2, |
| 197 | - bqintegral: self.data.res.getBQIntegral1, | 197 | + bqintegral: self.data.res.getBQIntegral, |
| 198 | } | 198 | } |
| 199 | }).then(res => { | 199 | }).then(res => { |
| 200 | // 改变签到状态,由false置为true | 200 | // 改变签到状态,由false置为true |
pages/index/index/index.js
| @@ -228,7 +228,7 @@ Page({ | @@ -228,7 +228,7 @@ Page({ | ||
| 228 | 228 | ||
| 229 | var th = this | 229 | var th = this |
| 230 | var show=getApp().globalData.isLoad_ad; | 230 | var show=getApp().globalData.isLoad_ad; |
| 231 | - if(show){ | 231 | + if(!show){ |
| 232 | var full_screen = this.selectComponent("#full_screen"); //组件的id | 232 | var full_screen = this.selectComponent("#full_screen"); //组件的id |
| 233 | full_screen.get_the_full_screen(); | 233 | full_screen.get_the_full_screen(); |
| 234 | }else{ | 234 | }else{ |