From dab0bfaa5e1e92cea600beac142cb71498844a36 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 23 Oct 2025 13:43:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=B7=E6=B1=82=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/stores/modules/generate.ts | 8 +++++++ src/utils/request.ts | 38 ++++++++++++++++-------------- src/views/Workshop/selectModel.vue | 14 +++++------ 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/.env.development b/.env.development index 605cb43..4d28888 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VITE_APP_URL = '' \ No newline at end of file +VITE_APP_URL = http://18.167.251.121:10096 \ No newline at end of file diff --git a/src/stores/modules/generate.ts b/src/stores/modules/generate.ts index 918f693..21283d8 100644 --- a/src/stores/modules/generate.ts +++ b/src/stores/modules/generate.ts @@ -13,6 +13,9 @@ export const useGenerateStore = defineStore({ id:-1, oldId:-1,//表示从生成页面返回回来，需要调整的样式id }, + model:{ + id:-1, + } }, queryList:[] } @@ -35,6 +38,11 @@ export const useGenerateStore = defineStore({ if(data.id == this.userData.style.oldId){ this.userData.style.oldId = -1 } + }, + //模特相关 + selectModel(data:any){ + this.userData.model.id = data.id + console.log(this.userData) } } }) diff --git a/src/utils/request.ts b/src/utils/request.ts index 4272946..cd59ec6 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -1,11 +1,13 @@ import axios from 'axios' -import { showToast, showLoading, showConfirmDialog, closeToast } from 'vant' +import { showToast, showNotify, showConfirmDialog, closeToast } from 'vant' import { useUserInfoStore } from '@/stores/modules/userInfo' const store = useUserInfoStore() import { getLocal } from '@/utils/local' +import router from '@/router/index' + // 创建axios实例 -console.log(import.meta.env.VITE_APP_URL) +console.log(import.meta.env.VITE_APP_URL,123) const service = axios.create({ baseURL: import.meta.env.VITE_APP_URL, // api的base_url // baseURL: import.meta.env.VITE_APP_URL, // api的base_url @@ -57,7 +59,6 @@ service.interceptors.response.use( if (response.config.loading) { closeLoading() } - const res = response.data // 处理异常的情况 if (res.errCode != 0) { @@ -66,19 +67,7 @@ service.interceptors.response.use( type: 'fail', duration: 5000 }) - // 403:非法的token; 50012:其他客户端登录了; 401:Token 过期了; - if (res.errCode === 403 || res.errCode === 50012 || res.errCode === 401) { - showConfirmDialog({ - title: '确定登出', - message: '你已被登出，可以取消继续留在该页面，或者重新登录', - confirmButtonText: '重新登录', - cancelButtonText: '取消' - }).then(() => { - store.loginOut().then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug - }) - }) - } + return Promise.reject(new Error('error')) } else { // 默认只返回data，不返回状态码和message @@ -92,6 +81,20 @@ service.interceptors.response.use( } }, (error) => { + if(error?.response?.status === 401){//如果是记录浏览器页面就不跳转login + // showConfirmDialog({ + // title: '确定登出', + // message: '你已被登出，可以取消继续留在该页面，或者重新登录', + // confirmButtonText: '重新登录', + // cancelButtonText: '取消' + // }).then(() => { + // store.loginOut().then(() => { + // location.reload() // 为了重新实例化vue-router对象 避免bug + // }) + // }) + router.replace('/login') + return Promise.reject(error) + } error.config && removePending(error.config) // 关闭loading if (error.config?.loading) { @@ -154,9 +157,8 @@ const LoadingInstance: { _target: any; _count: number } = { _count: 0 } function openLoading(loadingDom: any) { - LoadingInstance._target = showLoading({ + LoadingInstance._target = showNotify({ message: '数据正在加载中', - forbidClick: true, background: 'rgba(25, 32, 53, 1)' }) } diff --git a/src/views/Workshop/selectModel.vue b/src/views/Workshop/selectModel.vue index 0bdd44a..cf6b415 100644 --- a/src/views/Workshop/selectModel.vue +++ b/src/views/Workshop/selectModel.vue @@ -1,14 +1,16 @@