From 11141ae436c6a7354ea7677092f540e6563d8cbc Mon Sep 17 00:00:00 2001
From: duanshuwen <duanshuwen@gogpay.cn>
Date: Sat, 13 Sep 2025 16:09:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |  2 +-
 .env.production                     |  2 +-
 .env.staging                        |  2 +-
 hooks/useGoLogin.js                 |  7 +++
 pages/chat/ChatMainList.vue         | 20 +++++---
 pages/chat/ChatMoreTips.vue         | 76 ++++++++++++++---------------
 pages/chat/styles/ChatMoreTips.scss | 34 +++++++++++++
 pages/drawer/MineSetting.vue        |  8 +++
 8 files changed, 103 insertions(+), 48 deletions(-)
 create mode 100644 pages/chat/styles/ChatMoreTips.scss

diff --git a/.env.development b/.env.development
index fe4c128..26bf791 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ VITE_BASE_URL = https://onefeel.brother7.cn/ingress
 # VITE_BASE_URL = https://biz.nianxx.cn
 
 # 测试
-ITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
+VITE_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 fd38e4e..5d07a8b 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,7 @@ VITE_BASE_URL = https://onefeel.brother7.cn/ingress
 # VITE_BASE_URL = https://biz.nianxx.cn
 
 # 测试
-ITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
+VITE_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 a711fdb..da39e91 100644
--- a/.env.staging
+++ b/.env.staging
@@ -7,7 +7,7 @@ VITE_BASE_URL = https://onefeel.brother7.cn/ingress
 # VITE_BASE_URL = https://biz.nianxx.cn
 
 # 测试
-ITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
+VITE_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/hooks/useGoLogin.js b/hooks/useGoLogin.js
index d4c32e1..d8e1eae 100644
--- a/hooks/useGoLogin.js
+++ b/hooks/useGoLogin.js
@@ -5,6 +5,10 @@ export const goLogin = () => uni.reLaunch({ url: "/pages/login/index" });
 
 // 登录逻辑
 export const onLogin = (e) => {
+  const token = uni.getStorageSync("token");
+
+  if (token) return;
+
   const { code } = e.detail;
   console.info("onLogin code: ", code);
 
@@ -18,6 +22,9 @@ export const onLogin = (e) => {
 
     // 绑定手机号
     bindPhone(params);
+
+    // 通知刷新
+    uni.$emit("TOKEN_CHANGE");
   });
 };
 
diff --git a/pages/chat/ChatMainList.vue b/pages/chat/ChatMainList.vue
index 1cb9cff..450f66b 100644
--- a/pages/chat/ChatMainList.vue
+++ b/pages/chat/ChatMainList.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script setup>
-import { onMounted, nextTick, onUnmounted, ref, defineEmits } from "vue";
+import { onMounted, nextTick, onUnmounted, ref, defineEmits, watch } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import {
   SCROLL_TO_BOTTOM,
@@ -353,6 +353,18 @@ onLoad(() => {
   });
 });
 
