From 467d816bcdec7f15de982717a45b69669dec40ad Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 16 Sep 2025 18:36:52 +0800
Subject: [PATCH 1/6] =?UTF-8?q?detail=E7=BC=96=E8=BE=91=E7=BA=A2=E7=BB=BF?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E5=BA=95=E5=9B=BE=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/canvas/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 875d8d6b..8ac6b936 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -35,7 +35,7 @@
 						</editFrontBack> -->
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
 							:enabledRedGreenMode="true"
-							:clothingImageUrl="selectDetail.undividedLayer || selectDetail.path" 
+							:clothingImageUrl="selectDetail.path" 
 							:redGreenImageUrl="frontBack.front[imgDomIndex].maskUrl"
 							@trigger-red-green-mouseup="frontBackChange"
 							:clothing-image-opts="{

From d91b1c330eaf042996ca0dce5fbf00f2c3c5daaa Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 16 Sep 2025 18:44:42 +0800
Subject: [PATCH 2/6] FIX

---
 src/component/Detail/canvas/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 8ac6b936..875d8d6b 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -35,7 +35,7 @@
 						</editFrontBack> -->
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
 							:enabledRedGreenMode="true"
-							:clothingImageUrl="selectDetail.path" 
+							:clothingImageUrl="selectDetail.undividedLayer || selectDetail.path" 
 							:redGreenImageUrl="frontBack.front[imgDomIndex].maskUrl"
 							@trigger-red-green-mouseup="frontBackChange"
 							:clothing-image-opts="{

From d90a61795cc1f6827c9b7eea06b103cfac1a3947 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 17 Sep 2025 11:24:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8C=87=E5=BC=95=E7=9A=84=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 69f3782e..3588b64a 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -961,9 +961,9 @@ export default defineComponent({
 			let url = 'https://aida-user-manual-chinese.super.site/'
 			if(this.locale == 'ENGLISH'){
 				url = 'https://code-create.com.hk/wp-content/uploads/2025/02/aida_3.0-Manual-2_5-EN.pdf'
-				showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mov'})
+				showViewVideo({url:'https://aida.com.hk/video/AiDA_3_1_Demo_V2_EN.mp4'})
 			}else{
-				showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0_cn.mov'})
+				showViewVideo({url:'https://aida.com.hk/video/AiDA_3_1_Demo_V2_CN.mp4'})
 			}
 			this.toUserManual()
 			// //打开视频

From cb4511ede13dc506f4b9e6d20979d8fe505f0409 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 17 Sep 2025 12:28:50 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/scaleVideo.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/component/HomePage/scaleVideo.vue b/src/component/HomePage/scaleVideo.vue
index 6370db03..27770df1 100644
--- a/src/component/HomePage/scaleVideo.vue
+++ b/src/component/HomePage/scaleVideo.vue
@@ -4,9 +4,9 @@
 			<div class="general_video_btn" @click="clearVideo">
 				<i class="fi fi-rr-cross-small"></i>
 			</div>
-			<video ref="video" controls>
-				<source :src="url" type="video/webm">
-				Your browser does not support the video tag or the file format of this video.
+			<video ref="video" controls :src="url">
+				<!-- <source :src="url" type="video/webm">
+				Your browser does not support the video tag or the file format of this video. -->
 			</video>
 		</div>
 	</div>

From ce224616e68b4c81072a6a057a6b0aceda0b0eb3 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 17 Sep 2025 16:39:40 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=20mask=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index e81ff67e..fed0013e 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -301,8 +301,9 @@ export default defineComponent({
 				let color = (detailData.currentDetailType == 'color' && isCurrent && newData?.rgba?.r)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'')
 				if(detailData.currentDetailType == 'sketch' && newData){
 					color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
+					detailData.selectDetail.maskUrl = ''
+					detailData.selectDetail.maskMinioUrl = ''
 				}
-				console.log(list[i])
 				let data:any = {
 					changed:false,
 					color,

From 6f77d3d4b1e6161c74be4f0f85e5d359fea62703 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 18 Sep 2025 11:03:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89brandDNA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/home/newProject/workspace.vue |  4 ++--
 src/tool/listData.js                        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue
index 2e19c50b..d20eccf9 100644
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -41,7 +41,7 @@
 				<div class="center">{{ selectObject?.styleName?selectObject?.styleName:'All' }}</div>
 				<div class="gallery_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
 			</div>
-			<div class="style brand marginBottom">
+			<!-- <div class="style brand marginBottom">
 				<div class="text">{{$t('Habit.Brand')}}:</div>
 				<div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div>
 			</div>
@@ -56,7 +56,7 @@
 					:tip-formatter="formatterBrandDNA"
 				>
                 </a-slider>
-			</div>
+			</div> -->
 			<div class="position marginBottom" v-show="show.position" v-if="httpWorkflowType == 'SINGLE_DESIGN'">
 				<div class="text">
 					{{$t('Habit.Category')}}:
diff --git a/src/tool/listData.js b/src/tool/listData.js
index 31c0bcde..56477289 100644
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -340,12 +340,12 @@ const openTypeList = (t)=>{
 					value:'Models',
 					router:'library=Models'
 				},
-				{
-					icon:'fi-ss-gem',
-					label:t('LibraryPage.brandDNA'),
-					value:'MyBrand',
-					router:'library=MyBrand'
-				},
+				// {
+				// 	icon:'fi-ss-gem',
+				// 	label:t('LibraryPage.brandDNA'),
+				// 	value:'MyBrand',
+				// 	router:'library=MyBrand'
+				// },
 			]
 		},
 		history:{