From fe47f4882a7b28e4cce509e0cbccad5396fd2a27 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 4 Feb 2025 16:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue         |  2 +-
 src/component/Detail/DesignPrintOperation.vue |  1 +
 src/component/HomePage/scaleImage.vue         |  3 ++-
 src/component/WorksPage/newScaleImage.vue     | 11 ++++++++++-
 src/lang/cn.ts                                |  1 +
 src/lang/en.ts                                |  1 +
 src/views/HomeRecommend.vue                   | 15 +++++++--------
 src/views/HomeView/HomeView.vue               |  2 +-
 8 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 30ce9b85..77e87975 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -67,7 +67,7 @@
 						<!-- 全屏 --> 
 						<i class="fi fi-bs-expand-arrows-alt" @click="showDesignImgDetail(2)"></i>
 						<!-- 编辑 -->
-						<i class="fi fi-rr-edit" :title="$t('DesignDetail.editTitle')" @click="showDesignImgDetail(3)"></i>
+						<i class="fi fi-rr-edit" v-show="!body" :title="$t('DesignDetail.editTitle')" @click="showDesignImgDetail(3)"></i>
 						<i v-show="!body && !deleteShow" :title="$t('DesignDetail.DetailTitle')" class="fi fi-rr-trash" @click="deleteNav(0)"></i>
 						<i v-show="!body && deleteShow" class="fi fi-br-check" @click="deleteNav(1)"></i>
 
diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index f9cc37ef..018056a9 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -959,6 +959,7 @@ export default defineComponent({
     -ms-user-select: none; /* Internet Explorer/Edge */
 	.mark_loading{
 		position: absolute;
+		border-radius: 3rem;
 	}
 	.ant-modal-body{
 		padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index 2c7befac..dd8f9373 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -30,7 +30,8 @@
 			<div v-if="isProductimg" class="productImg_modal">
 				<div class="productImg_left">
 					<div class="productImg_content_item_title productImg_content_item_title_menu">
-						<span>{{$t('ProductImg.MagicTools')}}</span>
+						<span v-if="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage'">{{$t('ProductImg.MagicTools')}}</span>
+						<span v-if="scaleImageList[scaleImageIndex]?.resultType == 'Relight'">{{$t('ProductImg.relightingTool')}}</span>
 					</div>
 					<div class="input_border productImg_content_item_generate">
 						<div class="input_box">
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index 89ee0098..c7f17482 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -77,7 +77,8 @@
 								<span class="scaleImage_chunk_title_intro">{{scaleImageData.portfolioName}}</span>
 							</div>
 							<div v-show="scaleImageData.portfolioDes" class="scaleImage_chunk_title">
-								{{$t('newScaleImage.Describe')}}: <span>{{scaleImageData.portfolioDes}}</span>
+								<div>{{$t('newScaleImage.Describe')}}: </div>
+								<span class="content">{{scaleImageData.portfolioDes}}</span>
 							</div>
 							<div class="scaleImage_chunk_title_intro">{{scaleImageData.createDate?.split('T')[0]}} {{scaleImageData.createDate?.split('T')[1]}}</div>
 							<div class="detail_right_look_operation detail_left_right_item">
@@ -984,6 +985,14 @@ export default defineComponent({
 					justify-content: center;
 					.scaleImage_chunk_title{
 						margin-right: 1rem;
+						> div{
+							flex-shrink: 0;
+						}
+						> .content{
+							display: block;
+							overflow: auto;
+							&::-webkit-scrollbar{display: none;}
+						}
 					}
 					>div{
 						margin-bottom: .5rem;
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index aba1932e..c060c89f 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -182,6 +182,7 @@ export default {
 		SelectCollection:'选择的系列',
 		Upload:'上传',
 		MagicTools:'转换产品图工具',
+		relightingTool:'打光工具',
 		Similarity:'相似度',
 		Highlight:'高亮',
 		RelightDirection:'打光方向',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index de90aebb..6991d0fb 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -185,6 +185,7 @@ export default {
 		Highlight:'Highlight',
 		RelightDirection:'Relight Direction',
 		MagicTools:'To Product lmage Tool',
+		relightingTool:'Relighting Tool',
 		GenerateProduct:'Generate Product',
 		SelectedProduct:'Selected Product',
 		Export:'Export',
diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue
index fe58850c..e68b83f1 100644
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -375,18 +375,17 @@ export default defineComponent({
 				// top: 10rem;
 				// right: calc(20rem + var(--margin));
 				right: 0;
-				top: 0;
-				top: 10rem;
+				top: 14rem;
 			}
 			.content_body_img2{
-				top: calc(42rem + var(--margin));
+				top: calc(45rem + var(--margin));
 				width: 15rem;
 				height: 30rem;
 				object-fit: cover;
 				right: calc(41rem + var(--margin));
 			}
 			.content_body_img3{
-				top: calc(37rem + var(--margin));
+				top: calc(40rem + var(--margin));
 				width: 15rem;
 				height: 30rem;
 				object-fit: cover;
@@ -396,7 +395,7 @@ export default defineComponent({
 				width: 30rem;
 				height: 25rem;
 				object-fit: cover;
-				top: calc(10rem);
+				top: calc(13rem);
 				right: calc(25rem + var(--margin));
 			}
 			.content_body_img5{
@@ -414,7 +413,7 @@ export default defineComponent({
 				height: 55rem;
 				object-fit: cover;
 				left: 0;
-				top: 10rem;
+				top: 14rem;
 				// top: 5rem;
 				// left: calc(20rem + var(--margin));
 			}
@@ -429,14 +428,14 @@ export default defineComponent({
 				width: 22rem;
 				height: 30rem;
 				object-fit: cover;
-				top: calc(37rem + var(--margin));
+				top: calc(40rem + var(--margin));
 				left: calc(27rem + var(--margin));
 			}
 			.content_body_img4{
 				width: 15rem;
 				height: 18rem;
 				object-fit: cover;
-				top: calc(50rem + var(--margin));
+				top: calc(53rem + var(--margin));
 				left: calc(45rem + var(--margin));
 			}
 			.content_body_img5{
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index b04619d1..a12acd7a 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -85,7 +85,7 @@
 										</a-slider>
 									<div class="text">Big</div>
 								</div>
-								<div v-show="designCollectionId" class="gallery_btn Guide_1_31" style="margin-left: auto" @click="exportModel()">
+								<div v-show="designCollectionId && userGroupId" class="gallery_btn Guide_1_31" style="margin-left: auto" @click="exportModel()">
 									<!-- {{ $t('HomeView.Export') }} -->
 									{{$t('HomeView.FinalizeCollection')}}
 								</div>