From dc652a356d6314946b9ae3eb4c4636cdddd7f46e Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 29 Dec 2023 15:33:05 +0800
Subject: [PATCH] fix

---
 src/component/Detail/habit.vue               | 47 +++++++++++++++++++-
 src/component/HomePage/Generate.vue          |  3 ++
 src/component/HomePage/PrintboardUpload.vue  |  3 ++
 src/component/HomePage/SketchboardUpload.vue |  3 ++
 src/views/LibraryPage.vue                    |  3 ++
 5 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 4e6f6246..af183ef9 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -32,6 +32,9 @@
 							<i @click.stop="putName(-1,'affirm')" v-show="openType.addWorkspace" class="fi fi-br-check"></i>
 							<div v-show="!openType.addWorkspace">+</div>
 						</li>
+						<div v-show="total > workspace.workspaceList?.length && total != 0" class="material_content_list_loding" v-observe>
+							<img src="@/assets/images/homePage/loading.gif" alt="">
+						</div>
 					</ul>
 				</div>
             </div>
@@ -184,6 +187,7 @@ export default defineComponent({
 		})
 		let mannequins:any = ref([{},{}])
 		let systemSeleves= ref(false);
+		let total= ref(0);
 		let openType:any = ref({
 			workspace:false,
 			singleton:false,
@@ -219,6 +223,7 @@ export default defineComponent({
 			systemSeleves,
 			mannequins,
 			openType,
+			total,
 			driver__,
 			workspace,
 			workspaceItem,
@@ -361,7 +366,28 @@ export default defineComponent({
 					el.scrollBy(num, 0);
 				})
 			}
-		}
+		},
+		observe:{
+			mounted (el,binding) {
+				// console.log(binding.instance);
+				const ob = new IntersectionObserver(callback,{
+					root:null,
+					threshold:[0.1]
+				})
+				ob.observe(el)
+				// this.currentPage = 1
+				// this.pageSize = 12
+				let this_:any = binding.instance
+				function callback(entries:any, observer:any) {
+					entries.forEach((entry:any) => {
+						if (entry.isIntersecting) {
+							this_.getworkspace('di')
+						} else {
+						}
+					});
+				}
+			},
+		},
 	},
     methods: {
 		async getSex(){
@@ -409,6 +435,9 @@ export default defineComponent({
 				page:1,
 				size:10,
 			}
+			// data.page = this.workspace.workspaceList?.[0]?.id != undefined?this.workspace.workspaceList?.length / data.size+1:1
+			data.size = this.workspace.workspaceList?.[0]?.id != undefined?this.workspace.workspaceList?.length + data.size+1:10
+
 			Https.axiosPost(Https.httpUrls.workspaceList,data).then((rv: any) => {
 				if (rv) {
 					rv.page.content.forEach((v:any) => {
@@ -425,7 +454,13 @@ export default defineComponent({
 							this.setPosition('')
 						}
 					});
+					this.total = rv.page.total
 					this.workspace.id = rv.id
+					// if(this.workspace.workspaceList){
+					// 	this.workspace.workspaceList.push(...rv.page.content)
+					// }else{
+					// 	this.workspace.workspaceList = rv.page.content
+					// }
 					this.workspace.workspaceList = rv.page.content
 				}
 			})
@@ -933,6 +968,16 @@ export default defineComponent({
 				li:hover{
 					background: rgba(0, 0, 0, 0.1);
 				}
+				.material_content_list_loding{
+					width: 100%;
+					height: 4rem;
+					display: flex;
+					img{
+						width: auto;
+						margin: 0 auto;
+						height: 100%;
+					}
+				}
 
 			}
 			.model_Designer{
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index e3d46598..a3148c73 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -451,6 +451,9 @@ export default defineComponent({
 					);
 				return
 			}
+			if(this.loadingShow){
+				return
+			}
 			// if(!this.searchPictureName){
 			// 	message.info(
 			// 		this.t('Generate.jsContent3')
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 37904d8c..e61b2b0e 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -560,6 +560,9 @@ export default defineComponent({
 					);
 				return
 			}
+			if(this.loadingShow){
+				return
+			}
 			//如果是通过moodboard随即图片生成
 			let generage:any = this.$refs.Generate
 			let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 9677eae5..27ce0753 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -668,6 +668,9 @@ export default defineComponent({
 					);
 				return
 			}
+			if(this.loadingShow){
+				return
+			}
 			let generage:any = this.$refs.Generate
 			let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
 			let data = {
diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue
index b6464579..18d2d913 100644
--- a/src/views/LibraryPage.vue
+++ b/src/views/LibraryPage.vue
@@ -1152,6 +1152,9 @@ export default defineComponent({
 					);
 				return
 			}
+			if(this.isShowMark){
+				return
+			}
 			let generateType = this.checkbox.filter((v:any)=>v.type)[0].name
 			if(this.selectCode == 'Moodboard'){
 				generateType = this.checkbox[1].name