From d98b610bd0793dd5d29f623400a1d0a81bb55334 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 21 八月 2025 17:46:27 +0800
Subject: [PATCH] 优化

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

diff --git a/small-program/App.vue b/small-program/App.vue
index a57861a..120bad2 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -5,7 +5,11 @@
 		computed: {
 			...mapState(['userInfo','openid'])
 		},
+<<<<<<< HEAD
+		onLaunch: function() { 
+=======
 		onLaunch: function() {  
+>>>>>>> 2d0d3bb6a63ad0aee9d5cc003b50c50391b1cc94
 			var that = this;
 			that.getLocaltionBiz() 
 			if (!this.openid || this.openid =='') {

--
Gitblit v1.9.3