+// token存在，初始化数据
+const initHandler = () => {
+  console.log("initHandler");
+
+  loadRecentConversation();
+  loadConversationMsgList();
+  initWebSocket();
+};
+
+// 监听token变化
+uni.$on("TOKEN_CHANGE", () => initHandler());
+
 onMounted(() => {
   try {
     getMainPageData();
@@ -360,11 +372,7 @@ onMounted(() => {
     initTypewriterManager();
 
     // 有token时，加载最近会话、最近消息、初始化socket
-    checkToken().then(async () => {
-      await loadRecentConversation();
-      loadConversationMsgList();
-      initWebSocket();
-    });
+    checkToken().then(() => initHandler());
   } catch (error) {
     console.error("页面初始化错误:", error);
   }
diff --git a/pages/chat/ChatMoreTips.vue b/pages/chat/ChatMoreTips.vue
index 6795dd5..47db0f1 100644
--- a/pages/chat/ChatMoreTips.vue
+++ b/pages/chat/ChatMoreTips.vue
@@ -8,9 +8,9 @@
       >
         <button
           class="reset-btn more-tips-item-title"
-          open-type="getPhoneNumber"
-          @getphonenumber="onLogin"
-          @click="sendReply(item)"
+          :open-type="needAuth ? 'getPhoneNumber' : ''"
+          @getphonenumber="handleGetPhoneNumber"
+          @click="handleClick(item)"
         >
           {{ item }}
         </button>
@@ -20,10 +20,12 @@
 </template>
 
 <script setup>
-import { defineProps } from "vue";
+import { defineProps, ref } from "vue";
 import { onLogin, checkToken } from "@/hooks/useGoLogin";
 
 const emits = defineEmits(["replySent"]);
+const needAuth = ref(true);
+let pendingText = "";
 
 defineProps({
   itemList: {
@@ -45,42 +47,38 @@ const sendReply = (text) => {
     emits("replySent", text); // 向父组件传递数据
   });
 };
+
+// 处理点击事件
+const handleClick = (text) => {
+  // 检查本地token
+  const token = uni.getStorageSync("token");
+
+  if (token) {
+    // 情况2：token有值，直接发送回复，此时open-type为空字符串
+    needAuth.value = false;
+    sendReply(text);
+  } else {
+    // 情况1：token没有值，设置需要授权状态，触发微信授权
+    needAuth.value = true;
+    pendingText = text;
+    // 由于open-type已经动态绑定为'getPhoneNumber'，点击会自动触发授权
+  }
+};
+
+// 处理微信授权回调
+const handleGetPhoneNumber = async (e) => {
+  await onLogin(e);
+
+  // 授权成功后发送之前存储的文本
+  if (pendingText) {
+    sendReply(pendingText);
+    pendingText = "";
+  }
+
+  needAuth.value = false;
+};
 </script>
 
 <style lang="scss" scoped>
-.more-tips {
-  width: 100%;
-
-  &-scroll {
-    display: flex;
-    flex-direction: row;
-    overflow-x: auto;
-    white-space: nowrap;
-    -webkit-overflow-scrolling: touch;
-    padding-bottom: 12px;
-    box-sizing: border-box;
-  }
-
-  .more-tips-item {
-    border-radius: 8px;
-    margin: 4px;
-    box-shadow: 0 2px 5px 0px rgba(0, 0, 0, 0.1);
-    background-color: #ffffff;
-    padding: 2px 12px;
-    display: flex;
-    flex-direction: column;
-    flex-shrink: 0;
-    white-space: nowrap;
-
-    .more-tips-item-title {
-      font-family: PingFang SC, PingFang SC;
-      font-weight: 500;
-      font-size: 12px;
-      color: #00a6ff;
-      line-height: 24px;
-      text-align: center;
-      white-space: nowrap;
-    }
-  }
-}
+@import "./styles/ChatMoreTips.scss";
 </style>
diff --git a/pages/chat/styles/ChatMoreTips.scss b/pages/chat/styles/ChatMoreTips.scss
new file mode 100644
index 0000000..87738ed
--- /dev/null
+++ b/pages/chat/styles/ChatMoreTips.scss
@@ -0,0 +1,34 @@
+.more-tips {
+  width: 100%;
+
+  &-scroll {
+    display: flex;
+    flex-direction: row;
+    overflow-x: auto;
+    white-space: nowrap;
+    -webkit-overflow-scrolling: touch;
+    padding-bottom: 12px;
+    box-sizing: border-box;
+  }
+
+  .more-tips-item {
+    border-radius: 8px;
+    margin: 4px;
+    box-shadow: 0 2px 5px 0px rgba(0, 0, 0, 0.1);
+    background-color: #ffffff;
+    padding: 2px 12px;
+    display: flex;
+    flex-direction: column;
+    flex-shrink: 0;
+    white-space: nowrap;
+
+    .more-tips-item-title {
+      font-weight: 500;
+      font-size: 12px;
+      color: #00a6ff;
+      line-height: 24px;
+      text-align: center;
+      white-space: nowrap;
+    }
+  }
+}
diff --git a/pages/drawer/MineSetting.vue b/pages/drawer/MineSetting.vue
index f60100e..f6073c7 100644
--- a/pages/drawer/MineSetting.vue
+++ b/pages/drawer/MineSetting.vue
@@ -57,6 +57,7 @@ const menuList = ref([
   },
   // { label: '营业资质&协议', type: 'navigate', url: '/pages/agreement/agreement' },
   { label: "联系客服", type: "action", action: "contactService" },
+  { label: "订阅消息", type: "action", action: "subscribeMessage" },
 ]);
 
 // 生命周期钩子
@@ -81,6 +82,13 @@ const handleMenuClick = (item) => {
   } else if (item.type === "action") {
     if (item.action === "contactService") {
       uni.showToast({ title: "联系客服功能待实现", icon: "none" });
+    } else if (item.action === "subscribeMessage") {
+      uni.requestSubscribeMessage({
+        tmplIds: ["fMIt1q9GgM3Ep0DJSNgVPm4C3lCpQdz2TediETcv3iM"],
+        success(res) {
+          console.log(res);
+        },
+      });
     }
   }
 };