generate交互方式和图片放大后的

public/js/fabric.brushes.js

@@ -794,7 +794,6 @@ fabric.PenBrush = fabric.util.createClass(fabric.BaseBrush, {
 			var randomNum = Math.random() * (0.6 - 0.2) + 0.2;
 			var color = this.color.replace(/1(?=\))/, randomNum);
 			this.canvas.contextTop.strokeStyle = color;
-			console.log(color);
 
 			lineWidthDiff = (this._lineWidth - 1) * i;
 

src/assets/style/style.css

@@ -111,6 +111,22 @@ li {
   line-height: 3.3rem;
   zoom: 1;
 }
+.started_btn .fi-br-loading::before {
+  transition: all 0.5s;
+  display: inline-block;
+  animation: whirl 1s linear infinite;
+}
+@keyframes whirl {
+  0% {
+    transform: rotate(0deg);
+  }
+  50% {
+    transform: rotate(180deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
 .el-cascader {
   font-size: 1.2rem;
   width: 100%;
@@ -842,7 +858,7 @@ li {
   border-radius: 1rem;
 }
 .libraryPageCascader .cascader_btn_max {
-  height: 4rem;
+  height: 4.5rem;
   width: 100%;
   border-bottom: 1px solid #e1e1e1;
   display: flex;
@@ -850,7 +866,6 @@ li {
 }
 .libraryPageCascader .cascader_btn_max .cascader_btn1 {
   margin: 0 1rem;
-  line-height: 1.5rem;
 }
 .libraryPageCascader .ant-cascader-menu {
   margin-top: 4rem;

src/assets/style/style.less

@@ -125,6 +125,23 @@ input:focus{
 	height: 3.3rem;
 	line-height: 3.3rem;
 	zoom: 1;
+	.fi-br-loading::before{
+		transition: all .5s;
+		display: inline-block;
+		animation: whirl 1s linear infinite;
+
+	}
+	@keyframes whirl {
+		0%{
+			transform: rotate(0deg);
+		}
+		50%{
+			transform: rotate(180deg);
+		}
+		100%{
+			transform: rotate(360deg);
+		}
+	}
 }
 
 
@@ -188,7 +205,6 @@ input:focus{
 		pointer-events:none !important;
 	}
 }
-
 .Guide_{
 	pointer-events:auto !important;
 	overflow-y: initial !important;
@@ -968,14 +984,13 @@ input:focus{
 .libraryPageCascader{
 	border-radius: 1rem;
 	.cascader_btn_max{
-		height: 4rem;
+		height: 4.5rem;
 		width: 100%;
 		border-bottom: 1px solid rgb(225 225 225);
 		display: flex;
 		align-items: center;
 		.cascader_btn1{
 			margin: 0 1rem;
-			line-height: 1.5rem;
 		}
 	}
 	.ant-cascader-menu{

src/component/Detail/setDesignItem.vue

@@ -474,6 +474,7 @@ export default defineComponent({
 					this.setRevocation(designItemDetail,data)
                 }
             ).catch(res=>{ 
+				this.$parent.loadingShow = false
             });
 		},
     },

src/component/Detail/setDesignItem2.vue

@@ -245,7 +245,6 @@ export default defineComponent({
 			designShowIndex.value = index
 		}
 		let setpitch = (item,index)=>{
-			console.log(123);
 			canvas.discardActiveObject();
 			// this.designItemDetail.clothes.forEach((item)=>{
 			// 	item.clothesOpen = false

src/component/Detail/setDesignItemMobile.vue

@@ -440,6 +440,8 @@ export default defineComponent({
 					this.setRevocation(designItemDetail,data)
                 }
             ).catch(res=>{ 
+				this.$parent.loadingShow = false
+
             });
 		},
     },

src/component/HomePage/ExportNewCoolection.vue

@@ -122,8 +122,6 @@ export default defineComponent({
 	},
 	methods: {
 		dragstart (e:any, index:any) {
-			console.log(12312312312312);
-			
 			this.dragIdx = index
 			},
 			dragDrop (e:any, index:any) {

src/component/HomePage/Generate.vue

@@ -53,7 +53,13 @@
 					v-model="searchPictureName"
 					@keydown.enter="getgenerate()"
 				/>
-				<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div>
+				<!-- <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div> -->
+				<div v-show="!isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
+					{{ $t('Generate.Generate') }}
+				</div>
+				<div v-show="isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
+					<i class="fi fi-br-loading"></i>
+				</div>
 				<span ref="inputShowText"></span>
 			</div>
             
@@ -122,7 +128,7 @@
                 v-for="(item, index) in fileList"
                 :key="item.imgUrl"
                 @click="generageAdd(item)"
-                :class="[item?.checked?'active':'']"
+                :class="[item.status != 'Success'?'hideEvents':'',item?.checked?'active':'']"
             >
 				<img v-show="item.status != 'Success'" src="@/assets/images/homePage/loading.gif" alt="">
 				<img v-show="item.status == 'Success'" :src="item.imgUrl" @click.stop="generageAdd(item)">
@@ -213,6 +219,7 @@ export default defineComponent({
 		let workspace:any = ref({})
 
 		let loadingShow = ref(false)
+		let isGenerate = ref(false)//判断是否正在进行generate
 		let inputShow = ref(false)//表示是否出现红框
 		let inputTime = ref()
 		let driver__:any = inject('driver__')
@@ -246,6 +253,7 @@ export default defineComponent({
 			checkboxImage,
 			printModel,
 			loadingShow,
+			isGenerate,
 			// printBoards,
 			moodboarList,
 			// sketchCatecoryList,
@@ -476,7 +484,7 @@ export default defineComponent({
 			// 		);
 			// 	return
 			// }
-			if(this.loadingShow){
+			if(this.isGenerate){
 				return
 			}
 			// if(!this.searchPictureName){
@@ -512,7 +520,7 @@ export default defineComponent({
 				isTestUser:this.driver__.driver?false:this.isTest,
 				gender:'',
 			}
-			this.loadingShow = true
+			this.isGenerate = true
 			Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
                 (rv) => {
 					if(data.isTestUser){
@@ -520,7 +528,7 @@ export default defineComponent({
 							message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Moodboard')}));
 						}else if(rv.leftUsageCount == 0){
 							message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Moodboard')}));
-							this.loadingShow = false
+							this.isGenerate = false
 							return
 						}
 					}
@@ -536,7 +544,7 @@ export default defineComponent({
 					},10000)
                 }
             ).catch(res=>{
-				this.loadingShow = false
+				this.isGenerate = false
             });
 			// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
             //     (rv) => {
@@ -570,7 +578,7 @@ export default defineComponent({
 
 				Https.axiosPost(Https.httpUrls.generateResult, data).then(
 					(rv) => {
-						if(this.loadingShow){//防止取消后有正在执行的获取状态
+						if(this.isGenerate){//防止取消后有正在执行的获取状态
 							let arr:any = []
 							arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
 							rv.forEach((element:any) => {
@@ -595,7 +603,7 @@ export default defineComponent({
 								this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
 								clearInterval(this.generateTime)
 								clearInterval(this.remGenerateTime)
-								this.loadingShow = false
+								this.isGenerate = false
 								this.remGenerate = false
 							}
 						}
@@ -604,7 +612,7 @@ export default defineComponent({
 					this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
 					clearInterval(this.generateTime)
 					clearInterval(this.remGenerateTime)
-					this.loadingShow = false
+					this.isGenerate = false
 				});
 			},1000)
 		},
@@ -612,7 +620,7 @@ export default defineComponent({
 			let arr = this.fileList.filter((item:any)=>item.status != 'Success')
 			//取消操作
 			this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
-			this.loadingShow = false
+			this.isGenerate = false
 			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');
@@ -921,10 +929,12 @@ export default defineComponent({
 						color: red;
 					}
 				}
+				
 			}
 			&:hover .delete_like_file_block{
 				display: block;
 			}
+			
         }
         .upload_item {
             .upload_file_item {
@@ -948,6 +958,7 @@ export default defineComponent({
 						cursor:not-allowed;
 					}
 				}
+				
                 .upload_file_item_content {
                     display: flex;
                     align-items: center;

src/component/HomePage/PrintboardUpload.vue

@@ -106,7 +106,13 @@
 				<div class="input_border">
 					<div class="Guide_1_2_8 input_box" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
 						<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
-						<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
+						<!-- <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div> -->
+						<div v-show="!isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
+							{{ $t('PrintboardUpload.Generate') }}
+						</div>
+						<div v-show="isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
+							<i class="fi fi-br-loading"></i>
+						</div>
 						<span ref="inputShowText"></span>
 					</div>
 					<!-- <div>
@@ -115,7 +121,7 @@
 					</div> -->
 				</div>
 				<div class="modal_img" :style="[loadingShow?'overflow:hidden':'']">
-					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_2_9" :class="[item?.checked?'active':'',driver__.driver?'showEvents':'']" >
+					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_2_9" :class="[item.status != 'Success'?'hideEvents':'',item?.checked?'active':'',driver__.driver?'showEvents':'']" >
 						<img v-show="item.status != 'Success'" src="@/assets/images/homePage/loading.gif" alt="">
 						<img v-show="item.status == 'Success'" :src="item.imgUrl" @click.stop="generageAdd(item)">
 						<div
@@ -185,6 +191,7 @@ export default defineComponent({
 		let generateList:any = ref([
 		])
 		let loadingShow = ref(false)
+		let isGenerate = ref(false)
 		let inputShow = ref(false)
 		let inputTime = ref()
 		let driver__:any = inject('driver__')
@@ -211,6 +218,7 @@ export default defineComponent({
 			generateCheckbox,
 			generateList,
 			loadingShow,
+			isGenerate,
 			inputShow,
 			inputTime,
 			driver__,
@@ -645,7 +653,7 @@ export default defineComponent({
 			// 		);
 			// 	return
 			// }
-			if(this.loadingShow){
+			if(this.isGenerate){
 				return
 			}
 			let generage:any = this.$refs.Generate
@@ -724,7 +732,7 @@ export default defineComponent({
 					return
 				}
 			}
-			this.loadingShow = true
+			this.isGenerate = true
 			//取消请求
 			// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data,{cancelToken: this.source?.token}).then(
 			Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
@@ -734,7 +742,7 @@ export default defineComponent({
 							message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Printboard')}));
 						}else if(rv.leftUsageCount == 0){
 							message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Printboard')}));
-							this.loadingShow = false
+							this.isGenerate = false
 							return
 						}
 					}
@@ -750,7 +758,7 @@ export default defineComponent({
 					},10000)
                 }
             ).catch(res=>{
-				this.loadingShow = false
+				this.isGenerate = false
             });
 		},
 		setGenerate(){
@@ -758,7 +766,7 @@ export default defineComponent({
 				let data = this.generateList.filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
 				Https.axiosPost(Https.httpUrls.generateResult, data).then(
 					(rv) => {
-						if(this.loadingShow){//防止取消后有正在执行的获取状态
+						if(this.isGenerate){//防止取消后有正在执行的获取状态
 							let arr:any = []
 							arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail')
 							rv.forEach((element:any) => {
@@ -785,7 +793,7 @@ export default defineComponent({
 								this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
 								clearInterval(this.generateTime)
 								clearInterval(this.remGenerateTime)
-								this.loadingShow = false
+								this.isGenerate = false
 								this.remGenerate = false
 							}
 						}
@@ -795,7 +803,7 @@ export default defineComponent({
 					this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
 					clearInterval(this.generateTime)
 					clearInterval(this.remGenerateTime)
-					this.loadingShow = false
+					this.isGenerate = false
 				});
 			},1000)
 		},
@@ -803,7 +811,7 @@ export default defineComponent({
 			let arr = this.generateList.filter((item:any)=>item.status != 'Success')
 			//取消操作
 			this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
-			this.loadingShow = false
+			this.isGenerate = false
 			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');

src/component/HomePage/RobotAssist.vue

@@ -28,7 +28,7 @@
 								<i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
 							</div>
 							<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
-								<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,imgIndex)"></i>
+								<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,imgIndex,index)"></i>
 							</div>
 						</div>
 					</div>
@@ -242,12 +242,12 @@ export default defineComponent({
 				}
 			})
 		},
-		scaleImage(img:any,index:any){
+		scaleImage(img:any,index:any,dialogueIndex:any){
 			let scaleImage:any = this.$refs.scaleImage
 			img.forEach((item:any) => {
 				item.imgUrl = item.presignedUrl
 			});
-			scaleImage.init(img,index)
+			scaleImage.init(img,index,dialogueIndex)
 			scaleImage.scaleImageMask = true
 		},
 		robotmax(){//点击内容就设置为true显示 重置定时器
@@ -392,8 +392,10 @@ export default defineComponent({
 				(rv) => {
 					if(this.record[index].img[imgIndex].id == null){
 						this.record[index].img[imgIndex].id = rv.id
+						this.record[index].img[imgIndex].like = true
 					}else{
 						this.record[index].img[imgIndex].id = null
+						this.record[index].img[imgIndex].like = false
 					}
 					sessionStorage.setItem('record', JSON.stringify(this.record));  
 				}

src/component/HomePage/SketchboardUpload.vue

@@ -149,7 +149,7 @@
 					</div> -->
 				</div>
 				<div class="modal_img" :style="[loadingShow?'overflow:hidden':'']">
-					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_13_2" :class="[driver__.driver?'showEvents':'',item?.checked?'active':'']">
+					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_13_2" :class="[item.status != 'Success'?'hideEvents':'',driver__.driver?'showEvents':'',item?.checked?'active':'']">
 						<img v-show="item.status != 'Success'" src="@/assets/images/homePage/loading.gif" alt="">
 						<img v-show="item.status == 'Success'" :src="item.imgUrl" @click.stop="generageAdd(item)">
 						<sketchCategory :disignTypeList="sketchCatecoryList" :generateList="generateList" :item="item" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_13',class2:'Guide_1_13_1'}"></sketchCategory>
@@ -211,6 +211,7 @@ export default defineComponent({
 
 		let generateCheckbox:any = ref()
 		let loadingShow = ref(false)
+		let isGenerate = ref(false)
 			
 		let sketchCatecoryList:any = computed(()=>{
 			return store.state.Workspace.workspacePosition
@@ -243,6 +244,7 @@ export default defineComponent({
 			store,
 			generateCheckbox,
 			loadingShow,
+			isGenerate,
 			sketchCatecoryList,
 			workspace,
 			inputShow,
@@ -620,7 +622,7 @@ export default defineComponent({
 			// 		);
 			// 	return
 			// }
-			if(this.loadingShow){
+			if(this.isGenerate){
 				return
 			}
 			let generage:any = this.$refs.Generate
@@ -691,7 +693,7 @@ export default defineComponent({
 				}
 			}
 
-			this.loadingShow = true
+			this.isGenerate = true
 			Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
                 (rv) => {
 					if(data.isTestUser){
@@ -699,7 +701,7 @@ export default defineComponent({
 							message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Printboard')}));
 						}else if(rv.leftUsageCount == 0){
 							message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Printboard')}));
-							this.loadingShow = false
+							this.isGenerate = false
 							return
 						}
 					}
@@ -715,7 +717,7 @@ export default defineComponent({
 					},10000)
                 }
             ).catch(res=>{
-				this.loadingShow = false
+				this.isGenerate = false
             });
 		},
 		setGenerate(){
@@ -731,7 +733,7 @@ export default defineComponent({
 				let data = this.generateList.filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
 				Https.axiosPost(Https.httpUrls.generateResult, data).then(
 					(rv) => {
-						if(this.loadingShow){//防止取消后有正在执行的获取状态
+						if(this.isGenerate){//防止取消后有正在执行的获取状态
 							let arr:any = []
 							arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' &&  item.status != 'Invalid')
 							rv.forEach((element:any) => {
@@ -740,14 +742,12 @@ export default defineComponent({
 										this.generateList[index] = element
 										element.imgUrl = element.url
 										element.id_ = GO.id++
-										if(element.category){
+										this.sketchCatecoryList.forEach((itemCategory:any) => {
-											this.sketchCatecoryList.forEach((itemCategory:any) => {
+											if(itemCategory.value == element.category){
-												if(itemCategory.value == element.category){
+												element.categoryValue = itemCategory?.name
-													element.categoryValue = itemCategory?.name
+												element.category = itemCategory?.value
-													element.category = itemCategory?.value
+											}
-												}
+										});
-											});
-										}
 									}
 								});
 							});
@@ -765,7 +765,7 @@ export default defineComponent({
 								this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
 								clearInterval(this.generateTime)
 								clearInterval(this.remGenerateTime)
-								this.loadingShow = false
+								this.isGenerate = false
 								this.remGenerate = false
 							}
 						}
@@ -774,7 +774,7 @@ export default defineComponent({
 					this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
 					clearInterval(this.generateTime)
 					clearInterval(this.remGenerateTime)
-					this.loadingShow = false
+					this.isGenerate = false
 				});
 			},1000)
 		},
@@ -782,7 +782,7 @@ export default defineComponent({
 			let arr = this.generateList.filter((item:any)=>item.status != 'Success')
 			//取消操作
 			this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
-			this.loadingShow = false
+			this.isGenerate = false
 			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');

src/component/HomePage/scaleImage.vue

@@ -21,6 +21,10 @@
 		</div>
 		<div class="scaleImage_content">
 			<img :src="scaleImageList[scaleImageIndex]?.imgUrl">
+			<div class="img_operate_block">
+				<i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i>
+				<i v-else class="fi fi-sr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i>
+			</div>
 		</div>
 		<div class="scaleImage_nav">
 			<div class="nav_left">
@@ -70,6 +74,8 @@ export default defineComponent({
 		])
 		let scaleImageMask:any = ref(false)
 		let scaleImageIndex:any = ref(0)
+
+		let robotAssits:any = ref(0)
         return {
             scaleImage,
 			loadingShow,
@@ -78,6 +84,8 @@ export default defineComponent({
 			scaleImageList,
 			scaleImageMask,
 			scaleImageIndex,
+
+			robotAssits,
         };
     },
     data() {
@@ -104,10 +112,11 @@ export default defineComponent({
     mounted() {
     },
     methods: {
-		init(list:any,index:any){
+		init(list:any,index:any,dialogueIndex:any){
 			this.scaleImage = true
 			this.scaleImageList = list
 			this.scaleImageIndex = index
+			if(dialogueIndex)this.robotAssits = dialogueIndex
 			// let scaleImageList = this.store.state.UploadFilesModule.moodboard
 		},
 		cancelDsign(){
@@ -134,6 +143,15 @@ export default defineComponent({
 		setScaleImageIndex(index:any){
 			this.scaleImageIndex = index
 		},
+		LikeFile(item:any,str:string){
+			let parent:any = this.$parent
+			if(this.robotAssits){
+				parent.likeFile(item,this.scaleImageIndex,this.robotAssits)
+			}else{
+				parent.likeFile(item,str)
+			}
+			
+		}
     },
 });
 </script>
@@ -197,12 +215,45 @@ export default defineComponent({
 		display: flex;
 		justify-content: center;
 		height: 75%;
+		margin: 0 auto;
 		margin-top: calc(5rem*1.2);
+		position: relative;
+		max-width: calc(50rem*1.2);
+
 		img{
 			width: auto;
-			max-width: calc(50rem*1.2);
 			height: 100%;
 		}
+		.img_operate_block{
+			width: 3.6rem;
+			height: 3.6rem;
+			background: rgba(0,0,0,0.6);
+			border-radius: 50%;
+			text-align: center;
+			line-height: 3.6rem;
+			cursor: pointer;
+			margin-bottom: 0.4rem;
+			position: absolute;
+			right: 2rem;
+			top: 2rem;
+			opacity: 0;
+			.operate_icon{
+				font-size: 1.8rem;
+				color: #fff;
+				&.fi-sr-heart{
+					color: red;
+				}
+			}
+			i{
+				font-size: 1.8rem;
+				color: #fff;
+			}
+		}
+	}
+	.scaleImage_content:hover{
+		.img_operate_block{
+			opacity: 1;
+		}
 	}
 	.scaleImage_nav{
 		flex: 1;

src/component/HomePage/sketchCategory.vue

@@ -80,7 +80,6 @@ export default defineComponent({
     setup(props:any){
 		let showFileCategory = (file:any)=> {
             file.categoryShow = true;
-					console.log(props.driverClass);
 			nextTick().then(()=>{
 				if(props.driver__){
 					

src/component/LibraryPage/setLabel.vue

@@ -316,7 +316,7 @@ export default defineComponent({
 		setLabelData(){
 			let data = {
 				"classificationIdList": [],
-				"classificationName": "123221",
+				"classificationName": "",
 				"createTime": "",
 				"deleteConfirm": '',
 				"id": '',
@@ -326,7 +326,6 @@ export default defineComponent({
 				"updateTime": "",
 				"userId": ''
 			}
-			console.log(this.type);
 			
 			return data
 		},

src/views/HomeView/library.vue

@@ -219,7 +219,6 @@
 											</div>
 											<div v-show="isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
 												<i class="fi fi-br-loading"></i>
-												<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
 											</div>
 											<span ref="inputShowText"></span>
 										</div>
@@ -285,7 +284,7 @@
                                 </div>
 
                                 <div class="content_body_table scroll_style">
-                                    <div class="content_img_item" v-for="(img,index) in generateList[selectCode]" :key="img.id">
+                                    <div class="content_img_item" v-for="(img,index) in generateList[selectCode]" :key="img.id"  :class="[img.status != 'Success'?'hideEvents':'']">
                                         <div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']">
 											<img v-show="img.status != 'Success'"  :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']" src="@/assets/images/homePage/loading.gif" alt="">
 											<img v-show="img.status == 'Success'"  :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']" :src="img.imgUrl">
@@ -1191,14 +1190,12 @@ export default defineComponent({
 									if(item.taskId == element.taskId && element.status == 'Success'){
 										element.imgUrl = element.url
 										this.generateList[this.selectCode][index] = element
-										if(element.category){
+										this.disignTypeList.forEach((itemCategory:any) => {
-											this.disignTypeList.forEach((itemCategory:any) => {
+											if(itemCategory.value == element.category){
-												if(itemCategory.value == element.category){
+												element.categoryValue = itemCategory?.label
-													element.categoryValue = itemCategory?.label
+												element.category = itemCategory?.value
-													element.category = itemCategory?.value
+											}
-												}
+										});
-											});
-										}
 									}
 								});
 							});
@@ -1648,23 +1645,7 @@ export default defineComponent({
 											}
 											.started_btn{
 											}
-											.fi-br-loading::before{
+											
-												transition: all .5s;
-												display: inline-block;
-												animation: whirl 1s linear infinite;
-
-											}
-											@keyframes whirl {
-												0%{
-													transform: rotate(0deg);
-												}
-												50%{
-													transform: rotate(180deg);
-												}
-												100%{
-													transform: rotate(360deg);
-												}
-											}
 											.generage_btn{
 												margin: 0 3rem;
 											}

src/views/LoginPage.vue

@@ -236,6 +236,7 @@ import { isEmail } from "@/tool/util";
 import { setCookie ,WriteCookie } from "@/tool/cookie";
 import { message } from "ant-design-vue";
 import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
+import { useStore } from "vuex";
 import { useI18n } from "vue-i18n";
 import { setLang } from "@/tool/guide";
 const md5 = require("md5");
@@ -246,8 +247,10 @@ export default defineComponent({
     setup(){
         let timer:any =  0;
 		const {locale} = useI18n()
+		const store = useStore();
 	
         return{
+			store,
             timer,
 			locale
         }
@@ -525,11 +528,8 @@ export default defineComponent({
 			this.getLang()
             // this.$router.push("/home");
 			// console.log(window.location.search.substring(1));
-			if(window.location.search.substring(1) == 'oldHis'){
+			this.store.commit("clearAllData");
-				this.$router.push("/oldHistory");
+			this.$router.push("/home");
-			}else{
-				this.$router.push("/home");
-			}
         },
 		//获取当前语言
 		getLang(){