Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 15bd4bb9 87d7c2d4
Showing 2 changed files with 3 additions and 3 deletions
packageA/pages/checkin/checkin.js
pages/index/index/index.js
@@ -192,9 +192,9 @@ Page({
 				data: {
 					store_id: app.globalData.setting.stoid,
 					user_id: app.globalData.user_id,
-					daynum: self.data.res.getBQIntegral,
+					daynum: self.data.res.getBQIntegral1,
 					bqnum: self.data.res.getbqnum2,
-					bqintegral: self.data.res.getBQIntegral1,
+					bqintegral: self.data.res.getBQIntegral,
 				}
 			}).then(res => {
 				// 改变签到状态,由false置为true
@@ -228,7 +228,7 @@ Page({
  
     var th = this	
 	var show=getApp().globalData.isLoad_ad;
-	if(show){
+	if(!show){
 	   var full_screen = this.selectComponent("#full_screen"); //组件的id
 	   full_screen.get_the_full_screen();	
 	}else{