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