diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 6bc6c426..89344ae3 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -430,12 +430,13 @@ export default defineComponent({ threshold:[.5] }) ob.observe(el) - // this.currentPage = 1 + // this.currentPage = +=1 // this.pageSize = 12 + // currentPage let this_ = binding.instance function callback(entries, observer) { entries.forEach((entry) => { - if (entry.isIntersecting) { + if (entry.isIntersecting && !this_.isShowLoading) { this_.getLibraryList() } else { } @@ -775,6 +776,7 @@ export default defineComponent({ }, //请求我的印花&&模型 getLibraryList(){ + this.isShowLoading = true let level2Type = '' if(this.selectCode == 'Printboard' || this.selectCode == 'DesignElements'){ level2Type = this.designType @@ -792,7 +794,6 @@ export default defineComponent({ pictureName:this.searchPictureName, size:this.pageSize+this.clothesList.length, } - this.isShowLoading = true Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then( (rv) => { if(this.selectCode == 'Sketchboard'){ diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 7dc17ea0..4005f6e4 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -350,7 +350,7 @@ export default defineComponent({ }, setElemets(){ if(this.current.trims.prints && this.current.trims.prints.length == 0 && this.elementsList.length == 0)return message.info('请选择至少一张element') - let DesignElementsOperation = isMoible() ? this.$refs.DesignPrintMobile : this.$refs.DesignElementsOperation + let DesignElementsOperation = this.$refs.DesignElementsOperation DesignElementsOperation.init() }, //提交 diff --git a/src/component/Detail/DesignElements.vue b/src/component/Detail/DesignElements.vue index 48cf7d8e..a185c5df 100644 --- a/src/component/Detail/DesignElements.vue +++ b/src/component/Detail/DesignElements.vue @@ -43,7 +43,7 @@ v-for="item,index in exhibitionElementsList" :key="item" :style="[printStyleList?.[index]?.style]" - @mousedown.stop="itemMoveMousedown(index,$event)" + @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" class="modal_imgItem" ref="content" > @@ -52,11 +52,11 @@
-