From 0e169bd1169f5096f5bea59661b92cfbd460a0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 2 Jun 2022 19:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/App.vue b/App.vue
index b64374f..2facf5c 100644
--- a/App.vue
+++ b/App.vue
@@ -5,8 +5,9 @@
 import { mapMutations } from "vuex";
 import APPUpdate from "@/plugins/APPUpdate";
 import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
-import config from "@/config/config";
-import storage from "@/utils/storage.js";
+<<<<<<< HEAD
+import config from "@/config/config";
+import storage from "@/utils/storage";
 // 悬浮球
 
 export default {
@@ -65,14 +66,14 @@ export default {
 
    onShow() {
     // #ifndef H5
-    // this.getClipboard();
+    this.getClipboard();
     // #endif
     // #ifdef APP-PLUS
-    console.log(storage.getShow());
+  
     if (storage.getShow()) {
       if(uni.getSystemInfoSync().platform == 'ios'){
       this.$u.route("/pages/tabbar/screen/fullScreen");
-      // uni.reLaunch({ url: "/pages/tabbar/screen/fullScreen" });
+
       }
     }
     // #endif