From df77f92c9e1659c342a45926d9414045ffe1a3b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 21 八月 2025 13:48:28 +0800
Subject: [PATCH] 修BUG

---
 small-program/App.vue |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/small-program/App.vue b/small-program/App.vue
index dc84749..e87c66c 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -4,11 +4,7 @@
 		computed: {
 			...mapState(['userInfo','openid'])
 		},
-		onLaunch: function() { 
-<<<<<<< HEAD
-=======
-			// console.log(ua)  
->>>>>>> 71a103d6f5c55136f40535bccf23bc6129e342f7
+		onLaunch: function() {  
 			var that = this;
 			if (!this.openid || this.openid =='') {
 				uni.login({

--
Gitblit v1.9.3