From 093c337bc425f6d9e5150c2dbd4621949fbb636c Mon Sep 17 00:00:00 2001
From: sexygoat <1538832180@qq.com>
Date: Fri, 17 Apr 2026 16:51:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=AB=E4=B8=80=E6=89=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue | 16 ++++++++--------
 utils/wxsdk.js        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7d2d113..9a912e9 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -140,10 +140,10 @@ const handleScanLogin = async () => {
 		// #ifdef H5
 		try {
 			// 检查是否在微信环境
-			if (!isInWechat()) {
-				uni.showToast({ title: '请在微信中打开', icon: 'none' });
-				return;
-			}
+			// if (!isInWechat()) {
+			// 	uni.showToast({ title: '请在微信中打开', icon: 'none' });
+			// 	return;
+			// }
 
 			// 调用扫一扫
 			const resultStr = await wxScan();
@@ -172,10 +172,10 @@ const handleScanLogin = async () => {
 			console.error('扫码错误:', err);
 			uni.showToast({ title: JSON.stringify(err), icon: 'none' });
 		}
-		// #endif
-		// #ifndef H5
-		uni.showToast({ title: '请在微信中打开', icon: 'none' });
-		// #endif
+		// // #endif
+		// // #ifndef H5
+		// uni.showToast({ title: '请在微信中打开', icon: 'none' });
+		// // #endif
 	};
 
 	const getPathDeviceId = () => {
diff --git a/utils/wxsdk.js b/utils/wxsdk.js
index a758213..2baedd6 100644
--- a/utils/wxsdk.js
+++ b/utils/wxsdk.js
@@ -1,7 +1,7 @@
 // utils/wxsdk.js —— 封装微信扫一扫 不用旧的了
 import { wechatApi } from '@/api/index.js'
 
-const wx = window.wx
+const wx = window.jWeixin
 
 /**
  * 初始化微信 JS-SDK