From 071074b96c0ef1d27a8fb49d53e2d4475d639f3a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 13 May 2025 20:23:19 +0800
Subject: [PATCH] =?UTF-8?q?(=E3=80=83'=E2=96=BD'=E3=80=83)=20v2.5.0=20?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=9A=E5=8F=88=E7=86=AC=E8=BF=87=2030=20?=
 =?UTF-8?q?=E4=B8=AA=E5=A4=9C=EF=BC=8C=E5=A4=B4=E5=8F=91=E8=BF=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                              | 1 +
 package.json                                      | 2 +-
 sheep/libs/sdk-h5-weixin.js                       | 4 ++++
 sheep/platform/provider/wechat/officialAccount.js | 5 ++---
 sheep/store/app.js                                | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 81b9910a..03dd89b7 100644
--- a/.env
+++ b/.env
@@ -6,6 +6,7 @@ SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
 SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080
+### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48080
 ### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
diff --git a/package.json b/package.json
index 80ccc139..3ab56f47 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "id": "shopro",
   "name": "shopro",
   "displayName": "芋道商城",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
   "scripts": {
     "prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
diff --git a/sheep/libs/sdk-h5-weixin.js b/sheep/libs/sdk-h5-weixin.js
index f8646acb..115aecef 100644
--- a/sheep/libs/sdk-h5-weixin.js
+++ b/sheep/libs/sdk-h5-weixin.js
@@ -48,16 +48,20 @@ export default {
         ], // TODO 芋艿：后续可以设置更多权限；
         openTagList: data.openTagList,
       });
+    } else {
+      console.log('请求 JSSDK 配置失败，错误码：', code);
     }
 
     // 监听结果
     configSuccess = true;
     jweixin.error((err) => {
+      debugger;
       configSuccess = false;
       console.error('微信 JSSDK 初始化失败', err);
       // $helper.toast('微信JSSDK:' + err.errMsg);
     });
     jweixin.ready(() => {
+      debugger;
       if (configSuccess) {
         console.log('微信 JSSDK 初始化成功');
       }
diff --git a/sheep/platform/provider/wechat/officialAccount.js b/sheep/platform/provider/wechat/officialAccount.js
index ed7beb32..18adbe0a 100644
--- a/sheep/platform/provider/wechat/officialAccount.js
+++ b/sheep/platform/provider/wechat/officialAccount.js
@@ -19,7 +19,7 @@ async function login(code = '', state = '') {
       uni.setStorageSync('returnUrl', location.href);
       window.location = loginUrl;
     }
-  // 情况二：有 code 时，使用 code 去自动登录
+    // 情况二：有 code 时，使用 code 去自动登录
   } else {
     // 解密 code 发起登陆
     const loginResult = await AuthUtil.socialLogin(socialType, code, state);
@@ -59,8 +59,7 @@ const unbind = async (openid) => {
 
 // 获取公众号登陆地址
 async function getLoginUrl(event = 'login') {
-  const page = getRootUrl() + 'pages/index/login'
-    + '?event=' + event; // event 目的，区分是 login 还是 bind
+  const page = getRootUrl() + 'pages/index/login' + '?event=' + event; // event 目的，区分是 login 还是 bind
   const { code, data } = await AuthUtil.socialAuthRedirect(socialType, page);
   if (code !== 0) {
     return undefined;
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 10ff6989..e14a300a 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -68,9 +68,9 @@ const app = defineStore({
         this.info = {
           name: '芋道商城',
           logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
-          version: '2.4.2',
+          version: '2.5.0',
           copyright: '全部开源，个人与企业可 100% 免费使用',
-          copytime: 'Copyright© 2018-2024',
+          copytime: 'Copyright© 2018-2025',
 
           cdnurl: 'https://file.sheepjs.com', // 云存储域名
           filesystem: 'qcloud', // 云存储平台