Merge branch 'dev' of http://git.trops-global.com/linxuxiang/tropsCode into dev

package-lock.json

@@ -18,6 +18,7 @@
         "echarts": "^5.5.0",
         "element-plus": "^2.7.3",
         "gsap": "^3.12.5",
+        "phaser": "^3.88.2",
         "pinia": "^2.1.7",
         "qrcode": "^1.5.4",
         "socket.io-client": "^2.5.0",
@@ -3134,6 +3135,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
@@ -5230,6 +5236,14 @@
       "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
       "dev": true
     },
+    "node_modules/phaser": {
+      "version": "3.88.2",
+      "resolved": "https://registry.npmmirror.com/phaser/-/phaser-3.88.2.tgz",
+      "integrity": "sha512-UBgd2sAFuRJbF2xKaQ5jpMWB8oETncChLnymLGHcrnT53vaqiGrQWbUKUDBawKLm24sghjKo4Bf+/xfv8espZQ==",
+      "dependencies": {
+        "eventemitter3": "^5.0.1"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz",
@@ -10019,6 +10033,11 @@
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true
     },
+    "eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
@@ -11584,6 +11603,14 @@
       "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
       "dev": true
     },
+    "phaser": {
+      "version": "3.88.2",
+      "resolved": "https://registry.npmmirror.com/phaser/-/phaser-3.88.2.tgz",
+      "integrity": "sha512-UBgd2sAFuRJbF2xKaQ5jpMWB8oETncChLnymLGHcrnT53vaqiGrQWbUKUDBawKLm24sghjKo4Bf+/xfv8espZQ==",
+      "requires": {
+        "eventemitter3": "^5.0.1"
+      }
+    },
     "picocolors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz",

package.json

@@ -22,6 +22,7 @@
     "echarts": "^5.5.0",
     "element-plus": "^2.7.3",
     "gsap": "^3.12.5",
+    "phaser": "^3.88.2",
     "pinia": "^2.1.7",
     "qrcode": "^1.5.4",
     "socket.io-client": "^2.5.0",

src/api/request.ts

@@ -96,6 +96,9 @@ service.interceptors.response.use(
       if (deviceid == undefined && router.currentRoute.value.path != '/login' && router.currentRoute.value.path != '/sunshineRun') {
         router.push('/login');
       }
+      if (deviceid == undefined && router.currentRoute.value.path == '/gesture') {
+        router.push('/login/qrcode');
+      }
       if (deviceid == undefined && router.currentRoute.value.path == '/sunshineRun') {
         router.push('/login/sunshineRun');
       }