2023-11-2-1

src/component/Detail/DesignDetail.vue

@@ -228,6 +228,11 @@ export default defineComponent({
 			handler: function(newval) {
 			}
 		},
+		designDetailShow:{
+			handler: function(newval) {
+				this.removeRevocation()
+			}
+		}
 	},
 	provide() {
 		return {
@@ -301,7 +306,6 @@ export default defineComponent({
 				DesignDetailAlter.terminate()
 				// this.designItemDetail = {}
 				this.frontBack = {}
-				this.removeRevocation()
             }else{
                 this.designShowPrview = 1;
 				this.designItemDetailUrl = {}
@@ -371,8 +375,6 @@ export default defineComponent({
 						body = item
 					}
 				});
-				console.log(body?.layersObject?.[0]?.imageUrl);
-				
 				let ratio:any = await this?.setPostition(body?.layersObject?.[0]?.imageUrl)
 				let frontIndex = 6
 				let backIndex = 3
@@ -430,6 +432,7 @@ export default defineComponent({
             }
 			this.designShowPrview = 1
             // this.showDesignDetailModal(data,str)
+            this.loadingShow = false
 		},
 		removeRevocation(){
 			sessionStorage.removeItem('oppositeRevocation')
@@ -521,10 +524,11 @@ export default defineComponent({
 			this.store.commit('setDesignPreviewData',data)
 			return data
 		},
-		setSubmit(str:any){
+		async setSubmit(str:any){
 			let setDesignItem:any = this.$refs.setDesignItem	
 			let data = this.setSubmitItem(str)
-			setDesignItem.setPreview(data)
+            this.loadingShow = true
+			await setDesignItem.setPreview(data)
 		},
 		async submit(){
 			let data = this.setSubmitItem('')
@@ -558,8 +562,6 @@ export default defineComponent({
 		async setPostition(url:any){
 			let img:any = await loadImage(url)
 			let modal_body = <HTMLImageElement>document.getElementsByClassName('detail_modal_model')[0]
-				console.log(modal_body);
-				
 			const num = modal_body?.offsetWidth / img.width;
 			function loadImage(url:any) {
 				return new Promise((resolve, reject) => {
@@ -1168,4 +1170,12 @@ export default defineComponent({
    
     
 }
+</style>
+<style lang="less">
+.design_detail_modal_component{
+	.mark_loading{
+		position: absolute;
+	}
+}
+
 </style>

src/component/Detail/DesignDetailAlter.vue

@@ -196,7 +196,7 @@
                 <div class="right_content_line right_content_line_upload">
                     <div class="upload_right_header">
 						<i class="color_edit fi fi-bs-comments" ></i>
-                        <span>{{ $t('DesignDetailAlter.AutoRecognize') }}</span>
+                        <span>{{ $t('DesignDetailAlter.UploadImage') }}</span>
                     </div>
 					<div class="upload_centetn">
 						<div class="upload_item">

src/component/Detail/DesignDetailEnd.vue

@@ -87,11 +87,11 @@
 		<div v-show="type_ == 1 || type_ == 3" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
 		<div v-if="type_ == 2 && current?.printObject?.prints?.[0]?.path != null" @click.stop="setPrint" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.Layout') }}</div>
 		<div v-else-if="type_ == 2 && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
-		<div class="mark_loading" v-show="loadingShow">
-            <a-spin size="large" />
-        </div>
+		
 	<DesignPrintOperation ref="DesignPrintOperation"></DesignPrintOperation>
-
+	</div>
+	<div class="mark_loading" v-show="loadingShow">
+		<a-spin size="large" />
 	</div>
 </template>
 <script>

src/component/Detail/DesignPrintOperation.vue

@@ -696,6 +696,9 @@ export default defineComponent({
 <style lang="less">
 .designOpenrtion_modal {
 	// max-width: 1440px;
+	.mark_loading{
+		position: absolute;
+	}
 	.ant-modal-body{
 		padding: 4rem 5rem 0rem!important;
 		// height: calc(65vh - 6.4rem);

src/component/Detail/setDesignItem.vue

@@ -31,10 +31,8 @@
 			<div @click="setPreviewData" class="subitOkPreviewBtn">OK</div>
 		</div>
 		<div class="designOpenrtion_imgMask_open" @click.stop="deleteBorder"></div>
-		<div class="mark_loading" v-show="loadingShow">
-            <a-spin size="large" />
-        </div>
 	</div>
+	
 </template>
 
 <script >
@@ -372,10 +370,9 @@ export default defineComponent({
 					item.scale = front?.imageSize?Number(((front?.style?.width.replace(/px/g,'')*ratio)/front?.imageSize[0]).toFixed(2)):1
 				}
 			})
-			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.designSingle, data).then(
                 (rv) => {
-                    this.loadingShow = false
+                    this.$parent.loadingShow = false
 					let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
 					designItemDetail.designItemUrl = rv.designItemUrl
 					designItemDetail.ifSubmit = true
@@ -392,7 +389,6 @@ export default defineComponent({
 					this.setRevocation(designItemDetail,data)
                 }
             ).catch(res=>{ 
-                this.loadingShow = false
             });
 		},
     },