Merge remote-tracking branch 'origin/StableVersion' into dev_vite

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,

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>

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')}}:

src/tool/listData.js

@@ -340,12 +340,12 @@ const navTypeList = (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:{

src/views/HomeMain.vue

@@ -978,9 +978,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()
 			// //打开视频