From 3559bc47ce63cdc3bce6b4053a10a31b125c621b Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Mon, 25 Apr 2022 10:33:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json             |  2 +-
 pages/AR/index.js    |  2 +-
 pages/login/index.js |  2 +-
 pages/out/index.js   | 10 +++++++++-
 pages/out/index.wxml |  5 ++---
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app.json b/app.json
index c99c57c..d3e10b0 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/index/index",
     "pages/login/index",
+    "pages/index/index",
     "pages/out/index",
     "pages/middle/index",
     "pages/rank/index",
diff --git a/pages/AR/index.js b/pages/AR/index.js
index 05ce58a..58a9695 100644
--- a/pages/AR/index.js
+++ b/pages/AR/index.js
@@ -24,7 +24,7 @@ Page({
             token: '',
             clientHost: 'https://bd9b3490fe845642e600cf53f0cd64b8.cn1.crs.easyar.com:8443', //服务器一般不变
             jpegQuality: 0.7, //JPEG压缩质量，建议不低于70%
-            minInterval: 1000, //最短的两次CRS请求间隔
+            minInterval: 2000, //最短的两次CRS请求间隔
         },
         //识别到这个数组中的ID就触发内容
         targetIds: [
diff --git a/pages/login/index.js b/pages/login/index.js
index 466b0c7..b9c58fb 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -54,7 +54,7 @@ Page({
   },
   leave(){
     wx.navigateTo({
-      url: '../out/index?index=1',
+      url: '../out/index?index=1&userid='+ this.data.userid+'&gameid=1'+'&type=2',
     })
   },
   //登录-获取token
diff --git a/pages/out/index.js b/pages/out/index.js
index 5ae2a17..19c6b1e 100644
--- a/pages/out/index.js
+++ b/pages/out/index.js
@@ -7,6 +7,10 @@ Page({
   data: {
     web:null,
     index:0,
+    userid: 0,// 用户ID
+    gameid: 0,// 游戏ID
+    type: 1,
+    allurl: 'https://cloudcreategameoss.sxycy.games/pro/games/test/3d_dance'
   },
   /**
    * 生命周期函数--监听页面加载
@@ -15,7 +19,11 @@ Page({
     console.log(options);
     this.setData({
       web:options.web,
-      index:options.index
+      index:options.index,
+      userid: options.userid,
+      gameid: options.gameid,
+      type: options.type,
+      allurl: this.data.allurl +`?userid=${options.userid||0}&gameid=${options.gameid||0}&type=${options.type==2?2:1}`
     })
   },
 
diff --git a/pages/out/index.wxml b/pages/out/index.wxml
index 11153ae..798a15a 100644
--- a/pages/out/index.wxml
+++ b/pages/out/index.wxml
@@ -1,3 +1,2 @@
-<web-view wx:if="{{index==1}}" src="https://cloudcreategameoss.sxycy.games/pro/games/test/3d_dance/"></web-view>
-<web-view wx:if="{{index==2}}" src="{{web}}"></web-view>
-
+<web-view wx:if="{{index==1}}" src="{{allurl}}"></web-view>
+<web-view wx:if="{{index==2}}" src="{{web}}"></web-view>
\ No newline at end of file