From 6b012277367b0ae7bd0eed1615173a746912d98c Mon Sep 17 00:00:00 2001 From: Ethereal <3432649580@qq.com> Date: Tue, 28 Oct 2025 19:52:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/deepMate/deepMate.vue | 2 +- pages/start/Registration/Registration.vue | 2 +- pages/start/login/login.vue | 2 +- pages/start/recoverPassword/recoverPassword.vue | 2 +- pages/start/select/select.vue | 2 +- utils/http.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/deepMate/deepMate.vue b/pages/deepMate/deepMate.vue index 5497d58..622aa30 100644 --- a/pages/deepMate/deepMate.vue +++ b/pages/deepMate/deepMate.vue @@ -314,7 +314,7 @@ const renderMarkdown = (content) => { return marked.parse(content); }; -const type = ref("member"); +const type = ref("deepMate"); const inputMessage = ref(""); const showThinking = ref(true); const isSending = ref(false); diff --git a/pages/start/Registration/Registration.vue b/pages/start/Registration/Registration.vue index b2cb182..5c0822e 100644 --- a/pages/start/Registration/Registration.vue +++ b/pages/start/Registration/Registration.vue @@ -198,7 +198,7 @@ import { SendPhoneCodeApi, } from "../../../api/start/login"; -const type = ref("member"); +const type = ref(""); const email = ref(""); const password = ref(""); const phone = ref(""); diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue index 5b19cf6..73ffd03 100644 --- a/pages/start/login/login.vue +++ b/pages/start/login/login.vue @@ -268,7 +268,7 @@ import { import { useUserStore } from "../../../stores/modules/userInfo"; const deepChartID = ref(""); -const type = ref("member"); +const type = ref(""); const email = ref(""); const password = ref(""); const country = ref("+86"); diff --git a/pages/start/recoverPassword/recoverPassword.vue b/pages/start/recoverPassword/recoverPassword.vue index ada6c57..1bdca81 100644 --- a/pages/start/recoverPassword/recoverPassword.vue +++ b/pages/start/recoverPassword/recoverPassword.vue @@ -237,7 +237,7 @@ import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-po import { verificationPhone, verificationEmail } from "../login/verification"; import { SendEmailCodeApi, SendPhoneCodeApi } from "../../../api/start/login"; -const type = ref("member"); +const type = ref(""); const email = ref(""); const password = ref(""); const newPasswordFirst = ref(""); diff --git a/pages/start/select/select.vue b/pages/start/select/select.vue index 7663375..6b9cd88 100644 --- a/pages/start/select/select.vue +++ b/pages/start/select/select.vue @@ -26,7 +26,7 @@ import footerBar from "../../../components/footerBar"; import { ref, reactive, toRefs, watch } from "vue"; -const type = ref("member"); +const type = ref(""); function toRegistration() { uni.redirectTo({ diff --git a/utils/http.js b/utils/http.js index f1e7714..9aa102f 100644 --- a/utils/http.js +++ b/utils/http.js @@ -39,7 +39,7 @@ const httpInterceptor = { 'contentType': 'application/json', 'version': '1', 'client': client, - 'deviceId': deviceInfo.deviceId + 'deviceId': deviceInfo.deviceInfo.deviceId } //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致 const memberStore = useUserStore() From 9a0bad1bdeadc6dc941b0fa7cf5a879d66a6aa27 Mon Sep 17 00:00:00 2001 From: wangyi <3432649580@qq.com> Date: Wed, 29 Oct 2025 10:29:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/tcpConnection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/tcpConnection.js b/api/tcpConnection.js index 235c1ad..c701ca3 100644 --- a/api/tcpConnection.js +++ b/api/tcpConnection.js @@ -7,7 +7,7 @@ // 引用TCP插件 // const TCPSocket = uni.requireNativePlugin('Aimer-TCPPlugin'); -const TCPSocket = uni.requireNativePlugin("Aimer-TCPPlugin"); +// const TCPSocket = uni.requireNativePlugin("Aimer-TCPPlugin"); // TCP连接配置 const TCP_CONFIG = { From 52f7d4bd9d6089114e606e63b5382cd30ddf5aa2 Mon Sep 17 00:00:00 2001 From: wangyi <3432649580@qq.com> Date: Wed, 29 Oct 2025 11:09:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/deepExploration/deepExploration.js | 15 +- components/deepExploration_header.vue | 929 +++++++++++++++++------------- pages/setting/account.vue | 5 + pages/start/Registration/Registration.vue | 4 + pages/start/login/login.vue | 5 +- utils/http.js | 4 +- 6 files changed, 557 insertions(+), 405 deletions(-) diff --git a/api/deepExploration/deepExploration.js b/api/deepExploration/deepExploration.js index 96e9cad..386e0bf 100644 --- a/api/deepExploration/deepExploration.js +++ b/api/deepExploration/deepExploration.js @@ -7,4 +7,17 @@ export const getModel1 = () => { method: 'GET', url: '/api/coze/trackingFirst', }) -} \ No newline at end of file +} + + + +//历史记录列表 +export const RecordListApi = (data) => { + return http({ + method: 'POST', + url: '/api/coze/mainForceList', + data:data + }) +} + + diff --git a/components/deepExploration_header.vue b/components/deepExploration_header.vue index a3e6fc3..2a63d6a 100644 --- a/components/deepExploration_header.vue +++ b/components/deepExploration_header.vue @@ -1,409 +1,536 @@ \ No newline at end of file diff --git a/pages/setting/account.vue b/pages/setting/account.vue index 5dd5a60..d03f1d1 100644 --- a/pages/setting/account.vue +++ b/pages/setting/account.vue @@ -71,11 +71,16 @@ ref, onMounted } from 'vue' + + import {useUserStore} from "../../stores/modules/userInfo" const iSMT = ref(0) const jwcode = ref('90047681') const showLogout = ref(false) + const userStore = useUserStore() const handleConfirmLogout = () => { + + userStore.clearUserInfo() showLogout.value = false uni.showToast({ title: '退出登录成功', diff --git a/pages/start/Registration/Registration.vue b/pages/start/Registration/Registration.vue index 5c0822e..e786964 100644 --- a/pages/start/Registration/Registration.vue +++ b/pages/start/Registration/Registration.vue @@ -197,6 +197,7 @@ import { SendEmailCodeApi, SendPhoneCodeApi, } from "../../../api/start/login"; +import { useDeviceStore} from "../../../stores/modules/deviceInfo" const type = ref(""); const email = ref(""); @@ -271,11 +272,14 @@ async function register() { const registerType = changeLoginType(); isLoading.value = true; + const deviceStore = useDeviceStore() + const res = await registerApi({ registerType: registerType, account: account, verifyCode: verifyCode.value, agree: agreed.value, + deviceId:deviceStore.deviceInfo.deviceId }); isLoading.value = false; diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue index 73ffd03..3c3f05d 100644 --- a/pages/start/login/login.vue +++ b/pages/start/login/login.vue @@ -266,6 +266,7 @@ import { } from "../../../api/start/login"; import { useUserStore } from "../../../stores/modules/userInfo"; +import { useDeviceStore } from "../../../stores/modules/deviceInfo"; const deepChartID = ref(""); const type = ref(""); @@ -347,6 +348,8 @@ async function Login() { return; } + const deviceStore = useDeviceStore(); + const account = changeAccount(); const loginType = changeLoginType(); isLoading.value = true; @@ -357,6 +360,7 @@ async function Login() { password: password.value, useCode: verifyCode.value ? true : false, idToken: "", + deviceId: deviceStore.deviceInfo.deviceId, }); isLoading.value = false; @@ -815,7 +819,6 @@ function validatePhoneNumber(countryCode, phoneNumber) { } } - .back-btn, .headphone-btn { font-size: 36rpx; diff --git a/utils/http.js b/utils/http.js index 9aa102f..51668a2 100644 --- a/utils/http.js +++ b/utils/http.js @@ -43,8 +43,8 @@ const httpInterceptor = { } //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致 const memberStore = useUserStore() - const token = memberStore.userInfo?.token || options.data?.token - // const token = 'dccec0b65a94f498b8183a17589ab16e' + // const token = memberStore.userInfo?.token || options.data?.token + const token = '1b3a58424c5324e40d4bf4d085e18047' if (token) { options.header.token = token } From 9cd30f4fa434a77af989209b8a31a102226cb074 Mon Sep 17 00:00:00 2001 From: wangyi <3432649580@qq.com> Date: Wed, 29 Oct 2025 11:10:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9http?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/http.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/http.js b/utils/http.js index 51668a2..0cedb03 100644 --- a/utils/http.js +++ b/utils/http.js @@ -43,8 +43,8 @@ const httpInterceptor = { } //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致 const memberStore = useUserStore() - // const token = memberStore.userInfo?.token || options.data?.token - const token = '1b3a58424c5324e40d4bf4d085e18047' + const token = memberStore.userInfo?.token || options.data?.token + // const token = '1b3a58424c5324e40d4bf4d085e18047' if (token) { options.header.token = token }