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 }