diff --git a/pages/index/index.js b/pages/index/index.js index 2ef874d..694994a 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -5,7 +5,7 @@ Page({ data: { token: '', userInfo: null, - paramsid: '' + paramsid: ''// 邀请人ID }, onLoad(option) { console.log(option.id) @@ -29,7 +29,7 @@ Page({ if (res.data.code == 0) { let data = res.data.data // gameVersion为指定发版,和后台是否保持一致,方便提审通过,后续只需更改1为2,3,4,5... - if(data.miniType==0&&data.gameVersion==2){ + if(data.miniType==0&&data.gameVersion==1){ getApp().globalData.gameurl = data.linkUrl that.tabindex(data.linkUrl) }else{ @@ -73,7 +73,6 @@ Page({ }) }, tabindex(url) { - // let userInfo = getApp().globalData.userInfo let id = 0 if(this.data.userInfo.phone){ id = this.data.userInfo.id @@ -82,7 +81,7 @@ Page({ url: '/pages/out/index?index=1&userid=' + id+ '&gameid=1&type=1&url='+url }) }, - tabsaoma() { + saoma() { wx.navigateTo({ url: '/pages/AR/index' }) @@ -109,9 +108,7 @@ Page({ userInfo: res1.data.user_info }) if(that.data.paramsid){ // 有ID则是通过分享链接进来的 - setTimeout(function(){ - that.inviteFun(that.data.paramsid) - },1000) + that.inviteFun(that.data.paramsid) } getApp().globalData.token = res1.data.access_token getApp().globalData.userInfo = res1.data.user_info diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f2cad34..f0ad885 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file