From c03a4200be22a7dbd659e8ebc2875f537a132fdf Mon Sep 17 00:00:00 2001
From: duanshuwen <duanshuwen@gogpay.cn>
Date: Fri, 12 Sep 2025 22:20:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development             |  12 ++-
 .env.production              |  12 ++-
 .env.staging                 |  12 ++-
 App.vue                      |  36 +++----
 hooks/useGoLogin.js          |  32 ++++++
 manager/LoginManager.js      |  67 ++++++------
 manifest.json                | 194 +++++++++++++++++------------------
 pages/chat/ChatMainList.vue  |  23 +++--
 pages/chat/ChatMoreTips.vue  |  17 ++-
 pages/drawer/MineSetting.vue |   6 +-
 project.config.json          |   4 +-
 request/base/request.js      |   8 +-
 12 files changed, 248 insertions(+), 175 deletions(-)

diff --git a/.env.development b/.env.development
index c4bc4b9..fe4c128 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,13 @@
 NODE_ENV = development
 
-VITE_BASE_URL = https://biz.nianxx.cn
+# 测试
+VITE_BASE_URL = https://onefeel.brother7.cn/ingress
 
-VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
+# 生产
+# VITE_BASE_URL = https://biz.nianxx.cn
+
+# 测试
+ITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
+
+# 生产
+# VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
diff --git a/.env.production b/.env.production
index cefae64..fd38e4e 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,13 @@
 NODE_ENV = production
 
-VITE_BASE_URL = https://biz.nianxx.cn
+# 测试
+VITE_BASE_URL = https://onefeel.brother7.cn/ingress
 
-VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
\ No newline at end of file
+# 生产
+# VITE_BASE_URL = https://biz.nianxx.cn
+
+# 测试
+ITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
+
+# 生产
+# VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index 8d7641c..a711fdb 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,13 @@
 NODE_ENV = staging
 
-VITE_BASE_URL = https://biz.nianxx.cn
+# 测试
+VITE_BASE_URL = https://onefeel.brother7.cn/ingress
 
-VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
\ No newline at end of file
+# 生产
+# VITE_BASE_URL = https://biz.nianxx.cn
+
+# 测试
+ITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
+
+# 生产
+# VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
\ No newline at end of file
diff --git a/App.vue b/App.vue
index 93d9caf..65d220e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,28 +1,8 @@
 <script setup>
