From 3fb674916994deff93d3335e263e07dfb5946a8d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 21 八月 2025 17:47:52 +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 120bad2..a57861a 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -5,11 +5,7 @@
computed: {
...mapState(['userInfo','openid'])
},
-<<<<<<< HEAD
- onLaunch: function() {
-=======
onLaunch: function() {
->>>>>>> 2d0d3bb6a63ad0aee9d5cc003b50c50391b1cc94
var that = this;
that.getLocaltionBiz()
if (!this.openid || this.openid =='') {
--
Gitblit v1.9.3