diff --git a/pages/AR/index.js b/pages/AR/index.js index 4ac648a..08a628a 100644 --- a/pages/AR/index.js +++ b/pages/AR/index.js @@ -8,14 +8,15 @@ const SELECT_TYPE = { IMAGE: 1, VIDEO: 2, }; +let timer = null Page({ data: { + showtoast: false, showOverlay: true, showSelect: false, SELECT_TYPE: SELECT_TYPE, selectType: 0, - //CRS配置 config: { apiKey: 'a9abd99b2dfb3a5bee964cbb0bced0ae', // EasyAR开发中心 - API KEY - API Key @@ -50,16 +51,15 @@ Page({ last: undefined, onLoad: function () { + this.daojishi() // 默认进入页面10S后退出 }, onReady: function () { if (systemInfo.platform === "devtools") { //开发工具不会触发initdone事件,于是在onReady手动触发 this.onCameraInit(); } - // 获取token this.queryToken().then(msg => { - console.log('token1') console.log(msg) this.data.config.token = msg; }).catch(err => { @@ -67,27 +67,32 @@ Page({ }); }, onHide(){ - console.log('tuichu') clearInterval(timer); + this.setData({ + runningCrs: false + }) }, - daojishi(){ - var t = 10; - var timer = setInterval(function(){ - t--; - if(t<2){ - wx.showToast({ - icon: 'none', - title: '扫描时间过长,请退出后重新扫描!', - }) + daojishi: function(){ + let that = this + let seconds = 10 + timer = setInterval(function(){ + seconds--; + if(seconds<2){ + that.setData({ + showtoast: true + }) } - if(t<0){ + if(seconds<0){ + that.setData({ + showtoast: false + }) clearInterval(timer); wx.navigateBack({ delta: 1, }) } }, 1000) - }, + }, showLoading(text) { this.setData({ showLoading: true, diff --git a/pages/AR/index.wxml b/pages/AR/index.wxml index 95a91f2..a18ebcb 100644 --- a/pages/AR/index.wxml +++ b/pages/AR/index.wxml @@ -15,6 +15,7 @@ --> + 扫描时间过长,请退出后重新扫描! diff --git a/pages/AR/index.wxss b/pages/AR/index.wxss index d2f6503..676fad0 100644 --- a/pages/AR/index.wxss +++ b/pages/AR/index.wxss @@ -159,4 +159,14 @@ camera { .selected { color: black; background: linear-gradient(90deg, #ABABAB 0%, #D6D6D6 50%, #ABABAB 100%); +} +.toast{ + height: 70rpx; + line-height: 70rpx; + font-size: 28rpx; + color: #fff; + background-color: rgba(0, 0, 0, 0.7); + border-radius: 8rpx; + margin: 300rpx auto 0; + padding: 0 20rpx; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 6d2a37d..15ed428 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -12,8 +12,12 @@ Page({ tabindex() { let userInfo = getApp().globalData.userInfo console.log(userInfo) + let id = 0 + if(userInfo.phone){ + id = userInfo.id + } wx.navigateTo({ - url: '/pages/out/index?index=1&userid=' + userInfo.id + '&gameid=1'+ '&type=' + 1 + url: '/pages/out/index?index=1&userid=' + id+ '&gameid=1&type=1' }) }, tabsaoma() { diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 7efc807..31898be 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -2,7 +2,7 @@ - + 微信一键授权 diff --git a/pages/login/index.wxss b/pages/login/index.wxss index eaf6878..535ba1f 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -28,9 +28,9 @@ height: 44rpx; } .title{ - width: 550rpx; - height: 176rpx; - margin-bottom: 56rpx; + width: 576rpx; + height: 122rpx; + margin-bottom: 66rpx; } .logo{ width: 542rpx; diff --git a/pages/share/index.js b/pages/share/index.js index a1b6a71..29c151d 100644 --- a/pages/share/index.js +++ b/pages/share/index.js @@ -70,7 +70,7 @@ Page({ console.log(e) this.shareFun() return { - title: '万套特惠房源5折起iPhone13 Pro Max免费赢', + title: '万套房源5折起iPhone13 Pro Max免费赢', imageUrl: 'https://static.quhouse.com/468340e3a1374decb4fa51a172aa4f52.png', path: '/pages/index/index' }