From 6ff592208edfa2a64d457ab100f858ade0c03900 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 24 Oct 2025 14:36:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/modules/generate.ts | 3 ++- src/utils/request.ts | 1 + src/views/Workshop/product.vue | 30 +++++++++++++++++------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/stores/modules/generate.ts b/src/stores/modules/generate.ts index 9ab7e87..49219e7 100644 --- a/src/stores/modules/generate.ts +++ b/src/stores/modules/generate.ts @@ -11,9 +11,10 @@ export const useGenerateStore = defineStore({ model: { id: -1, }, - tryOnId:{//生成穿好衣服的回参 + originalTryOn:{//生成穿好衣服的回参 id: -1, isLike: false,//是否喜欢 + tryOnUrl:'', }, isGenerate: false,//点击继续按钮后是否需要生成 /** 顾客照片信息 */ diff --git a/src/utils/request.ts b/src/utils/request.ts index 0f0302a..6241d38 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -62,6 +62,7 @@ service.interceptors.response.use( } const res = response.data // 处理异常的情况 + console.log(res) if (res.code != 0) { showToast({ message: res.errMsg, diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue index 3237eba..04979cb 100644 --- a/src/views/Workshop/product.vue +++ b/src/views/Workshop/product.vue @@ -39,33 +39,37 @@ const startGenerate = ()=>{ customerId:1 || generateStore.customerId, visitRecordId:1 || generateStore.visitRecordId, styleId:1 || generateStore.style.id, - customerPhotoId:null, - modelPhotoId:null, - prompt:null, - originalTryOnId:null, + // customerPhotoId:null, + // modelPhotoId:null, + // prompt:null, + // originalTryOnId:null, isRegenerated:0, } generateTryOnEffect(value).then((res:any)=>{ data.isLoading = false; - generateStore.tryOnId.id = res.id - generateStore.tryOnId.isLike = false + generateStore.originalTryOn.id = res.id + generateStore.originalTryOn.tryOnUrl = res.tryOnUrl generateStore.useStyleGenerate()//生成后需要对选择衣服页面设置不可选中样式 generateStore.setIsGenerate(false) + + generateStore.clearCustomizeInfo() }).catch(()=>{ data.isLoading = false; - router.back() + if(!generateStore.originalTryOn.id){ + router.back() + } }) } const setLike = ()=>{ - let tryOnId = generateStore.tryOnId.id - if(generateStore.tryOnId.isLike){ + let tryOnId = generateStore.originalTryOn.id + if(generateStore.originalTryOn.isLike){ cancelTryOnEffectFavorite(tryOnId).then(()=>{ - generateStore.tryOnId.isLike = false + generateStore.originalTryOn.isLike = false }) }else{ setTryOnEffectFavorite(tryOnId).then(()=>{ - generateStore.tryOnId.isLike = true + generateStore.originalTryOn.isLike = true }) } } @@ -98,9 +102,9 @@ const { isLoading } = toRefs(data);
- +
-
+
From d5e8d002341f774c3ebef121cb52d671bae89acb Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 24 Oct 2025 15:18:23 +0800 Subject: [PATCH 2/2] fix --- src/stores/modules/generate.ts | 14 ++++---- src/utils/request.ts | 52 ++++++++++++++++-------------- src/views/Workshop/product.vue | 9 +++--- src/views/Workshop/selectStyle.vue | 2 +- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/stores/modules/generate.ts b/src/stores/modules/generate.ts index 49219e7..5dff441 100644 --- a/src/stores/modules/generate.ts +++ b/src/stores/modules/generate.ts @@ -5,14 +5,14 @@ export const useGenerateStore = defineStore({ state: () => { return { style: { - id: -1, - oldId: -1,//表示从生成页面返回回来，需要调整的样式id + id: '', + oldId: '',//表示从生成页面返回回来，需要调整的样式id }, model: { - id: -1, + id: '', }, originalTryOn:{//生成穿好衣服的回参 - id: -1, + id: '', isLike: false,//是否喜欢 tryOnUrl:'', }, @@ -56,19 +56,19 @@ export const useGenerateStore = defineStore({ }, //生成后去掉id 设置oldId来修改样式 useStyleGenerate() { + if(!this.style.id)return this.style.oldId = this.style.id - this.style.id = -1 + this.style.id = '' }, updateStyle(data) { console.log(data) if (data.id == this.style.oldId) { - this.style.oldId = -1 + this.style.oldId = '' } }, //模特相关 selectModel(data: any) { this.model.id = data.id - console.log(this) }, setIsGenerate(isGenerate: boolean) { this.isGenerate = isGenerate diff --git a/src/utils/request.ts b/src/utils/request.ts index 6241d38..cd0ea23 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -83,31 +83,33 @@ 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) { - closeLoading() - } - console.log('err' + error) // for debug - showToast({ - message: error.message, - type: 'fail', - duration: 5000 - }) + if(error?.response){ + 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) { + closeLoading() + } + console.log('err' + error) // for debug + showToast({ + message: error.message, + type: 'fail', + duration: 5000 + }) + } return Promise.reject(error) } ) diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue index 04979cb..77b3eff 100644 --- a/src/views/Workshop/product.vue +++ b/src/views/Workshop/product.vue @@ -47,7 +47,8 @@ const startGenerate = ()=>{ } generateTryOnEffect(value).then((res:any)=>{ data.isLoading = false; - generateStore.originalTryOn.id = res.id + generateStore.originalTryOn.isLike = false + generateStore.originalTryOn.id = res.tryOnId generateStore.originalTryOn.tryOnUrl = res.tryOnUrl generateStore.useStyleGenerate()//生成后需要对选择衣服页面设置不可选中样式 generateStore.setIsGenerate(false) @@ -55,7 +56,7 @@ const startGenerate = ()=>{ generateStore.clearCustomizeInfo() }).catch(()=>{ data.isLoading = false; - if(!generateStore.originalTryOn.id){ + if(generateStore.originalTryOn.id){ router.back() } }) @@ -104,8 +105,8 @@ const { isLoading } = toRefs(data);
-
-
+
+
diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index e68cf71..7f1f6a7 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -54,7 +54,7 @@ const updateStyle = ({item,index})=>{ const toProduct = ()=>{ console.log(generateStore.style) - if(generateStore.style.id == -1 && !generateStore.style.oldId){ + if(!generateStore.style.id && !generateStore.style.oldId){ showNotify({ message: 'Please select a style.', type:'warning' }); return }