From d61bb741d045ec514a3f9335c18112867eb2c079 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 23 Sep 2025 16:20:21 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Account/frontPage/bindPage.vue | 31 +++++----
 src/component/LoginPage/googleLogin.vue      | 70 ++++++++++++++------
 2 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue
index 0557f7e9..61e81949 100644
--- a/src/component/Account/frontPage/bindPage.vue
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -27,10 +27,10 @@
 						<div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div>
 						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
 					</div> -->
-					<div class="gmail_btn" @click="toGmailLogin">
-						<div v-if="!userDetail.accountExtendList?.Google" class="gallery_btn forbidden">{{ $t('frontPage.BindNow') }}</div>
-						<!-- <div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div> -->
-						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn forbidden" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
+					<div class="gmail_btn">
+						<div v-if="!userDetail.accountExtendList?.Google" class="gallery_btn">{{ $t('frontPage.BindNow') }}</div>
+						<div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div>
+						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
 						<!-- <div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div> -->
 					</div>
 				</div>
@@ -138,12 +138,13 @@ export default defineComponent({
 			bindPageDom.bindEmail.init('Modify')
 
 		}
-		const toGmailLogin = ()=>{
-			message.info(t('account.canNotUtilize'))
-		}
 		onMounted(async ()=>{
-			return
-			let  GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com'
+			let  GOOGLE_CLIENT_ID
+			if(import.meta.env.VITE_USER_NODE_ENV == 'development'){
+				GOOGLE_CLIENT_ID = '157095842121-kdd1fdf8m8nudvj9sprstb2k2prnf9e4.apps.googleusercontent.com'
+			}else{
+				GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com'
+			}
 			var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`);
 			if(!window.isAddGmail){
 				if(!existingScript){
@@ -206,7 +207,6 @@ export default defineComponent({
 		   ungroupGoogleModel,
 		   ungroupWeiXinModel,
 		   modifyEmail,
-		   toGmailLogin,
         }
     },
     data(){
@@ -271,14 +271,21 @@ export default defineComponent({
 				}
 				>.gmail_btn{
 					position: relative;
+					border-radius: 4rem;
+					overflow: hidden;
+					> .gallery_btn{
+						position: relative;
+						z-index: 2;
+						pointer-events: none;
+					}
 					#g_id_bind{
 						position: absolute;
 						left: 0;
 						top: 0;
 						width: 100%;
 						height: 100%;
-						opacity: 0;
-						z-index: 2;
+						// opacity: 0;
+						z-index: 1;
 						:deep(.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe){
 							width: 100%;
 						}
diff --git a/src/component/LoginPage/googleLogin.vue b/src/component/LoginPage/googleLogin.vue
index 74b17e88..47839f26 100644
--- a/src/component/LoginPage/googleLogin.vue
+++ b/src/component/LoginPage/googleLogin.vue
@@ -1,9 +1,10 @@
 <template>
     <div class="Container">
         <!-- 谷歌登录 -->
-        <!-- <div class="g_id_signin" id="g_id_signin">
-		</div> -->
-		<div class="icon" @click="toGmailLogin" style="opacity: .7;">
+        <div class="g_id_signin" id="g_id_signin">
+		</div>
+		<!-- <div class="icon" @click="toGmailLogin"> -->
+		<div class="icon">
 			<img src="@/assets/images/loginPage/gmailIcon.svg" alt="">
 			<span>{{ $props.text }}</span>
 		 </div>
@@ -25,8 +26,33 @@
 		},
 		setup(props, { emit }) {
 			const {t} = useI18n()
+			function decodeJWT(token) {
+
+			let base64Url = token.split(".")[1];
+			let base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+			let jsonPayload = decodeURIComponent(
+			atob(base64)
+				.split("")
+				.map(function (c) {
+				return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+				})
+				.join("")
+			);
+			return JSON.parse(jsonPayload);
+			}
 			const  handleCredentialResponse = async (response) => {
                 // 获取回调响应的凭证数据 然后拿这个凭证给后台，后台jwt进行解析获取登录信息
+				console.log("Encoded JWT ID token: " + response.credential);
+				const responsePayload = decodeJWT(response.credential);
+				console.log("Decoded JWT ID token fields:");
+				console.log("  Full Name: " + responsePayload.name);
+				console.log("  Given Name: " + responsePayload.given_name);
+				console.log("  Family Name: " + responsePayload.family_name);
+				console.log("  Unique ID: " + responsePayload.sub);
+				console.log("  Profile image URL: " + responsePayload.picture);
+				console.log("  Email: " + responsePayload.email);
+				
+
                 let code = response.credential
 				emit('googelLogin',code)
 				window.isAddGmail = false
@@ -36,10 +62,10 @@
 				scriptSrc:'https://accounts.google.com/gsi/client',
 				script:null
 			})
-			console.log()
+			console.log(import.meta.env.VITE_USER_NODE_ENV)
 			let GOOGLE_CLIENT_ID
 			if(import.meta.env.VITE_USER_NODE_ENV == 'development'){
-				GOOGLE_CLIENT_ID = '29310152396-c44dcsoksjirhn7vbo29p8u8n0sg4qps.apps.googleusercontent.com'
+				GOOGLE_CLIENT_ID = '157095842121-kdd1fdf8m8nudvj9sprstb2k2prnf9e4.apps.googleusercontent.com'
 			}else{
 				GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com'
 			}
@@ -51,11 +77,11 @@
 						window.isAddGmail = true
 						await new Promise((resolve, reject) => {
 							const script = document.createElement("script");
-							script.src = data.scriptSrc
 							script.onload=()=>{
 								resolve()
 							}
 							document.body.appendChild(script);
+							script.src = data.scriptSrc
 						})
 					}
 					window.google.accounts.id.initialize({
@@ -67,19 +93,19 @@
 						ux_mode:"popup",
 						itp_support:true,
 					});
+					console.log(document.querySelector('.Container #g_id_signin'))
 					window.google.accounts.id.renderButton(
-						document.querySelector('.Container #g_id_signin'),
-						{
-							type:"standard",//icon为只有一个icon
-							shape:"circle",
-							theme:"outline",
-							size:"large",
-							logo_alignment:"center",
-						});
+					document.querySelector('.Container #g_id_signin'),
+					{
+						type:"standard",//icon为只有一个icon
+						shape:"circle",
+						theme:"outline",
+						size:"large",
+						logo_alignment:"center",
+					});
 				}
 			}
 			const toGmailLogin = ()=>{
-				console.log(12312)
 				message.info(t('account.canNotUtilize'))
 			}
 			onBeforeUnmount(()=>{
@@ -90,7 +116,7 @@
 				}
 			})
 			onMounted(()=>{
-				// createGmailLogin()
+				createGmailLogin()
 			})
 			return {
 				toGmailLogin,
@@ -121,7 +147,6 @@
 	// 		width: 100%;
 	// 		height: 100%;
 	// 	}
-		
 	// }
 	.icon{
 		// width: 40px;
@@ -135,7 +160,7 @@
 		box-sizing: border-box;
 		position: relative;
 		background: transparent;
-		// pointer-events: none;
+		pointer-events: none;
 		background-color: #f5f5f5;
 		@media (max-width: 768px) {
 			border-radius: 2.5rem;
@@ -165,15 +190,20 @@
 		position: absolute;
 		width: 100%;
 		height: 100%;
-		overflow: hidden;
+		// overflow: hidden;
 		top: 0;
 		left: 0;
-		opacity: 0;
+		// opacity: 0;
 		.S9gUrf-YoZ4jf{
+			
+			
 		}
 		:deep(.S9gUrf-YoZ4jf){
 			width: 100%;
 			height: 100%;
+			iframe{
+				zoom: 3;
+			}
 		}
 	}
 	&:hover{

From 1e1f837da5a8db02717b0b4bfb5978f9bb694cec Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 23 Sep 2025 22:59:53 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/bindEmail.vue       | 1 +
 src/component/LoginPage/login/personal.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue
index 872278b0..409e5fe6 100644
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -365,6 +365,7 @@ export default defineComponent({
 					title:this.selectSex,
 					surname:this.surname,
 					givenName:this.givenName,
+					userId:this.userDetail?.userId,
 				};
 				if(this.loginTime){
 					this.loginTime = false
diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue
index 8afe7b59..1b3ea799 100644
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -41,7 +41,7 @@
 
               <!-- 邮箱登录 start -->
               <div
-                v-show="emailStap === 2"
+                v-if="emailStap === 2"
                 class="login_form_email"
                 :class="{ active: emailStap === 2 }"
               >

From 78e73b35c745d8fa96468a7c9c5c03d41db0ab9b Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 23 Sep 2025 23:00:14 +0800
Subject: [PATCH 03/12] fix

---
 src/component/LoginPage/login/personal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue
index 1b3ea799..8afe7b59 100644
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -41,7 +41,7 @@
 
               <!-- 邮箱登录 start -->
               <div
-                v-if="emailStap === 2"
+                v-show="emailStap === 2"
                 class="login_form_email"
                 :class="{ active: emailStap === 2 }"
               >

From 108dda41eae250f3ce61498cdb2b9eda03f7b6cb Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 23 Sep 2025 23:09:13 +0800
Subject: [PATCH 04/12] fix

---
 src/component/Account/account.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/component/Account/account.vue b/src/component/Account/account.vue
index 6a9280e5..57f7a42e 100644
--- a/src/component/Account/account.vue
+++ b/src/component/Account/account.vue
@@ -50,10 +50,10 @@
 									<div v-if="!isEditEmail">{{ userDetail.email }}</div>
 									<input v-else type="text" :value="editEmail">
 								</div>
-								<!-- <div class="icon">
+								<div class="icon">
 									<i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i>
 									<i v-else class="fi fi-br-check" @click="editChek('email')"></i>
-								</div> -->
+								</div>
 							</div>
 						</div>
 						<div class="content_item_user_left_detail_bottom">

From 979abe082ebb3bc9f44231329cb20ac26c720555 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 24 Sep 2025 17:56:25 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E7=BA=A2=E7=BB=BF=E5=9B=BE=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E3=80=81submit=E5=90=8E=E9=A2=9C=E8=89=B2=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue        |  2 +-
 src/component/Detail/canvas/index.vue        |  5 +-
 src/component/Detail/model/modelNav.vue      | 42 +++++++-------
 src/component/Detail/model/modelPosition.vue | 61 ++++++++++----------
 src/lang/cn.ts                               |  1 +
 src/lang/en.ts                               |  1 +
 src/store/Detail/designDetail.ts             | 15 ++++-
 src/tool/https.js                            | 32 +---------
 src/views/HomeMain.vue                       |  8 +--
 9 files changed, 76 insertions(+), 91 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index f403661b..0e4dcde1 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -298,7 +298,6 @@ export default defineComponent({
 				// 0.35822305
 				// ]	
 				let isCurrent = list[i].id == detailData?.selectDetail?.id
-				console.log(isCurrent,newData)
 				let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)?
 				(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):
 				(list[i].color?.rgba?.r?
@@ -379,6 +378,7 @@ export default defineComponent({
 				delete detailData.designDetail.newModel
 				store.commit('DesignDetail/setPraeview',value)
 				detailData.loadingShow = false
+				canvasReload()
 				// setRevocation()
 			}).catch(res=>{ 
 				detailData.loadingShow = false
diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 8ac6b936..d096b738 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -193,7 +193,7 @@ export default defineComponent({
 				let front = detailData.frontBack.front[detailData.imgDomIndex]
 				let back = detailData.frontBack.back[detailData.imgDomIndex]
 				if(!front?.oldImageUrl)front.oldImageUrl = front.imageUrl
-				if(!front?.oldMaskUrl)front.oldMaskUrl = front.imageUrl
+				if(!front?.oldMaskUrl)front.oldMaskUrl = front.maskUrl
 				if(!back?.oldImageUrl)back.oldImageUrl = back.imageUrl
 				if(!front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.oldMaskUrl})
 
@@ -218,7 +218,6 @@ export default defineComponent({
 				detailData.isShowMark = true
 			}
 			const index = detailData.designDetail.clothes.findIndex(item => item.id === detailData.selectDetail.id);
-			console.log(index,detailData.selectDetail.id)
 			await new Promise<void>((resolve, reject) => {
 				if(!detailDom?.editCanvas)return resolve()
 				let canvasJSON = detailDom?.editCanvas?.getJSON()
@@ -261,7 +260,7 @@ export default defineComponent({
 			if(front?.oldImageUrl)front.imageUrl = front.oldImageUrl
 			if(front?.oldMaskUrl)front.maskUrl = front.oldMaskUrl
 			if(back?.oldImageUrl)back.imageUrl = back.oldImageUrl
-			if(front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.oldMaskUrl})
+			if(front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.maskUrl})
 
 			sessionStorage.removeItem('frontBackEdit');
 			sessionStorage.removeItem('sketchEdit');
diff --git a/src/component/Detail/model/modelNav.vue b/src/component/Detail/model/modelNav.vue
index 00e6f753..15a611bd 100644
--- a/src/component/Detail/model/modelNav.vue
+++ b/src/component/Detail/model/modelNav.vue
@@ -74,29 +74,29 @@ export default defineComponent({
 		},{immediate:true})
 		const selectDetailItem = (item:any,index:number)=>{
 			new Promise((resolve, reject) => {
-				// if(detailData.isEditPattern.value && 
-				// 	detailData.selectDetail?.id && 
-				// 	detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0
-				// ){
-				// 	Modal.confirm({
-				// 		title: t('collectionModal.jsContent2'),
-				// 		icon: createVNode(ExclamationCircleOutlined),
-				// 		okText: 'Yes',
-				// 		cancelText: 'No',
-				// 		mask:false,
-				// 		centered:true,
-				// 		onOk() {
-				// 			resolve(true)
-				// 			emit('canvasReload')
-				// 		},
-				// 		onCancel(){
-				// 			resolve(false)
-				// 		}
-				// 	});
-				// }else{
+				if(detailData.isEditPattern.value && 
+					detailData.selectDetail?.id && 
+					detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0
+				){
+					Modal.confirm({
+						title: t('collectionModal.jsContent6'),
+						icon: createVNode(ExclamationCircleOutlined),
+						okText: 'Yes',
+						cancelText: 'No',
+						mask:false,
+						centered:true,
+						onOk() {
+							resolve(true)
+							emit('canvasReload')
+						},
+						onCancel(){
+							resolve(false)
+						}
+					});
+				}else{
 					resolve(true)
 					emit('canvasReload')
-				// }
+				}
 			}).then((rv)=>{
 				if(rv)store.commit('DesignDetail/setDesignColthes',item.id)
 			})
diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index c7edf80a..ffee0398 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -236,38 +236,41 @@ export default defineComponent({
 			// }
 		}
 		const itemMoveMousedown = async (index:any,e:any)=>{
+			if(detailData.selectDetail.id != detailData.frontBack.front[index].id)return
 			let isOpen = false
 			let isModal = false
 			await new Promise((resolve, reject) => {
-				if(
-					detailData.isEditPattern.value && 
-					selectItem.selectDetail?.id && 
-					(detailData.frontBack.front[index].id != selectItem.selectDetail.id)
-				){
-					isModal = true
-					Modal.confirm({
-						title: t('collectionModal.jsContent2'),
-						icon: createVNode(ExclamationCircleOutlined),
-						okText: 'Yes',
-						cancelText: 'No',
-						mask:false,
-						centered:true,
-						onOk() {
-							resolve(true)
-							isOpen = true
-						},
-						onCancel(){
-							resolve(false)
-							isOpen = false
-						}
-					});
-				}else{
-					if(detailData.frontBack.front[index].id != selectItem.selectDetail.id){
-						isOpen = true
-					}
-					resolve(true)
-					isModal = false
-				}
+				// if(
+				// 	detailData.isEditPattern.value && 
+				// 	selectItem.selectDetail?.id && 
+				// 	(detailData.frontBack.front[index].id != selectItem.selectDetail.id)
+				// ){
+				// 	isModal = true
+				// 	Modal.confirm({
+				// 		title: t('collectionModal.jsContent2'),
+				// 		icon: createVNode(ExclamationCircleOutlined),
+				// 		okText: 'Yes',
+				// 		cancelText: 'No',
+				// 		mask:false,
+				// 		centered:true,
+				// 		onOk() {
+				// 			resolve(true)
+				// 			isOpen = true
+				// 		},
+				// 		onCancel(){
+				// 			resolve(false)
+				// 			isOpen = false
+				// 		}
+				// 	});
+				// }else{
+				// 	if(detailData.frontBack.front[index].id != selectItem.selectDetail.id){
+				// 		isOpen = true
+				// 	}
+				// 	resolve(true)
+				// 	isModal = false
+				// }
+				resolve(true)
+				isOpen = true
 			}).then((rv)=>{
 			})
 			if(isOpen){
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 868f504b..1c196e21 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -583,6 +583,7 @@ export default {
     jsContent2: "上传的文件不会保存，是否继续? ",
     jsContent3: "您必须选择一种或多种颜色进行下一步。",
     jsContent5: "我们检测到您的({str})上的PIN数量超过了八个，这可能会导致一些已钉住的项目未被使用。您是否仍要继续？",
+    jsContent6: "画布内容没有保存，请点击预保存后继续。",
   },
   DesignDetail: {
     Details: "详情",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index ba768f27..b770ca3c 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -585,6 +585,7 @@ export default {
     jsContent2: "The uploaded files will not be saved, being sure to continue? ",
     jsContent3: "You must choose one or more colors for further process.",
     jsContent5: "We've detected that the number of pins on your ({str}) exceeds eight, which may result in some pinned items not being used. Would you like to continue anyway?",
+    jsContent6: 'The content on the canvas has not been saved. Please click "Preview" to continue.',
   },
   DesignDetail: {
     Details: "Details",
diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts
index adcd1886..dbae1ece 100644
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -74,6 +74,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 			state.frontBack.back = back
         },
 		updataDetailItem(state,data){
+			console.log(data)
 			state.designDetail.clothes.forEach((item:any) => {
 				if(item.id == state.selectDetail.id){
 					for (const key in data) {
@@ -230,7 +231,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 										left:item.layersObject[i].position?.[1] * scale + 'px',
 										width:item.layersObject[i].imageSize?.[0] * scale + 'px',
 										height:item.layersObject[i].imageSize?.[1] * scale + 'px',
-										zIndex:v?.style?.zIndex?v.style.zIndex:state.frontBack.front.length
+										zIndex:v?.style?.zIndex?v.style.zIndex:v.priority?v.priority:state.frontBack.front.length
 									}
 									item.layersObject[i].centers={
 										left:0,
@@ -256,7 +257,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 				})
 				if(state.currentDetailType != 'models'){
 					state.selectDetail.change = item.change
-					if(state.selectDetail?.newDetail?.color){
+					if(state.selectDetail?.newDetail?.color && currentType != 'color'){
 						state.selectDetail.color = state.selectDetail?.newDetail?.color
 						state.selectDetail.newDetail.color = null
 					}
@@ -273,12 +274,20 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 					state.selectDetail.printObject = item.printObject
 					state.selectDetail.trims = item.trims
 					state.selectDetail.type = item.type
+					state.selectDetail.color = {
+						...item.color,
+						rgba:{
+							r:item.color?.r,
+							g:item.color?.g,
+							b:item.color?.b,
+						}
+					}
 					state.selectDetail.undividedLayer = item.undividedLayer
 					if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){
 						state.designDetail.clothes.push(state.selectDetail)
 					}
 					state.selectDetail.id = item.id
-					if(currentType)if(state.selectDetail.newDetail?.[currentType])delete state.selectDetail.newDetail[currentType]
+					if(currentType)if(state.selectDetail.newDetail?.[currentType] && currentType != 'color')delete state.selectDetail.newDetail[currentType]
 				}
 			}
 			if(value.fun)value.fun()
diff --git a/src/tool/https.js b/src/tool/https.js
index b20e8b98..139c3b9a 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -38,19 +38,7 @@ const CancelToken = axios.CancelToken;
 const source = CancelToken.source();
 // console.log(import.meta.env.VITE_APP_BASE_URL);
 let isLoginTime = false
-const filterHttpsUrl = [
-	// '/api/portfolio/page',
-	'/api/account/resetPwd',
-	'/api/portfolio/detail',
-	'/api/account/preLogin',
-	'/api/account/designWorksRegister',
-	'/api/account/schoolLogin',
-	'/api/account/enterpriseLogin',
-	'/api/account/login',
-	'/api/account/organizationNameSearch',
-	'/api/account/designWorksRegisterCode',
-	'/api/third/party/parseWeChatCode',
-	'/api/account/sendEmail']
+
 //POST传参序列化(添加请求拦截器)
 axios.interceptors.request.use((config) => {
     //在发送请求之前做某件事
@@ -63,23 +51,7 @@ axios.interceptors.request.use((config) => {
         // config.data = JSON.stringify(config.data);
     }
     // config.headers.Authorization = 'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA'; 
-	if(filterHttpsUrl.indexOf(config.url) == -1){
-		if (!getCookie('token')) {
-			console.log('无Token，取消请求');
-			if(!isLoginTime){
-				isLoginTime = true
-				router.replace('/')
-				message.warning('Please login and try again~')
-				setTimeout(()=>[
-					isLoginTime = false
-				],2000)
-			}
-			return Promise.reject(new Error('缺少Token，请求被拦截')); // 阻止请求
-		}
-		config.headers.Authorization = getCookie('token'); 
-	}else{
-		config.headers.Authorization = '';
-	}
+	config.headers.Authorization = getCookie('token'); 
     return config;
 },(error) =>{
     return Promise.reject(error);
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 3588b64a..7395fc87 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -398,10 +398,10 @@ export default defineComponent({
 							homeMainData.openType = Object.keys(query)[0]
 							homeMainData.openTypeChild = query[Object.keys(query)[0]]
 						}
-						if((query?.id || query?.history) && !await getIdExistToHistory()){
-							router.push('/home')
-							return
-						}
+						// if((query?.id || query?.history) && !await getIdExistToHistory()){
+						// 	router.push('/home')
+						// 	return
+						// }
 					}else{
 						homeMainData.openType = ''
 						homeMainData.openTypeChild = ''

From fa4e0b0f1a4a6d26fccf92f13a48a298639ce2cc Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 24 Sep 2025 17:58:40 +0800
Subject: [PATCH 06/12] fix

---
 src/component/Detail/model/modelNav.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/component/Detail/model/modelNav.vue b/src/component/Detail/model/modelNav.vue
index 15a611bd..a1076188 100644
--- a/src/component/Detail/model/modelNav.vue
+++ b/src/component/Detail/model/modelNav.vue
@@ -95,7 +95,9 @@ export default defineComponent({
 					});
 				}else{
 					resolve(true)
-					emit('canvasReload')
+					if(detailData.selectDetail.id !== item.id){
+						emit('canvasReload')
+					}
 				}
 			}).then((rv)=>{
 				if(rv)store.commit('DesignDetail/setDesignColthes',item.id)

From 9ac3152b6c65d75b533375dc24d94d1145c556e2 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 24 Sep 2025 18:00:26 +0800
Subject: [PATCH 07/12] fix

---
 src/views/HomeMain.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 7395fc87..3588b64a 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -398,10 +398,10 @@ export default defineComponent({
 							homeMainData.openType = Object.keys(query)[0]
 							homeMainData.openTypeChild = query[Object.keys(query)[0]]
 						}
-						// if((query?.id || query?.history) && !await getIdExistToHistory()){
-						// 	router.push('/home')
-						// 	return
-						// }
+						if((query?.id || query?.history) && !await getIdExistToHistory()){
+							router.push('/home')
+							return
+						}
 					}else{
 						homeMainData.openType = ''
 						homeMainData.openTypeChild = ''

From 564b75de61c6e5e4e662b48deeac4395bf1dd3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Thu, 25 Sep 2025 13:52:05 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=9B=BE=E7=89=87=E5=AF=BC=E5=87=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=88=86=E8=BE=A8=E7=8E=87=E4=B8=8D=E4=B8=80=E5=80=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               | 12 -----
 src/component/Canvas/CanvasEditor/index.vue   | 22 +++++++++
 .../CanvasEditor/managers/CanvasManager.js    |  1 +
 .../CanvasEditor/managers/ExportManager.js    | 49 +++++++++++++++----
 .../CanvasEditor/utils/selectionToImage.js    | 16 +++++-
 .../tools/deReconstruction/canvas/index.vue   | 16 +++---
 src/component/modules/generalMiniCanvas.vue   | 18 ++++---
 7 files changed, 98 insertions(+), 36 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 1c57248a..b2d38451 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,31 +9,19 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ABadge: typeof import('ant-design-vue/es')['Badge']
-    ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
-    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
-    AImage: typeof import('ant-design-vue/es')['Image']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
-    AMenu: typeof import('ant-design-vue/es')['Menu']
-    AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
-    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopover: typeof import('ant-design-vue/es')['Popover']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASlider: typeof import('ant-design-vue/es')['Slider']
-    ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
-    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
-    ATabPane: typeof import('ant-design-vue/es')['TabPane']
-    ATabs: typeof import('ant-design-vue/es')['Tabs']
-    ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
     AUpload: typeof import('ant-design-vue/es')['Upload']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 7247885a..0e4b7844 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -456,6 +456,13 @@ onMounted(async () => {
   // 使用window的resize事件代替ResizeObserver
   // 只有当窗口大小变化时才更新画布尺寸
   //   window.addEventListener("resize", handleWindowResize);
+	if(props.config.initZoom) {
+		const width  = canvasManager.width;
+		const height  = canvasManager.height;
+		const cwidth = props.config.width;
+		const cheight = props.config.height;
+		setZoom(Math.min(width/cwidth,height/cheight)); // 设置画布缩放
+	}
 });
 
 watchEffect(() => {
@@ -521,6 +528,19 @@ function resetZoom() {
   canvasManager.resetZoom();
 }
 
+function setZoom(zoom) {
+	setTimeout(()=>{
+  if (!canvasManager) return;
+  const newZoom = Math.max(zoom / 1.1, 0.1); // 减少10%，最小0.1倍
+  // 使用画布中心作为缩放点
+  const centerPoint = {
+    x: canvasManager.canvas.width / 2,
+    y: canvasManager.canvas.height / 2,
+  };
+  canvasManager.animateZoom(centerPoint, newZoom);
+	})
+}
+
 function zoomIn() {
   if (!canvasManager) return;
 
@@ -882,6 +902,7 @@ defineExpose({
     layerId = "", // 导出具体图层ID
     layerIdArray = [], // 导出多个图层ID数组
     expPicType = "png", // 导出图片类型  JPG 或 PNG ,SVG
+		isEnhanceImg, // 是否是增强图片
   } = {}) => {
     return canvasManager.exportImage({
       isContainBg,
@@ -890,6 +911,7 @@ defineExpose({
       layerId,
       layerIdArray,
       expPicType,
+			isEnhanceImg,
     });
   },
   /**
diff --git a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
index 6c4083da..a0abed05 100644
--- a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
@@ -811,6 +811,7 @@ export class CanvasManager {
    * @param {Array} options.layerIdArray 导出多个图层ID数组
    * @param {String} options.expPicType 导出图片类型 (png/jpg/svg)
    * @param {Boolean} options.restoreOpacityInRedGreen 红绿图模式下是否恢复透明度为1
+	 * @param {Boolean} options.isEnhanceImg 是否是增强图片
    * @returns {String} 导出的图片数据URL
    */
   async exportImage(options = {}) {
diff --git a/src/component/Canvas/CanvasEditor/managers/ExportManager.js b/src/component/Canvas/CanvasEditor/managers/ExportManager.js
index 41d1007d..0b474d05 100644
--- a/src/component/Canvas/CanvasEditor/managers/ExportManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/ExportManager.js
@@ -18,10 +18,12 @@ export class ExportManager {
    * @param {Object} options 导出选项
    * @param {Boolean} options.isContainBg 是否包含背景图层
    * @param {Boolean} options.isContainFixed 是否包含固定图层
+	 * @param {Boolean} options.isCropByBg 是否使用背景大小裁剪
    * @param {String} options.layerId 导出具体图层ID
    * @param {Array} options.layerIdArray 导出多个图层ID数组
    * @param {String} options.expPicType 导出图片类型 (png/jpg/svg)
    * @param {Boolean} options.restoreOpacityInRedGreen 红绿图模式下是否恢复透明度为1
+	 * @param {Boolean} options.isEnhanceImg 是否是增强图片
    * @returns {String} 导出的图片数据URL
    */
   exportImage(options = {}) {
@@ -33,6 +35,7 @@ export class ExportManager {
       layerIdArray = [],
       expPicType = "png",
       restoreOpacityInRedGreen = true,
+			isEnhanceImg, // 是否是增强图片
     } = options;
     try {
       // 检查是否为红绿图模式
@@ -44,7 +47,8 @@ export class ExportManager {
           expPicType,
           isRedGreenMode,
           restoreOpacityInRedGreen,
-          isCropByBg
+          isCropByBg,
+					isEnhanceImg, // 是否是增强图片
         );
       }
 
@@ -57,7 +61,8 @@ export class ExportManager {
           isContainFixed,
           isRedGreenMode,
           restoreOpacityInRedGreen,
-          isCropByBg
+          isCropByBg,
+					isEnhanceImg, // 是否是增强图片
         );
       }
 
@@ -68,7 +73,8 @@ export class ExportManager {
         isContainFixed,
         isRedGreenMode,
         restoreOpacityInRedGreen,
-        isCropByBg
+        isCropByBg,
+				isEnhanceImg, // 是否是增强图片
       );
     } catch (error) {
       console.error("导出图片失败:", error);
@@ -82,6 +88,8 @@ export class ExportManager {
    * @param {String} expPicType 导出类型
    * @param {Boolean} isRedGreenMode 是否为红绿图模式
    * @param {Boolean} restoreOpacityInRedGreen 红绿图模式下是否恢复透明度为1
+	 * @param {Boolean} isCropByBg 是否使用背景大小裁剪
+	 * @param {Boolean} isEnhanceImg 是否是增强图片
    * @returns {String} 图片数据URL
    * @private
    */
@@ -89,7 +97,9 @@ export class ExportManager {
     layerId,
     expPicType,
     isRedGreenMode,
-    restoreOpacityInRedGreen
+    restoreOpacityInRedGreen,
+		isCropByBg, // 是否使用背景大小裁剪
+		isEnhanceImg, // 是否是增强图片
   ) {
     if (!this.layerManager) {
       throw new Error("图层管理器未初始化");
@@ -117,7 +127,9 @@ export class ExportManager {
       return this._exportWithRedGreenMode(
         objectsToExport,
         expPicType,
-        restoreOpacityInRedGreen
+        restoreOpacityInRedGreen,
+				isCropByBg, // 是否使用背景大小裁剪
+				isEnhanceImg, // 是否是增强图片
       );
     }
 
@@ -137,6 +149,8 @@ export class ExportManager {
    * @param {Boolean} isContainFixed 是否包含固定图层
    * @param {Boolean} isRedGreenMode 是否为红绿图模式
    * @param {Boolean} restoreOpacityInRedGreen 红绿图模式下是否恢复透明度为1
+	 * @param {Boolean} isCropByBg 是否使用背景大小裁剪
+	 * @param {Boolean} isEnhanceImg 是否是增强图片
    * @returns {String} 图片数据URL
    * @private
    */
@@ -147,7 +161,8 @@ export class ExportManager {
     isContainFixed,
     isRedGreenMode,
     restoreOpacityInRedGreen,
-    isCropByBg
+    isCropByBg, // 是否使用背景大小裁剪
+		isEnhanceImg, // 是否是增强图片
   ) {
     if (!this.layerManager) {
       throw new Error("图层管理器未初始化");
@@ -178,7 +193,9 @@ export class ExportManager {
     return await this._exportWithCanvasSize(
       objectsToExport,
       expPicType,
-      restoreOpacityInRedGreen
+      restoreOpacityInRedGreen,
+			isCropByBg, // 是否使用背景大小裁剪
+			isEnhanceImg, // 是否是增强图片
     );
   }
 
@@ -189,6 +206,8 @@ export class ExportManager {
    * @param {Boolean} isContainFixed 是否包含固定图层
    * @param {Boolean} isRedGreenMode 是否为红绿图模式
    * @param {Boolean} restoreOpacityInRedGreen 红绿图模式下是否恢复透明度为1
+	 * @param {Boolean} isCropByBg 是否使用背景大小裁剪
+	 * @param {Boolean} isEnhanceImg 是否是增强图片
    * @returns {String} 图片数据URL
    * @private
    */
@@ -198,7 +217,8 @@ export class ExportManager {
     isContainFixed,
     isRedGreenMode,
     restoreOpacityInRedGreen,
-    isCropByBg
+    isCropByBg, // 是否使用背景大小裁剪
+		isEnhanceImg, // 是否是增强图片
   ) {
     // 按图层顺序收集对象（从底到顶）
     const objectsToExport = this._collectObjectsByLayerOrder(
@@ -251,7 +271,9 @@ export class ExportManager {
       objectsToExport,
       expPicType,
       restoreOpacityInRedGreen,
-      canvasClipPath
+      canvasClipPath,
+			isCropByBg, // 是否使用背景大小裁剪
+			isEnhanceImg, // 是否是增强图片
     );
   }
 
@@ -603,6 +625,9 @@ export class ExportManager {
    * @param {Array} objectsToExport 要导出的对象数组
    * @param {String} expPicType 导出类型
    * @param {Boolean} restoreOpacityInRedGreen 是否恢复透明度为1
+	 * @param {Object} maskObject 裁剪对象
+	 * @param {Boolean} isCropByBg 是否使用背景大小裁剪
+	 * @param {Boolean} isEnhanceImg 是否是增强图片
    * @returns {String} 图片数据URL
    * @private
    */
@@ -610,7 +635,9 @@ export class ExportManager {
     objectsToExport,
     expPicType,
     restoreOpacityInRedGreen,
-    maskObject
+    maskObject, // 裁剪对象
+		isCropByBg, // 是否使用背景大小裁剪
+		isEnhanceImg, // 是否是增强图片
   ) {
     // 使用当前画布尺寸
     // const canvasWidth =
@@ -629,6 +656,8 @@ export class ExportManager {
       trimWhitespace: true, // 裁剪空白
       trimPadding: 0, // 裁剪边距
       restoreOpacityInRedGreen,
+			isCropByBg, // 是否使用背景大小裁剪
+			isEnhanceImg, // 是否是增强图片
     });
 
     console.log("导出图片数据URL:", dataURL);
diff --git a/src/component/Canvas/CanvasEditor/utils/selectionToImage.js b/src/component/Canvas/CanvasEditor/utils/selectionToImage.js
index 848f6916..2f518624 100644
--- a/src/component/Canvas/CanvasEditor/utils/selectionToImage.js
+++ b/src/component/Canvas/CanvasEditor/utils/selectionToImage.js
@@ -21,6 +21,7 @@ export const createRasterizedImage = async ({
   preserveOriginalQuality = true, // 是否保持原始质量（新增）
   selectionManager = null, // 选区管理器，用于获取羽化值等设置
   restoreOpacityInRedGreen, // 是否在红绿图模式下恢复透明度
+	isEnhanceImg, // 是否是增强图片
 } = {}) => {
   try {
     console.log(`📊 开始栅格化 ${fabricObjects.length} 个对象`);
@@ -41,6 +42,7 @@ export const createRasterizedImage = async ({
         clippingObject,
         isReturenDataURL,
         selectionManager, // 传递选区管理器
+				isEnhanceImg, // 是否是增强图片
       });
     }
 
@@ -81,6 +83,7 @@ const createClippedObjects = async ({
   clippingObject,
   isReturenDataURL,
   selectionManager = null, // 新增选区管理器参数
+	isEnhanceImg, // 是否是增强图片
 }) => {
   try {
     console.log("🎯 使用新的图像遮罩裁剪方法创建对象");
@@ -110,6 +113,7 @@ const createClippedObjects = async ({
         clippingObject,
         selectionBounds: optimizedBounds, // 使用优化后的边界框
         featherAmount,
+				isEnhanceImg, // 是否是增强图片
       });
     }
 
@@ -120,6 +124,7 @@ const createClippedObjects = async ({
       clippingObject,
       selectionBounds: optimizedBounds, // 使用优化后的边界框
       featherAmount,
+			isEnhanceImg, // 是否是增强图片
     });
 
     // 将DataURL转换为fabric.Image对象
@@ -173,6 +178,7 @@ const createClippedDataURLByCanvas = async ({
   clippingObject,
   selectionBounds,
   featherAmount = 0,
+  isEnhanceImg = false, // 是否是增强图片
 }) => {
   try {
     console.log("🖼️ 使用图像遮罩裁剪方法生成DataURL");
@@ -185,7 +191,9 @@ const createClippedDataURLByCanvas = async ({
 
     // 使用高分辨率以保证质量
     const pixelRatio = window.devicePixelRatio || 1;
-    const qualityMultiplier = Math.max(2, pixelRatio);
+		const qualityMultiplier = !!isEnhanceImg ? Math.max(2, pixelRatio) : 1;
+		
+		console.log("使用高分辨率以保证质量:" + isEnhanceImg, optimizedBounds);
 
     const canvasWidth = Math.ceil(optimizedBounds.width * qualityMultiplier);
     const canvasHeight = Math.ceil(optimizedBounds.height * qualityMultiplier);
@@ -455,6 +463,8 @@ const createLegacyRasterization = async ({
   quality,
   format,
   isReturenDataURL,
+	isCropByBg, // 是否根据背景裁剪
+	isEnhanceImg, // 是否是增强图片
 }) => {
   console.log("⚠️ 使用兼容的离屏渲染方法");
 
@@ -481,6 +491,8 @@ const createLegacyRasterization = async ({
     format,
     currentZoom,
     isReturenDataURL,
+		isCropByBg, // 是否根据背景裁剪
+		isEnhanceImg, // 是否是增强图片
   });
 };
 
@@ -571,6 +583,8 @@ const createOffscreenRasterization = async ({
   format,
   currentZoom,
   isReturenDataURL,
+	isCropByBg, // 是否根据背景裁剪
+	isEnhanceImg, // 是否是增强图片
 }) => {
   try {
     // 创建离屏画布，使用绝对尺寸以保证高质量
diff --git a/src/component/home/tools/deReconstruction/canvas/index.vue b/src/component/home/tools/deReconstruction/canvas/index.vue
index 0c6b8277..3e6ef56c 100644
--- a/src/component/home/tools/deReconstruction/canvas/index.vue
+++ b/src/component/home/tools/deReconstruction/canvas/index.vue
@@ -113,12 +113,16 @@ export default defineComponent({
 			return new Promise((res,rev)=>{
 				let img = new Image()
 				img.onload = ()=>{
-					let wH = [1,1]
-					let domHeight = dataDom.canvasBox.offsetHeight - 200
-					let imgHeight = img.height
-					wH = [1,domHeight/imgHeight]
-					data.canvasConfig.width = img.width * wH[1]
-					data.canvasConfig.height = domHeight
+					// let wH = [1,1]
+					// let domHeight = dataDom.canvasBox.offsetHeight - 200
+					// let imgHeight = img.height
+					// wH = [1,domHeight/imgHeight]
+					// data.canvasConfig.width = img.width * wH[1]
+					// data.canvasConfig.height = domHeight
+					data.canvasConfig.height = img.height
+					data.canvasConfig.width = img.width
+					data.canvasConfig.initZoom = true
+					
 					data.canvasLoad = true
 					res('')
 				}
diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue
index e9463578..eaf2be3d 100644
--- a/src/component/modules/generalMiniCanvas.vue
+++ b/src/component/modules/generalMiniCanvas.vue
@@ -87,7 +87,7 @@ export default defineComponent({
 				// dataDom.editCanvas.exportImage({isContainBg:props.source == 'detail',isContainFixed:true}).then((rv)=>{
 				// 	emit('submitBase64Data',rv)
 				// })
-				dataDom.editCanvas.exportImage({isContainBg:true,isContainFixed:true}).then((rv)=>{
+				dataDom.editCanvas.exportImage({isContainBg:true,isContainFixed:true,isCropByBg:true}).then((rv)=>{
 					emit('submitBase64Data',rv)
 				})
 			}
@@ -135,12 +135,16 @@ export default defineComponent({
 			if(props.imgUrl){
 				let img = new Image()
 				img.onload = ()=>{
-					let wH = [1,1]
-					let domHeight = dataDom.canvasBox.offsetHeight - 200
-					let imgHeight = img.height
-					wH = [1,domHeight/imgHeight]
-					data.canvasConfig.height = domHeight
-					data.canvasConfig.width = wH[1] * img.width
+					// let wH = [1,1]
+					// let domHeight = dataDom.canvasBox.offsetHeight - 200
+					// let imgHeight = img.height
+					// wH = [1,domHeight/imgHeight]
+					// data.canvasConfig.height = domHeight
+					// data.canvasConfig.width = wH[1] * img.width
+					data.canvasConfig.height = img.height
+					data.canvasConfig.width = img.width
+					data.canvasConfig.initZoom = true
+
 					data.canvasLoad = true
 					// setTimeout(()=>{
 					// 	canvasLoadAddImg()

From 6ba33701a570ef3dc25a0621f573d4a01a5a08a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Thu, 25 Sep 2025 14:01:49 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=9B=BE=E7=89=87=E5=AF=BC=E5=87=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=88=86=E8=BE=A8=E7=8E=87=E4=B8=8D=E5=80=BC=E4=B8=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Canvas/CanvasEditor/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 0e4b7844..aa90942e 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -461,7 +461,9 @@ onMounted(async () => {
 		const height  = canvasManager.height;
 		const cwidth = props.config.width;
 		const cheight = props.config.height;
-		setZoom(Math.min(width/cwidth,height/cheight)); // 设置画布缩放
+		let zoom = Math.min(1,width/cwidth,height/cheight);
+		if(zoom < 1) zoom -= 0.05;
+		setZoom(zoom); // 设置画布缩放
 	}
 });
 
@@ -531,7 +533,7 @@ function resetZoom() {
 function setZoom(zoom) {
 	setTimeout(()=>{
   if (!canvasManager) return;
-  const newZoom = Math.max(zoom / 1.1, 0.1); // 减少10%，最小0.1倍
+  const newZoom = Math.max(zoom, 0.1); // 减少10%，最小0.1倍
   // 使用画布中心作为缩放点
   const centerPoint = {
     x: canvasManager.canvas.width / 2,

From 4a0ddcc0af7fdfbf51ea19bf61e5b00e5a3abc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Thu, 25 Sep 2025 14:12:02 +0800
Subject: [PATCH 10/12] 111

---
 src/component/Canvas/CanvasEditor/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 359f350a..6cee3221 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -474,7 +474,9 @@ onMounted(async () => {
 		const height  = canvasManager.height;
 		const cwidth = props.config.width;
 		const cheight = props.config.height;
-		setZoom(Math.min(width/cwidth,height/cheight)); // 设置画布缩放
+		let zoom = Math.min(1,width/cwidth,height/cheight);
+		if(zoom < 1) zoom -= 0.05;
+		setZoom(zoom); // 设置画布缩放
 	}
 });
 
@@ -543,7 +545,7 @@ function resetZoom() {
 function setZoom(zoom) {
 	setTimeout(()=>{
   if (!canvasManager) return;
-  const newZoom = Math.max(zoom / 1.1, 0.1); // 减少10%，最小0.1倍
+  const newZoom = Math.max(zoom, 0.1); // 最小0.1倍
 
   // 使用画布中心作为缩放点
   const centerPoint = {

From d50f494b348bed87248e2243f1f58b65635048b8 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 25 Sep 2025 14:29:23 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE=E9=9B=86=E4=B8=AD=E5=B7=A6=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Account/frontPage/bindPage.vue  |   4 +-
 src/component/Detail/DesignDetail.vue         | 104 +++++++++---------
 src/component/Detail/model/modelPosition.vue  |   2 +-
 .../design/collection/MoodboardUpload.vue     |   2 +-
 .../design/collection/PrintboardUpload.vue    |   3 +-
 src/component/home/design/collection/more.vue |   8 ++
 src/component/home/design/index.vue           |   7 +-
 src/store/Detail/designDetail.ts              |  15 ++-
 8 files changed, 86 insertions(+), 59 deletions(-)

diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue
index 61e81949..7ec33f51 100644
--- a/src/component/Account/frontPage/bindPage.vue
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -28,7 +28,7 @@
 						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
 					</div> -->
 					<div class="gmail_btn">
-						<div v-if="!userDetail.accountExtendList?.Google" class="gallery_btn">{{ $t('frontPage.BindNow') }}</div>
+						<div v-if="!userDetail.accountExtendList?.Google" class="gallery_btn" style="pointer-events: none;">{{ $t('frontPage.BindNow') }}</div>
 						<div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div>
 						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
 						<!-- <div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div> -->
@@ -276,7 +276,7 @@ export default defineComponent({
 					> .gallery_btn{
 						position: relative;
 						z-index: 2;
-						pointer-events: none;
+						
 					}
 					#g_id_bind{
 						position: absolute;
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 0e4dcde1..f10847a4 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -167,60 +167,64 @@ export default defineComponent({
 		}
 		
 		const showDesignDetailModal = (data:any,str:any)=>{
-            // let url = Https.httpUrls.getDesignDetail + `?designItemId=${77770}&designPythonOutfitId=${77423}`
-            let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
-            detailData.loadingShow = true
-            Https.axiosGet(url).then(
-                async (rv: any) => {
-                    store.commit('DesignDetail/setDesignDetail',rv)
-					rv.clothes.forEach((item:any)=>{
-						let a
-						item.designType='Library'
-						if(item.layersObject[0].imageCategory.indexOf("back") == -1){
-							a = item.layersObject[0]
-							item.layersObject[0] = item.layersObject[1]
-							item.layersObject[1] = a
-						}
-						if(item.color){
-							item.color.rgba = {
-								r:item.color.r,
-								g:item.color.g,
-								b:item.color.b,
+			return new Promise<void>((resolve, reject) => {
+				store.commit('DesignDetail/clearDetailData')
+				// let url = Https.httpUrls.getDesignDetail + `?designItemId=${77770}&designPythonOutfitId=${77423}`
+				let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
+				detailData.loadingShow = true
+				Https.axiosGet(url).then(
+					async (rv: any) => {
+						store.commit('DesignDetail/setDesignDetail',rv)
+						rv.clothes.forEach((item:any)=>{
+							let a
+							item.designType='Library'
+							if(item.layersObject[0].imageCategory.indexOf("back") == -1){
+								a = item.layersObject[0]
+								item.layersObject[0] = item.layersObject[1]
+								item.layersObject[1] = a
 							}
-						}else{
-							item.color = {
-								// rgba:{
-								// 	r:undefined,
-								// 	g:undefined,
-								// 	b:undefined,
-								// }
+							if(item.color){
+								item.color.rgba = {
+									r:item.color.r,
+									g:item.color.g,
+									b:item.color.b,
+								}
+							}else{
+								item.color = {
+									// rgba:{
+									// 	r:undefined,
+									// 	g:undefined,
+									// 	b:undefined,
+									// }
+								}
 							}
-						}
-						if(item.gradient){
-							item.color.gradient = item.gradient
-						}
-						if(item.printObject.prints == null)item.printObject.prints = []
-						item.printObject.prints.forEach((element:any) => {
-							if(!element.designType){
-								element.designType = 'Library'
+							if(item.gradient){
+								item.color.gradient = item.gradient
 							}
-						});
-					})
-					detailData.singleOveral.value = rv.singleOverall
-					detailData.designDetailShow = true
-					// this.deleteShow = false
-					initialize()
-					setRevocation()
-                    detailData.loadingShow = false
-					if(rv.singleOverall == "single"){
-						store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
+							if(item.printObject.prints == null)item.printObject.prints = []
+							item.printObject.prints.forEach((element:any) => {
+								if(!element.designType){
+									element.designType = 'Library'
+								}
+							});
+						})
+						detailData.singleOveral.value = rv.singleOverall
+						detailData.designDetailShow = true
+						// this.deleteShow = false
+						initialize()
+						setRevocation()
+						detailData.loadingShow = false
+						if(rv.singleOverall == "single"){
+							store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
+						}
+						resolve(rv)
 					}
-
-                }
-				
-            ).catch(rv=>{
-                detailData.loadingShow = false
-            })
+				).catch(rv=>{
+					detailData.loadingShow = false
+					resolve(rv)
+				})
+			})
+			
 		}
 		const initialize = ()=>{//design后初始化
 
diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index ffee0398..925bd244 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -4,7 +4,7 @@
 			<div class="designOpenrtion_print" v-for="item,index in frontBack.back" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)" :style="frontBack.front[index].style">
 				<img :style="item.imageUrl?'':'display:none;'" :src="item.imageUrl" alt="">
 			</div>
-			<img class="perview_img" @load="setPrintSize()" ref="detailBody" :src="frontBack?.body?.path" :style="'width:'+ frontBack?.body?.layersObject?.[0].imageSize?.[0] +';height:' + frontBack?.body?.layersObject?.[0].imageSize?.[0] +';'">
+			<img class="perview_img" @load="setPrintSize()" ref="detailBody" :key="designDetail.designItemId" :src="frontBack?.body?.path" :style="'width:'+ frontBack?.body?.layersObject?.[0].imageSize?.[0] +';height:' + frontBack?.body?.layersObject?.[0].imageSize?.[0] +';'">
 			<div  class="detail_modal_item_front"  v-for="item,index in frontBack.front"  @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)"  :style="item.style">
 				<img :src="item.imageUrl" alt="">
 			</div>
diff --git a/src/component/home/design/collection/MoodboardUpload.vue b/src/component/home/design/collection/MoodboardUpload.vue
index 9cafb8d4..4fbaef2b 100644
--- a/src/component/home/design/collection/MoodboardUpload.vue
+++ b/src/component/home/design/collection/MoodboardUpload.vue
@@ -339,7 +339,7 @@ export default defineComponent({
         },
 
         deleteFile(item: any) {
-			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+			if(item?.type_?.type1 == 'generate' || item?.type_?.type1 == 'material'){
 				item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:8})
 				item.state = 'delete'
 				this.store.commit("addGenerateMaterialFils", item);
diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue
index e92add64..d1d37d96 100644
--- a/src/component/home/design/collection/PrintboardUpload.vue
+++ b/src/component/home/design/collection/PrintboardUpload.vue
@@ -385,7 +385,7 @@ export default defineComponent({
         deleteFile(item:any){
             // this.fileList.splice(item, 1)
             // this.store.commit('setPrintboardFile',this.fileList)
-			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+			if(item?.type_?.type1 == 'generate' || item?.type_?.type1 == 'material'){
 				item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:16})
 				item.state = 'delete'
 				this.store.commit("addGenerateMaterialFils", item);
@@ -610,7 +610,6 @@ export default defineComponent({
                 }
                 this.fileList.push(data)
             }
-			console.log(this.fileList)
             this.store.commit('setPrintboardFile',this.fileList)
             
         },
diff --git a/src/component/home/design/collection/more.vue b/src/component/home/design/collection/more.vue
index a912c326..1c77c9ce 100644
--- a/src/component/home/design/collection/more.vue
+++ b/src/component/home/design/collection/more.vue
@@ -124,6 +124,14 @@ export default defineComponent({
 							designType:props.item.resData.designType,
 						}
 					}else{
+						rv.imgUrl = rv.url
+						rv.category = props.item.category
+						rv.categoryValue = props.item.categoryValue
+						rv.resData = {
+							id:rv.id,
+							url:rv.url,
+							designType:props.item.resData.designType,
+						}
 						props.list.unshift(rv)
 					}
 				}
diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue
index e33f809e..688ba236 100644
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -2117,13 +2117,14 @@ export default defineComponent({
 			type: string
 		) {
 			// if()
-			if(this.isMove)return
+			if(this.isMove || this.isShowMark)return
 			this.store.commit('setOpenChatStatus',false)
 			if(design.resultType != "Design"){
 				this.selectEditBtn = design
 				this.setEditDesignType(collectionList,index,design.resultType,'edit',type)
 				return
 			}
+			this.isShowMark = true
 			design.designOutfitId = design.designPythonOutfitId?design.designPythonOutfitId:design.designOutfitId
 			let data = {
 				design: design,
@@ -2134,7 +2135,9 @@ export default defineComponent({
 			this.detailDestroy = true
 			nextTick(()=>{
 				let designDetail: any = this.$refs.designDetail;
-				designDetail.showDesignDetailModal(data);
+				designDetail.showDesignDetailModal(data).then(()=>{
+					this.isShowMark = false
+				})
 			})
 		},
 
diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts
index dbae1ece..f6277607 100644
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -28,7 +28,21 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 		currentPrintElement:null,
     },
     mutations:{
+		clearDetailData(state){
+			state.designDetail = null
+			state.designPreviewData = {}
+			state.frontBack = {
+				front:[],
+				back:[],
+				body:{},
+			}
+			state.selectDetail = null
+			state.printZIndex = -1
+			state.currentDetailType = ''
+			state.currentPrintElement = null
+		},
         setDesignDetail(state,data){
+			console.log(data)
 			if(data.others.length > 0 && data.others[0].type == "Body"){
 				state.frontBack.body = data.others[0]
 			}
@@ -74,7 +88,6 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 			state.frontBack.back = back
         },
 		updataDetailItem(state,data){
-			console.log(data)
 			state.designDetail.clothes.forEach((item:any) => {
 				if(item.id == state.selectDetail.id){
 					for (const key in data) {

From 2d63a48526988d74db6151199649a14a61eca560 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 25 Sep 2025 15:36:35 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                             | 13 +++++++++++++
 src/component/Canvas/CanvasEditor/index.vue |  5 -----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index b2d38451..fb059677 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,19 +9,32 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ABadge: typeof import('ant-design-vue/es')['Badge']
+    ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
+    AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
+    ADropdown: typeof import('ant-design-vue/es')['Dropdown']
+    AImage: typeof import('ant-design-vue/es')['Image']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
+    AMenu: typeof import('ant-design-vue/es')['Menu']
+    AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopover: typeof import('ant-design-vue/es')['Popover']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASlider: typeof import('ant-design-vue/es')['Slider']
+    ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
+    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
+    ATabPane: typeof import('ant-design-vue/es')['TabPane']
+    ATabs: typeof import('ant-design-vue/es')['Tabs']
     AUpload: typeof import('ant-design-vue/es')['Upload']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 0937e2d1..39a2d0d1 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -541,10 +541,6 @@ function handleWindowResize() {
 function resetZoom() {
   canvasManager.resetZoom();
 }
-function setZoom(zoom) {
-	setTimeout(()=>{
-  if (!canvasManager) return;
-  const newZoom = Math.max(zoom, 0.1); // 最小0.1倍
 
 function setZoom(zoom) {
 	setTimeout(()=>{
@@ -555,7 +551,6 @@ function setZoom(zoom) {
     x: canvasManager.canvas.width / 2,
     y: canvasManager.canvas.height / 2,
   };
-
   canvasManager.animateZoom(centerPoint, newZoom);
 	})
 }