From 6297b75d6876205fd9b7d792ea7236de08c98eb6 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 20 Dec 2023 10:01:39 +0800
Subject: [PATCH] fix

---
 src/component/Detail/DesignDetail.vue              | 13 ++++++++++---
 src/component/Detail/DesignPrintOperation.vue      |  8 ++++++++
 .../Detail/DesignPrintOperationMobile.vue          |  5 +++++
 src/views/trialApproval.vue                        | 14 ++++++++++----
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 7a803171..494aa2f4 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -33,11 +33,11 @@
 								<img :src="item?.path" alt="">
 								<i v-show="deleteShow" class="fi fi-br-cross" @click.stop="setDelete(index)"></i>
 							</div>
-							<div v-show="designItemDetailNum < 5" class="detail_modal_body_Set" @click="setClothesOpen()">
+							<div v-show="designItemDetailNum < 5 && !body" class="detail_modal_body_Set" @click="setClothesOpen()">
 								+
 							</div>
 						</div>
-						<div class="detail_modal_model_content">
+						<div class="detail_modal_model_content" :class="{active:body}">
 							<div class="detail_modal_item_back" :class="{active:body}" v-for="item,index in frontBack.back" :style="item.style">
 								<img :src="item.imageUrl" alt="">
 							</div>
@@ -1062,6 +1062,9 @@ export default defineComponent({
 						width: auto;
 						max-height: 100%;
 					}
+					&.active{
+						width: 100%;
+					}
 					.detail_modal_item_front,.detail_modal_item_back{
 						cursor: pointer;
 						position: absolute;
@@ -1073,14 +1076,18 @@ export default defineComponent({
 						&.active{
 							top: 50%;
 							left: 50%;
+							width: 100%;
 							transform: translate(-50%,-50%);
+							img{
+								width: 100%;
+							}
 						}
 					}
 					.detail_modal_item_back{
 						z-index: 1 !important;
 					}
 					.detail_modal_item_front{
-
+						z-index: 2;
 					}
 				}
 				
diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index c4202290..1a5f778e 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -662,13 +662,16 @@ export default defineComponent({
 					designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
 					designItemDetail.clothes[index].printObject.prints = this.computeZindex()
 					designItemDetail.ifSubmit = true
+					console.log(rv,index);
 					designItemDetail.clothes.forEach((item,i)=>{
 						let a
+					console.log(1);
 						if(item.layersObject[0].imageCategory.indexOf("back") == -1){
 							a = item.layersObject[0]
 							item.layersObject[0] = item.layersObject[1]
 							item.layersObject[1] = a
 						}
+					console.log(2);
 						item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id
 						item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id
 					})
@@ -787,10 +790,15 @@ export default defineComponent({
 			left: auto;
 			top: 50%;
 			transform: translateY(-50%);
+			max-height: 50rem;
+			max-width: 30rem;
 			.designOpenrtion_entirety_img{
 				height: 100%;
 				img{
 					height: 100%;
+					max-width: 100%;
+					max-height: 100%;
+					object-fit: contain;
 				}
 			}
 		}
diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue
index 614ec67e..225c74e4 100644
--- a/src/component/Detail/DesignPrintOperationMobile.vue
+++ b/src/component/Detail/DesignPrintOperationMobile.vue
@@ -779,10 +779,15 @@ export default defineComponent({
 			left: auto;
 			top: 50%;
 			transform: translateY(-50%);
+			max-height: 50rem;
+			max-width: 30rem;
 			.designOpenrtion_entirety_img{
 				height: 100%;
 				img{
 					height: 100%;
+					max-width: 100%;
+					max-height: 100%;
+					object-fit: contain;
 				}
 			}
 		}
diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue
index dbff7de3..030c4daa 100644
--- a/src/views/trialApproval.vue
+++ b/src/views/trialApproval.vue
@@ -164,11 +164,11 @@ export default defineComponent({
 					   customRender: (record: any) => {
                         let str
 						if(record.value == 0){
-							str ='unprocessed'
+							str ='pending'
 						}else if(record.value == 1){
 							str ='pending'
 						}else if(record.value == 2){
-							str ='rejected'
+							str ='reject'
 						}
                         return str;
                     },
@@ -325,7 +325,9 @@ export default defineComponent({
             );
         },
 		setConsent(record: any, index: number){
-			console.log(record);
+			const formData = new FormData()
+			formData.append('ids',record.id)
+			let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
 			return
 			Https.axiosPost(Https.httpUrls.trialOrderApproval, {ids:record.id}).then(
 				(rv: any) => {
@@ -334,8 +336,12 @@ export default defineComponent({
 			);
 		},
 		setRefuse(record: any, index: number){
-			Https.axiosPost(Https.httpUrls.trialOrderRefuse, {ids:record.id}).then(
+			const formData = new FormData()
+			formData.append('ids',record.id)
+			let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
+			Https.axiosPost(Https.httpUrls.trialOrderRefuse, formData,config).then(
 				(rv: any) => {
+					this.gettrialList();
 					message.success('拒绝成功~')
 				}
 			);