From 2111483df71b77809a89adb5a752514eacc685ff Mon Sep 17 00:00:00 2001
From: 15004070936 <1097449274@qq.com>
Date: Wed, 12 Aug 2026 13:17:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 12 ++++++++----
store/chatStore.js | 3 ++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/main.js b/main.js
index 3358354..28f5174 100644
--- a/main.js
+++ b/main.js
@@ -13,12 +13,14 @@ uni.$http = $http;
// 请求的根路径
// #ifdef H5
-$http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+// $http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+$http.baseUrl = 'https://yoga.runpengsoft.com/yoga'
// $http.baseUrl = 'http://192.168.13.9:8083'
// #endif
//#ifdef APP-PLUS
-$http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+// $http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+$http.baseUrl = 'https://yoga.runpengsoft.com/yoga'
// $http.baseUrl = 'http://192.168.13.9:8083'
//#endif
@@ -26,12 +28,14 @@ $http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
// WebSocket 地址(可根据平台条件编译)
// #ifdef H5
// Vue.prototype.$wsUrl = 'ws://192.168.13.9:8528/im' // 开发环境
-Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver' // 生产环境
+// Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver' // 生产环境
+Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver/' // 生产环境
// #endif
// #ifdef APP-PLUS
// Vue.prototype.$wsUrl = 'ws://192.168.13.9:8528/im' // 开发环境
-Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver' // 生产环境
+// Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver' // 生产环境
+Vue.prototype.$wsUrl = 'wss://yoga.runpengsoft.com/yoga-imserver/' // 生产环境
// #endif
// 请求开始之前做一些事情
diff --git a/store/chatStore.js b/store/chatStore.js
index a1619db..7775637 100644
--- a/store/chatStore.js
+++ b/store/chatStore.js
@@ -516,7 +516,7 @@ const chatModule = {
if (msgInfo.id && msgInfo.id > 0) {
for (let i = 0; i < chat.messages.length; i++) {
const m = chat.messages[i];
- if (m.id && msgInfo.id < m.id) {
+ if (m.id && Number(msgInfo.id) < Number(m.id)) {
insertPos = i;
console.log(`消息乱序修正: ${chat.messages.length} -> ${insertPos}`);
break;
@@ -530,6 +530,7 @@ const chatModule = {
// 标记已存储为 false(已在 mutation 中完成)
// 保存到本地
dispatch('saveToStorage', { withColdMessage: false });
+
},
// ========== 更新消息 ==========
From 607a7a6468dded1caa72a5b64ec892a316c49669 Mon Sep 17 00:00:00 2001
From: 15004070936 <1097449274@qq.com>
Date: Wed, 19 Aug 2026 16:10:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.js b/main.js
index 28f5174..3d13af4 100644
--- a/main.js
+++ b/main.js
@@ -29,7 +29,7 @@ $http.baseUrl = 'https://yoga.runpengsoft.com/yoga'
// #ifdef H5
// Vue.prototype.$wsUrl = 'ws://192.168.13.9:8528/im' // 开发环境
// Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver' // 生产环境
-Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver/' // 生产环境
+Vue.prototype.$wsUrl = 'wss://yoga.runpengsoft.com/yoga-imserver/' // 生产环境
// #endif
// #ifdef APP-PLUS
From ff6552eccd3977c8557f87d8bfc63d84ea549125 Mon Sep 17 00:00:00 2001
From: 15004070936 <1097449274@qq.com>
Date: Fri, 28 Aug 2026 17:43:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/login.vue | 323 ++++++++++++++++++++++++++++++++-----
pages/user/courselist.vue | 325 +++++++++++++++++++++++++++++++++++++-
pages/user/set.vue | 2 +-
pages/user/user.vue | 3 +
4 files changed, 612 insertions(+), 41 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d5a6cea..b30316a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,40 +1,83 @@
-
-
- 欢迎登录
- yoga
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 看不清?
-
-
-
- 登录中..
-
-
-
- 注册账号 →
-
-
-
-
-
-
-
-
+
+
+ 欢迎登录
+ 瑜伽汇
+
+
+
+
+ 密码登录
+
+
+ 短信登录(待审核)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 看不清?
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ smsCountdown > 0 ? smsCountdown + 's' : '获取验证码' }}
+
+
+
+
+
+
+
+
+ 登录中..
+
+
+
+
+
+
+
+
+
+