From bf5ba56e8a82f0ef699f2eae413d0dc2c4e4f67d Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Tue, 25 Oct 2022 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web into master

---
 src/App.vue |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a324ecc..4281bd7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,12 @@
 <template>
-    <div id="app" :class="{ cantdoit: cantdoits }">
+    <div ref="appRef" id="app" :class="{ cantdoit: cantdoits }">
         <router-view v-if="isRouterActive"></router-view>
     </div>
 </template>
 
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader'
+import DevicePixelRatio from './utils/devicePixelRatio'
 
 export default {
     name: 'App',
@@ -19,7 +20,9 @@
         }
     },
     created () {
-
+        if (!this._isMobile()) {
+            new DevicePixelRatio().init()
+        }
     },
     mounted () {
         var transmitData = {}
@@ -86,7 +89,12 @@
         } else {
             // pc端
             // this.$router.replace('/large')
-            this.$router.replace('/pcLayout')
+
+            // if (this.$route.path == '/pcLayout/default') {
+            //     this.$router.replace('/pcLayout')
+            // } else {
+            //     this.$router.replace('/login')
+            // }
         }
     },
     methods: {
@@ -105,17 +113,6 @@
             var r = window.location.href.slice(inlength)
             if (r != null) return decodeURIComponent(r)
             return null
-        },
-        getQueryVariable (variable) {
-            var query = window.location.search.substring(1)
-            var vars = query.split('&')
-            for (var i = 0; i < vars.length; i++) {
-                var pair = vars[i].split('=')
-                if (pair[0] == variable) {
-                    return pair[1]
-                }
-            }
-            return false
         },
         _isMobile () {
             const flag = navigator.userAgent.match(

--
Gitblit v1.9.3