From c560ecb481f660d888249e6b3a01eca962cba3fa Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 5 Feb 2025 13:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/ExportModel.vue |  4 ++--
 src/component/HomePage/productImg.vue  | 27 ++++++++++++++++++--------
 src/views/HomeRecommend.vue            |  2 +-
 src/views/HomeView/history.vue         |  3 +++
 src/views/HomeView/library.vue         |  4 +++-
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index ac49c9b3..ca5b9192 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -1263,7 +1263,7 @@ export default defineComponent({
 			},
 		]
 		let canvasKeyDown = (event) => {
-			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','KeyE','KeyB','MetaLeft']
+			let keys = ['Enter','Delete','ControlLeft','ShiftLeft','BracketLeft','BracketRight','MetaLeft']
 			if(keys.indexOf(event.code) > -1){
 				event.preventDefault(); 
 			}
@@ -1327,7 +1327,7 @@ export default defineComponent({
 			}
 		}
 		let canvasKeyUp = (event) =>{
-			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','KeyE','KeyB','MetaLeft']
+			let keys = ['Enter','Delete','ControlLeft','ShiftLeft','BracketLeft','BracketRight','MetaLeft']
 			if(keys.indexOf(event.code) > -1){
 				event.preventDefault(); 
 			}
diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index cd63d987..6407e541 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -97,15 +97,12 @@
 							<input type="number" readonly v-model="brightenValue">
 						</div>
 						<div class="productImg_content_item_title">{{$t('ProductImg.SelectCollection')}}</div>
-						<div class="productImg_content_item_imgBox generalScroll" v-mousewheel>
+						<div class="productImg_content_item_imgBox generalScroll upload_item" v-mousewheel>
 							<div class="content_item_imgBox_itemImg" v-for="item,index in selectList[productimgMenu.value]" :key="item.id" >
 								<img @click="setGenerate(item)" v-lazy="item.designOutfitUrl?item.designOutfitUrl:item.url" alt="" :class="[driver__.driver?index == 0?driver__.index == 45?'Guide_img showEvents':'hideEvents':'hideEvents':'',item?.isChecked?'active':'']">
 								<a-checkbox v-model:checked="item.isChecked"></a-checkbox>
 							</div>
-						</div>
-						<div class="productImg_content_item_title">{{$t('ProductImg.Upload')}}</div>
-						<div class="productImg_content_item_imgBox generalScroll upload_item" v-mousewheel>
-							<div class="upload_file_item" v-for="(file, index) in fileList[productimgMenu.value]" :key="file">
+							<div class="content_item_imgBox_itemImg" v-for="(file, index) in fileList[productimgMenu.value]" :key="file">
 								<div class="upload_file_item_content" v-show="file?.status === 'uploading'" >
 									<a-spin
 										:indicator="indicator"
@@ -113,7 +110,7 @@
 									/>
 								</div>
 								<div
-									class="upload_file_item_content content_item_imgBox_itemImg"
+									class="content_item_imgBox_itemImg"
 									v-show="file?.status === 'done'"
 
 								>
@@ -125,7 +122,7 @@
 									</div> -->
 								</div>
 							</div>
-							<div class="upload_file_item upload_component ">
+							<div class="upload_file_item upload_component">
 							<!-- :action="uploadUrl + '/api/history/toProductImageElementUpload'" -->
 								<a-upload
 									:action="uploadUrl + '/api/history/toProductImageElementUpload'"
@@ -150,7 +147,13 @@
 									</div>
 								</a-upload>
 							</div>
+
 						</div>
+						<!-- <div class="productImg_content_item_title">{{$t('ProductImg.Upload')}}</div>
+						<div class="productImg_content_item_imgBox generalScroll upload_item" v-mousewheel>
+							
+							
+						</div> -->
 					</div>
 
 					<div class="productImg_content_item_generate_btn input_border">
@@ -860,6 +863,7 @@ methods: {
 	width: auto;
 	margin-bottom: 2rem;
 	align-items: center;
+	flex-wrap: nowrap;
 	.content_item_imgBox_itemImg{
 		display: flex;
 		margin-right: 1rem;
@@ -868,6 +872,7 @@ methods: {
 		position: relative;
 		img{
 			height: 100%;
+			width: 100%;
 			cursor: pointer;
 			object-fit: contain;
 			opacity: .5;
@@ -932,6 +937,7 @@ methods: {
 		display: flex;
 		margin-right: 1rem;
 		height: 14rem !important;
+		width: 9rem;
 		border: none !important;
 		&.upload_file_item:last-child{
 			margin-right: 0rem;
@@ -947,9 +953,14 @@ methods: {
 				object-fit: contain;
 			}
 		}
+		.upload_file_item{
+			flex-shrink: 0;
+			width: 9rem;
+		}
 	}
 	.productImg_content_item_generate{
 		--width:100%;
+		padding-bottom: 1rem;
 	}
 	.productImg_content_item_similarity{
 		display: flex;
@@ -966,7 +977,7 @@ methods: {
 		}
 	}
 	.productImg_content_item_Direction{
-		padding-bottom: calc(2rem* 1.2);
+		padding-bottom: 1rem;
 		:deep(.ant-select){
 			font-size: 1.6rem;
 			.ant-select-selector::after{
diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue
index e68b83f1..55f95899 100644
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -11,7 +11,7 @@
                 </div>
             </div>
 			<div class="homeRecommend_right">
-				<div class="gallery_btn" v-if="userDetail.systemUser == 1 && !isMoblie" @click="goHome">Home</div>
+				<div class="gallery_btn" v-if="userDetail.systemUser != -1 && !isMoblie" @click="goHome">Home</div>
 				<div class="gallery_btn white" v-if="userDetail.systemUser != -1" @click="logout">log off</div>
 			</div>
 			<div class="homeRecommend_right" v-if="userDetail.systemUser == -1">
diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue
index be4f4185..a117571c 100644
--- a/src/views/HomeView/history.vue
+++ b/src/views/HomeView/history.vue
@@ -405,6 +405,9 @@ export default defineComponent({
 	position: relative;
     .page_content {
         position: relative;
+		.el-cascader .el-input .icon-arrow-down{
+			font-size: 2.4rem;
+		}
         .page_content_body {
             position: absolute;
             width: 100%;
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 73f36c82..48594ec2 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -1763,7 +1763,9 @@ export default defineComponent({
 	}
     .page_content {
         position: relative;
-
+		.el-cascader .el-input .icon-arrow-down{
+			font-size: 2.4rem;
+		}
         .page_content_bg {
             position: absolute;
             width: 100%;