diff --git a/api/deepExploration/deepExploration.js b/api/deepExploration/deepExploration.js index 34dfc8f..2a4ab94 100644 --- a/api/deepExploration/deepExploration.js +++ b/api/deepExploration/deepExploration.js @@ -72,4 +72,17 @@ export const getModel4Second = (data) => { url: '/api/coze/fundsSecond', data }) -} \ 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/deepMate/deepMate.vue b/pages/deepMate/deepMate.vue index 685758b..7ca432a 100644 --- a/pages/deepMate/deepMate.vue +++ b/pages/deepMate/deepMate.vue @@ -316,7 +316,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/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 b2cb182..e786964 100644 --- a/pages/start/Registration/Registration.vue +++ b/pages/start/Registration/Registration.vue @@ -197,8 +197,9 @@ import { SendEmailCodeApi, SendPhoneCodeApi, } from "../../../api/start/login"; +import { useDeviceStore} from "../../../stores/modules/deviceInfo" -const type = ref("member"); +const type = ref(""); const email = ref(""); const password = ref(""); const phone = 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 5b19cf6..3c3f05d 100644 --- a/pages/start/login/login.vue +++ b/pages/start/login/login.vue @@ -266,9 +266,10 @@ import { } from "../../../api/start/login"; import { useUserStore } from "../../../stores/modules/userInfo"; +import { useDeviceStore } from "../../../stores/modules/deviceInfo"; const deepChartID = ref(""); -const type = ref("member"); +const type = ref(""); const email = ref(""); const password = ref(""); const country = ref("+86"); @@ -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/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..0cedb03 100644 --- a/utils/http.js +++ b/utils/http.js @@ -39,12 +39,12 @@ 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() const token = memberStore.userInfo?.token || options.data?.token - // const token = 'dccec0b65a94f498b8183a17589ab16e' + // const token = '1b3a58424c5324e40d4bf4d085e18047' if (token) { options.header.token = token }