diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue
index 0842b58..205848e 100644
--- a/im-uniapp/pages/login/login.vue
+++ b/im-uniapp/pages/login/login.vue
@@ -6,7 +6,6 @@
 <script>
 import UNI_APP from '@/.env.js';
 
-// 【全局唯一锁】整个APP只执行一次，无论多少个页面实例
 let GLOBAL_AUTO_LOGIN_LOCK = false;
 
 export default {
@@ -24,15 +23,10 @@ export default {
 		}
 	},
 	methods: {
-<<<<<<< HEAD
 		autoLogin() {
-			// ========================
-			// 全局锁：这辈子只跑一次
-			// ========================
 			if (GLOBAL_AUTO_LOGIN_LOCK) return;
 			GLOBAL_AUTO_LOGIN_LOCK = true;
 
-			console.log("【自动登录】只执行唯一一次");
 
 			// 读取缓存
 			const loginInfo = uni.getStorageSync("loginInfo");
@@ -66,7 +60,6 @@ export default {
 				uni.setStorageSync("loginInfo", loginInfo);
 				
 				getApp().$vm.init()
-				console.log("loginInfo", loginInfo);
 				this.$http({
 					url: "/friend/add?friendId=" + loginInfo.customerServiceId,
 					method: "POST"
@@ -122,18 +115,16 @@ export default {
 		// 延迟执行，彻底避开双加载
 		setTimeout(() => {
 			this.autoLogin();
-			
-			
 		}, 50);
 	},
 
 	onShow() {
-		// 空，防止重复触发
+
 	}
 }
 </script>
 
-<style lang="scss" scoped>
+<!-- <style lang="scss" scoped>
 .login {
 	position: relative;
 	display: flex;
@@ -308,5 +299,5 @@ export default {
 			}
 		}
 	}
-}
-</style>
\ No newline at end of file
+} 
+</style>-->
\ No newline at end of file