调整部分bug和文案

.env.dev

@@ -9,4 +9,4 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # 佩佩
 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
 # 海波
-VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
+# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

src/component/HomePage/ExportModel.vue

@@ -1178,7 +1178,7 @@ export default defineComponent({
 				setText()
 				JSchangeType(canvas,'init')
 			}else if(str){
-				// canvas.forEachObject((obj) =>obj.selectable = false);
+				canvas.forEachObject((obj) =>obj.selectable = false);
 				canvas.isDrawingMode = false
 			}
 		}
@@ -1464,7 +1464,8 @@ export default defineComponent({
 		let setPencilColor = ()=>{//切换颜色给铅笔设置颜色
 			clearTimeout(setTimeOut.color)
 			setTimeOut.color = setTimeout(()=>{
-				if(createText){
+				console.log(createText);
+				if(createText.set){
 					setFontFamily()
 					return
 				}
@@ -1660,6 +1661,7 @@ export default defineComponent({
 				}else if(operation.value){
 					createPatterningIs = false
 					clearPatterning()//临时图形置为空并且添加撤回对象里面
+					canvas.renderAll();
 					setOperation('move')
 				}
 			}

src/component/HomePage/Generate.vue

@@ -840,6 +840,7 @@ export default defineComponent({
 				border-radius: calc(1rem*1.2);
 				img {
 					transform: scale(0.9);
+					object-fit: contain;
 				}
 				.delete_like_file_block{
 					pointer-events:none;

src/component/HomePage/Material.vue

@@ -584,7 +584,7 @@ export default defineComponent({
 				cursor: pointer;
 				padding: 0;
 				img{
-					object-fit: cover;
+					object-fit: contain;
 					width: 100%;
 					height: 100%;
 				}

src/component/HomePage/productImg.vue

@@ -729,7 +729,7 @@ export default defineComponent({
 	}
 	.productImg_content_item_title{
 		font-weight: 600;
-		font-size: 1.8rem;
+		font-size: 1.6rem;
 		margin-bottom: 1rem;
 		&.productImg_content_item_title_menu{
 			display: flex;
@@ -757,7 +757,7 @@ export default defineComponent({
 			display: flex;
 			margin-right: 1rem;
 			position: relative;
-			height: 12rem;
+			height: 14rem;
 			img{
 				width: 100%;
 				cursor: pointer;
@@ -806,9 +806,10 @@ export default defineComponent({
 		.upload_file_item{
 			display: flex;
 			margin-right: 1rem;
-			width: auto;
+			width: auto !important;
-			border: none;
+			height: 14rem !important;
-			margin-bottom: 0;
+			border: none !important;
+			margin-bottom: 0 !important;
 			&.upload_file_item:last-child{
 				margin-right: 0rem;
 			}
@@ -816,7 +817,7 @@ export default defineComponent({
 		// width: 45%;
 		.productImg_content_item_imgBox{
 			.content_item_imgBox_itemImg{
-				width: 5rem;
+				width: 7rem;
 				flex-shrink: 0;
 			}
 		}

src/component/HomePage/scaleImage.vue

@@ -48,7 +48,7 @@
 					<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage'" class="productImg_content_item_title productImg_content_item_title_similarity">
 						<span>{{$t('ProductImg.Similarity')}}</span>
 					</div>
-					<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage'" class="productImg_content_item_similarity">
+					<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage'" class="productImg_content_item_similarity ">
 						<a-slider class="system_silder"
 							v-model:value="productimgSimilarity"
 							:tooltipVisible="false"
@@ -390,6 +390,9 @@ export default defineComponent({
 				.productImg_content_item_generate_btn{
 					transform: translateY(100%);
 				}
+				.productImg_content_item_similarity{
+					padding-bottom: 2.4rem;
+				}
 			}
 		}
 		.scaleImage_content_imgBox{
@@ -402,7 +405,8 @@ export default defineComponent({
 			&.active{
 				display: flex;
 				img{
-					width: 50%;
+					// width: 50%;
+					height: 100%;
 					object-fit: contain;
 				}
 			}

src/lang/cn.ts

@@ -146,7 +146,7 @@ export default {
 		Finalize:'完成',
 		SelectCollection:'选择的系列',
 		Upload:'上传',
-		MagicTools:'魔法工具',
+		MagicTools:'转换产品图工具',
 		Similarity:'相似度',
 		RelightDirection:'打光方向',
 		GenerateProduct:'生成的产品',

src/lang/en.ts

@@ -149,7 +149,7 @@ export default {
 		Upload:'Upload',
 		Similarity:'Similarity',
 		RelightDirection:'Relight Direction',
-		MagicTools:'Magic Tools',
+		MagicTools:'To Product lmage Tool',
 		GenerateProduct:'Generate Product',
 		SelectedProduct:'Selected Product',
 		Export:'Export',