Commit db9eda8020c108c32161f277c3fd65bd2572b288
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
4 additions
and
1 deletions
pages/index/index/index.js
| @@ -433,7 +433,7 @@ Page({ | @@ -433,7 +433,7 @@ Page({ | ||
| 433 | 433 | ||
| 434 | 434 | ||
| 435 | 435 | ||
| 436 | - | 436 | + |
| 437 | 437 | ||
| 438 | 438 | ||
| 439 | 439 | ||
| @@ -459,6 +459,7 @@ Page({ | @@ -459,6 +459,7 @@ Page({ | ||
| 459 | var th = this; | 459 | var th = this; |
| 460 | 460 | ||
| 461 | var show = getApp().globalData.isLoad_ad; | 461 | var show = getApp().globalData.isLoad_ad; |
| 462 | + | ||
| 462 | if(!show){ | 463 | if(!show){ |
| 463 | setTimeout(function () { | 464 | setTimeout(function () { |
| 464 | full_screen.get_the_full_screen(th); | 465 | full_screen.get_the_full_screen(th); |
| @@ -470,6 +471,8 @@ Page({ | @@ -470,6 +471,8 @@ Page({ | ||
| 470 | wx.hideLoading(); | 471 | wx.hideLoading(); |
| 471 | }, 960) | 472 | }, 960) |
| 472 | } | 473 | } |
| 474 | + } else { | ||
| 475 | + th.setData({ f_hidden: 1 }) | ||
| 473 | } | 476 | } |
| 474 | 477 | ||
| 475 | setTimeout(function () { | 478 | setTimeout(function () { |