-import { onLaunch, onShow, onHide, onLoad } from "@dcloudio/uni-app";
-import { checkPhone } from "@/manager/LoginManager";
-import { goLogin } from "@/hooks/useGoLogin";
-import { goHome } from "@/hooks/useGoHome";
+import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
 
 onLaunch(async () => {
   console.log("App Launch");
-
-  const token = uni.getStorageSync("token");
-
-  // 检测是否绑定手机号和token
-  if (!token) {
-    goLogin();
-
-    return;
-  }
-
-  if (token) {
-    const res = await checkPhone();
-
-    if (res.data) {
-      goHome();
-    }
-  }
 });
 
 onShow(() => {
@@ -55,4 +35,18 @@ body,
 .mb12 {
   margin-bottom: 12px;
 }
+
+// 重置按钮样式
+.reset-btn {
+  background: none;
+  border: none;
+  outline: none;
+  padding: 0;
+  margin: 0;
+
+  &::after {
+    border: none;
+    content: " ";
+  }
+}
 </style>
diff --git a/hooks/useGoLogin.js b/hooks/useGoLogin.js
index 8b78f12..d4c32e1 100644
--- a/hooks/useGoLogin.js
+++ b/hooks/useGoLogin.js
@@ -1 +1,33 @@
+import { loginAuth, checkPhone, bindPhone } from "@/manager/LoginManager";
+
+// 跳转登录
 export const goLogin = () => uni.reLaunch({ url: "/pages/login/index" });
+
+// 登录逻辑
+export const onLogin = (e) => {
+  const { code } = e.detail;
+  console.info("onLogin code: ", code);
+
+  loginAuth().then(async () => {
+    // 检测是否绑定手机号
+    const res = await checkPhone();
+
+    if (res.data) return;
+
+    const params = { wechatPhoneCode: code, clientId: "2" };
+
+    // 绑定手机号
+    bindPhone(params);
+  });
+};
+
+// 检测token
+export const checkToken = async () => {
+  return new Promise((resolve) => {
+    const token = uni.getStorageSync("token");
+
+    if (!token) return;
+
+    resolve(token);
+  });
+};
diff --git a/manager/LoginManager.js b/manager/LoginManager.js
index ba8cf02..bd561b0 100644
--- a/manager/LoginManager.js
+++ b/manager/LoginManager.js
@@ -1,49 +1,48 @@
 import {
-    wxLogin,
-    bindUserPhone,
-    checkUserPhone,
+  wxLogin,
+  bindUserPhone,
+  checkUserPhone,
 } from "../request/api/LoginApi";
 import { getWeChatAuthCode } from "./AuthManager";
 
-const loginAuth = async () => {
-    try {
-        const openIdCode = await getWeChatAuthCode();
-        console.log("获取到的微信授权code:", openIdCode);
-        const response = await wxLogin({
-            openIdCode: [openIdCode],
-            grant_type: "wechat",
-            scope: "server",
-            clientId: "2",
-        });
-        console.log("获取到的微信授权response:", response);
+const loginAuth = () => {
+  return new Promise(async (resolve, reject) => {
+    const openIdCode = await getWeChatAuthCode();
+    console.log("获取到的微信授权code:", openIdCode);
+    const response = await wxLogin({
+      openIdCode: [openIdCode],
+      grant_type: "wechat",
+      scope: "server",
+      clientId: "2",
+    });
+    console.log("获取到的微信授权response:", response);
 
-        if (response.access_token) {
-            uni.setStorageSync("token", response.access_token);
-            return response;
-        } else {
-            throw new Error(response.message || "登录失败");
-        }
-    } catch (err) {
-        throw err;
+    if (response.access_token) {
+      uni.setStorageSync("token", response.access_token);
+
+      resolve();
+    } else {
+      reject(response.message || "登录失败");
     }
+  });
 };
 
 const bindPhone = async (params) => {
-    try {
-        const response = await bindUserPhone(params);
-        return response;
-    } catch (error) {
-        throw err;
-    }
+  try {
+    const response = await bindUserPhone(params);
+    return response;
+  } catch (error) {
+    throw err;
+  }
 };
 
 const checkPhone = async (phone) => {
-    try {
-        const response = await checkUserPhone(phone);
-        return response;
-    } catch (error) {
-        throw err;
-    }
+  try {
+    const response = await checkUserPhone(phone);
+    return response;
+  } catch (error) {
+    throw err;
+  }
 };
 
 export { loginAuth, bindPhone, checkPhone };
diff --git a/manifest.json b/manifest.json
index eea556d..e5f85a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,102 +1,102 @@
 {
-    "name" : "YGTianmuCS",
-    "appid" : "__UNI__BB03E8A",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "auto" // 自动适配安全区域
-            }
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "oauth" : {}
-            }
-        }
+  "name": "YGTianmuCS",
+  "appid": "__UNI__BB03E8A",
+  "description": "",
+  "versionName": "1.0.0",
+  "versionCode": "100",
+  "transformPx": false,
+  /* 5+App特有相关 */
+  "app-plus": {
+    "usingComponents": true,
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx23f86d809ae80259",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "requiredPrivateInfos" : [ "getLocation" ],
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "用于获取当前所在城市信息"
-            }
-        },
-        "plugins" : {
-            "WechatSI" : {
-                "version" : "0.3.6",
-                "provider" : "wx069ba97219f66d99"
-            }
-        },
-        "__usePrivacyCheck__" : true
+    "safearea": {
+      "bottom": {
+        "offset": "auto" // 自动适配安全区域
+      }
     },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true,
-        "usePrivacyCheck" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3",
-    "h5" : {
-        "router" : {
-            "base" : "./",
-            "mode" : "hash"
-        },
-        "devServer" : {
-            "https" : false
-        }
+    /* 模块配置 */
+    "modules": {},
+    /* 应用发布信息 */
+    "distribute": {
+      /* android打包配置 */
+      "android": {
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      /* ios打包配置 */
+      "ios": {},
+      /* SDK配置 */
+      "sdkConfigs": {
+        "oauth": {}
+      }
     }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 朵花用：wx23f86d809ae80259 测试用：wx5e79df5996572539 */
+  "mp-weixin": {
+    "appid": "wx5e79df5996572539",
+    "setting": {
+      "urlCheck": false
+    },
+    "usingComponents": true,
+    "requiredPrivateInfos": ["getLocation"],
+    "permission": {
+      "scope.userLocation": {
+        "desc": "用于获取当前所在城市信息"
+      }
+    },
+    "plugins": {
+      "WechatSI": {
+        "version": "0.3.6",
+        "provider": "wx069ba97219f66d99"
+      }
+    },
+    "__usePrivacyCheck__": true
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true,
+    "usePrivacyCheck": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "3",
+  "h5": {
+    "router": {
+      "base": "./",
+      "mode": "hash"
+    },
+    "devServer": {
+      "https": false
+    }
+  }
 }
diff --git a/pages/chat/ChatMainList.vue b/pages/chat/ChatMainList.vue
index a413d09..1cb9cff 100644
--- a/pages/chat/ChatMainList.vue
+++ b/pages/chat/ChatMainList.vue
@@ -97,12 +97,18 @@
               />
 
               <ActivityListComponent
-                v-if="mainPageDataModel.activityList && mainPageDataModel.activityList.length > 0"
+                v-if="
+                  mainPageDataModel.activityList &&
+                  mainPageDataModel.activityList.length > 0
+                "
                 :activityList="mainPageDataModel.activityList"
               />
 
               <RecommendPostsComponent
-                v-if="mainPageDataModel.recommendTheme && mainPageDataModel.recommendTheme.length > 0"
+                v-if="
+                  mainPageDataModel.recommendTheme &&
+                  mainPageDataModel.recommendTheme.length > 0
+                "
                 :recommendThemeList="mainPageDataModel.recommendTheme"
               />
             </ChatCardOther>
@@ -165,6 +171,7 @@ import WebSocketManager from "@/utils/WebSocketManager";
 import TypewriterManager from "@/utils/TypewriterManager";
 import { IdUtils } from "@/utils";
 import { useAppStore } from "@/store";
+import { checkToken } from "@/hooks/useGoLogin";
 
 const appStore = useAppStore();
 /// 导航栏相关
@@ -346,14 +353,18 @@ onLoad(() => {
   });
 });
 
-onMounted(async () => {
+onMounted(() => {
   try {
     getMainPageData();
-    await loadRecentConversation();
-    loadConversationMsgList();
     addNoticeListener();
     initTypewriterManager();
-    initWebSocket();
+
+    // 有token时，加载最近会话、最近消息、初始化socket
+    checkToken().then(async () => {
+      await loadRecentConversation();
+      loadConversationMsgList();
+      initWebSocket();
+    });
   } catch (error) {
     console.error("页面初始化错误:", error);
   }
diff --git a/pages/chat/ChatMoreTips.vue b/pages/chat/ChatMoreTips.vue
index 1e32b2f..6795dd5 100644
--- a/pages/chat/ChatMoreTips.vue
+++ b/pages/chat/ChatMoreTips.vue
@@ -6,9 +6,14 @@
         v-for="(item, index) in itemList"
         :key="index"
       >
-        <text class="more-tips-item-title" @click="sendReply(item)">{{
-          item
-        }}</text>
+        <button
+          class="reset-btn more-tips-item-title"
+          open-type="getPhoneNumber"
+          @getphonenumber="onLogin"
+          @click="sendReply(item)"
+        >
+          {{ item }}
+        </button>
       </view>
     </view>
   </view>
@@ -16,6 +21,8 @@
 
 <script setup>
 import { defineProps } from "vue";
+import { onLogin, checkToken } from "@/hooks/useGoLogin";
+
 const emits = defineEmits(["replySent"]);
 
 defineProps({
@@ -34,7 +41,9 @@ defineProps({
 });
 
 const sendReply = (text) => {
-  emits("replySent", text); // 向父组件传递数据
+  checkToken().then(() => {
+    emits("replySent", text); // 向父组件传递数据
+  });
 };
 </script>
 
diff --git a/pages/drawer/MineSetting.vue b/pages/drawer/MineSetting.vue
index 32a5af8..f60100e 100644
--- a/pages/drawer/MineSetting.vue
+++ b/pages/drawer/MineSetting.vue
@@ -38,6 +38,7 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import { getLoginUserPhone } from "@/request/api/LoginApi";
+import { checkToken } from "@/hooks/useGoLogin";
 
 // 假数据
 const userInfo = ref({
@@ -60,11 +61,14 @@ const menuList = ref([
 
 // 生命周期钩子
 onMounted(() => {
-  getLoginUserPhoneInfo();
+  checkToken().then(() => {
+    getLoginUserPhoneInfo();
+  });
 });
 
 const getLoginUserPhoneInfo = async () => {
   const res = await getLoginUserPhone();
+
   if (res.code === 0) {
     userInfo.value.phone = res.data;
   }
diff --git a/project.config.json b/project.config.json
index a4f788c..08223bb 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-  "appid": "wx23f86d809ae80259",
+  "appid": "wx5e79df5996572539",
   "compileType": "miniprogram",
   "libVersion": "3.8.10",
   "packOptions": {
@@ -28,4 +28,4 @@
     "tabSize": 2
   },
   "projectArchitecture": "miniProgram"
-}
+}
diff --git a/request/base/request.js b/request/base/request.js
index ad8d1b0..133e4ad 100644
--- a/request/base/request.js
+++ b/request/base/request.js
@@ -50,10 +50,10 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
       success: (res) => {
         console.log("请求响应:" + JSON.stringify(res));
         resolve(res.data);
-        if (res.statusCode && res.statusCode === 424) {
-          uni.setStorageSync("token", "");
-          goLogin();
-        }
+        // if (res.statusCode && res.statusCode === 424) {
+        //   uni.setStorageSync("token", "");
+        //   goLogin();
+        // }
       },
       fail: (err) => {
         console.error("请求失败:", err);