Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/Detail/detailLeft/colorBox/index.vue

@@ -16,14 +16,14 @@
 			</div>
 		</div>
 		<div class="detailText">{{$t('DesignPrintOperation.Colorfromimage')}}</div>
-		<div class="uploadImage flex flex-align-center flex-justify-around">
-			<div class="upload-container flex flex-column flex-align-center" :class="{'hide': !showLibrary}">
+		<div class="uploadImage flex flex-align-center flex-justify-center">
+			<div class="upload-container" :class="{'hide': !showLibrary}">
 				<upload ref="uploadRef" @selectUplpadColor="selectUplpadColor" @selectFile="showLibrary = false"  @deleteColor="showLibrary = true"></upload>
 				<div class="upload-text" v-show="showLibrary"> {{ $t('LibraryPage.Upload') }} </div>
 			</div>
-			<div class="upload-container flex flex-column flex-align-center"  v-show="showLibrary">
+			<div class="upload-container "  v-show="showLibrary">
 				<!-- <i class="fi fi-rr-followcollection"></i> -->
-				  <SvgIcon name="CLibrary" size="40" @click="handleOpenLibrary" />
+				  <SvgIcon name="CLibrary" class="svg-btn" size="20" @click="handleOpenLibrary" />
 				<div class="upload-text"> {{ $t('LibraryPage.library') }} </div>
 			</div>
 		</div>
@@ -268,9 +268,7 @@ export default defineComponent({
 			selectImages.value.init()
 		}
 		const handleImageSelect = (item:any)=>{
-			console.log('item',item)
 			UrlToFile(item.url,item.name).then((file:any)=>{
-				console.log('file',file)
 				// 构造符合 fileUploadChange 期望的数据结构
 				const fileData = {
 					file: {
@@ -280,7 +278,6 @@ export default defineComponent({
 				}
 				uploadRef.value.fileUploadChange(fileData)
 			})
-			// uploadRef.value.selectColor(item)
 		}
 		const handleShowListChange=(val:boolean)=>{
 			console.log('val',val)
@@ -451,12 +448,17 @@ export default defineComponent({
 			height: 10rem;
 			width: 100%;
 			border-radius: .5rem;
+			column-gap: 2rem;
 			.upload-container{
+				display: flex;
+				flex-direction: column;
+				justify-content: space-evenly;
+				align-items: center;
 				background-color: #EDEDED;
-				padding: 1rem 2rem;
 				border-radius: 1rem;
-				width: 8rem;
-				height: 8rem;
+				width: 7rem;
+				height: 7rem;
+				// row-gap: 1rem;
 				&.hide{
 					width: initial;
 					height: initial;
@@ -466,6 +468,11 @@ export default defineComponent({
 					background-color: transparent;
 					padding-left: 1rem;
 				}
+				.svg-btn{
+					cursor: pointer;
+					width: initial;
+					height: initial;
+				}
 				:deep(.ant-upload){
 					background: transparent;
 				}

src/component/Detail/detailLeft/colorBox/upload.vue

@@ -181,8 +181,8 @@ export default defineComponent({
 <style lang="less" scoped>
     .upload{
 		// width: 34rem;
-		width: 100%;
-		height: 100%;
+		// width: 100%;
+		// height: 100%;
 		display: flex;
 		align-items: center;
 		:deep(.ant-upload-picture-card-wrapper){
@@ -204,7 +204,7 @@ export default defineComponent({
 			}
 			.upload_tip_block{
 				i{
-					font-size: 4rem;
+					font-size: 2rem;
 					display: flex;
 				}
 			}