From 63e62f860958716da9ebb34ce07c8d616b305b8e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 21 八月 2025 17:46:03 +0800
Subject: [PATCH] 优化
---
small-program/App.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/small-program/App.vue b/small-program/App.vue
index dc84749..a23ecbe 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -5,10 +5,6 @@
...mapState(['userInfo','openid'])
},
onLaunch: function() {
-<<<<<<< HEAD
-=======
- // console.log(ua)
->>>>>>> 71a103d6f5c55136f40535bccf23bc6129e342f7
var that = this;
if (!this.openid || this.openid =='') {
uni.login({
--
Gitblit v1.9.3