Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/home/design/collection.vue

@@ -285,6 +285,7 @@ export default defineComponent({
 					cursor: pointer;
 					display: flex;
 					height: 100%;
+					font-size: 1.8rem;
 				}
 				.fi::before{
 					padding: 5px;

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/component/home/tools/poseTransfer/index.vue

@@ -408,9 +408,14 @@ export default defineComponent({
 				if(res.errCode == 0){
 					file.imgUrl = res.data.url;
 					file.id = res.data.id
-					data.fileList.forEach((listItem:any)=>listItem.isChecked = false)
 					data.currentList.forEach((listItem:any)=>listItem.isChecked = false)
-					file.isChecked = true
+					data.fileList.forEach((listItem:any)=>{
+						if(listItem.id == file.id){
+							listItem.isChecked = true
+						}else{
+							listItem.isChecked = false
+						}
+					})
 					file.type = 'ProductElement'
 					// if(props.productimgMenu.value == 'Relight'){
 					// 	file.type = "ToProductImage"
@@ -548,6 +553,13 @@ export default defineComponent({
 		watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{
 			if(props.isDesignPage)return
 			data.fileList = store.state.HomeStoreModule.uploadElement
+			data.fileList.forEach((listItem:any)=>{
+				if(listItem.id == data.selectImg.id){
+					listItem.isChecked = true
+				}else{
+					listItem.isChecked = false
+				}
+			})
 		})
 		watch(()=>data.noLikeList.length,(newVal,oldVal)=>{
 			nextTick(()=>{