diff --git a/public/image/mainImg/img1.png b/public/image/mainImg/img1.png new file mode 100644 index 00000000..37a436a7 Binary files /dev/null and b/public/image/mainImg/img1.png differ diff --git a/public/image/mainImg/img10.png b/public/image/mainImg/img10.png new file mode 100644 index 00000000..ee511ac7 Binary files /dev/null and b/public/image/mainImg/img10.png differ diff --git a/public/image/mainImg/img2.png b/public/image/mainImg/img2.png new file mode 100644 index 00000000..000457a2 Binary files /dev/null and b/public/image/mainImg/img2.png differ diff --git a/public/image/mainImg/img3.png b/public/image/mainImg/img3.png new file mode 100644 index 00000000..dc160d6f Binary files /dev/null and b/public/image/mainImg/img3.png differ diff --git a/public/image/mainImg/img4.png b/public/image/mainImg/img4.png new file mode 100644 index 00000000..1b52ac31 Binary files /dev/null and b/public/image/mainImg/img4.png differ diff --git a/public/image/mainImg/img5.png b/public/image/mainImg/img5.png new file mode 100644 index 00000000..58ccb204 Binary files /dev/null and b/public/image/mainImg/img5.png differ diff --git a/public/image/mainImg/img6.png b/public/image/mainImg/img6.png new file mode 100644 index 00000000..e210bbe6 Binary files /dev/null and b/public/image/mainImg/img6.png differ diff --git a/public/image/mainImg/img7.png b/public/image/mainImg/img7.png new file mode 100644 index 00000000..bb329b97 Binary files /dev/null and b/public/image/mainImg/img7.png differ diff --git a/public/image/mainImg/img8.png b/public/image/mainImg/img8.png new file mode 100644 index 00000000..fa81b846 Binary files /dev/null and b/public/image/mainImg/img8.png differ diff --git a/public/image/mainImg/img9.png b/public/image/mainImg/img9.png new file mode 100644 index 00000000..2a20dc59 Binary files /dev/null and b/public/image/mainImg/img9.png differ diff --git a/public/video/homeVideo.gif b/public/video/homeVideo.gif deleted file mode 100644 index a8a0a4ef..00000000 Binary files a/public/video/homeVideo.gif and /dev/null differ diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue index 01e2f067..2f5e5730 100644 --- a/src/component/Administrator/allUserPoerations.vue +++ b/src/component/Administrator/allUserPoerations.vue @@ -216,6 +216,8 @@ export default defineComponent({ "credits": operationsData.credits, "systemUser": operationsData.systemUser, "validEndTime": setTime(operationsData.validEndTime), + "userName": operationsData.userName, + "userEmail": operationsData.userEmail, } } let cancelDsign = ()=>{ @@ -244,7 +246,7 @@ export default defineComponent({ ); }else{ data = setEditData() - if(!data.userName || !data.userEmail || !data.validStartTime || !data.validEndTime || !data.systemUser)return message.warning('Please check the input box marked with *') + if(!data.userName || !data.userEmail || !data.validEndTime || !data.systemUser)return message.warning('Please check the input box marked with *') Https.axiosPost(Https.httpUrls.modifyUser,{},{params:data}).then( (rv) => { if (rv) { diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 4d70c665..e030c3fc 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -371,7 +371,7 @@ export default defineComponent({ }) index = index? index:0 if(!this.current.id){ - if(index){ + if(index && data?.designSingleItemDTOList){ data.designSingleItemDTOList[index].priority = zIndex+=1 } } diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index d0a1d2f9..a118521b 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -39,9 +39,9 @@
+
@@ -49,7 +49,6 @@
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index bc412e3d..f90412e4 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -198,11 +198,12 @@
+
+
+
- +
@@ -308,6 +309,7 @@ import { useI18n } from "vue-i18n"; import {isMoible,calculateGradientCoordinate,base64ToFile} from '@/tool/util' import publish from "@/component/WorksPage/publish.vue"; import liquefaction from "@/component/modules/liquefaction.vue"; +import { getMousePosition } from "@/tool/mdEvent"; export default defineComponent({ components: { @@ -631,6 +633,69 @@ export default defineComponent({ driverObj__.moveNext() } + let canvasBoxDom = document.querySelector('.exportCanvasBox .exportCanvasBox_center') + let scrollBox = document.querySelector('.exportCanvasBox_scroll div') + let height = canvasBox.offsetHeight / (canvasWH.value.height / canvasBox.offsetHeight ) + let scale = (canvasWH.value.height - canvasBoxDom.offsetHeight) / (canvasBoxDom.offsetHeight - height) + let mouseDownOperation = (event)=>{//按下 + console.log(canvasWH.value.height , canvasBoxDom.offsetHeight,canvasBoxDom.offsetHeight , height); + let position = { + y:event.screenY, + top : scrollBox.style.marginTop?scrollBox.style.marginTop.split('px')[0]*1:0 + } + // let top = + let scrollMousemove = (e)=>{ + let height = scrollBox.style.height.split('px')[0]*1 + let offsetTop = position.top+e.screenY - position.y + offsetTop = offsetTop <= 0? 0 : offsetTop + offsetTop = height+offsetTop >= canvasBoxDom.offsetHeight? canvasBoxDom.offsetHeight - height : offsetTop + scrollBox.style.marginTop = offsetTop+'px' + canvasBoxDom.scroll({ + top: offsetTop*scale, // 纵向滚动距离 + left: 0, // 横向滚动距离 + }); + } + let mouseMove = function(event){ + let e = getMousePosition(event,false) + scrollMousemove(e) + } + let touchmove = function(event){ + let e = getMousePosition(event,true) + scrollMousemove(e) + } + let mouseup = function(){ + document.removeEventListener('mousemove',mouseMove) + document.removeEventListener('touchmove',touchmove) + document.removeEventListener('mouseup',mouseup) + document.removeEventListener('touchend',mouseup) + //移动端 + } + document.addEventListener('mousemove', mouseMove); + document.addEventListener('touchmove', touchmove); + document.addEventListener('mouseup', mouseup); + document.addEventListener('touchend', mouseup); + + // document.addEventListener('touchmove',scrollMousemove) + // scrollBox.addEventListener('touchend',mouseup) + } + canvasBoxDom.addEventListener('scroll', function() { + const scrollTop = canvasBoxDom.scrollTop; + scrollBox.style.marginTop = scrollTop/scale+'px' + }); + let mousedown = function(event){ + let e = getMousePosition(event,false) + mouseDownOperation(e) + } + + let touchstart = function(event){ + let e = getMousePosition(event,true) + mouseDownOperation(e) + } + scrollBox.addEventListener('mousedown',mousedown) + scrollBox.addEventListener('touchstart',touchstart) + // scrollBox.removeEventListener('touchstart',mousedown) + // scrollBox.addEventListener('touchstart',mousedown) + }); }; @@ -2096,57 +2161,24 @@ export default defineComponent({ } }, watch: { - // 'canvasWH.height':{ - // handler(newVal,oldVal){ - // if(!this.isMoible){ - // return - // } - // return - // let canvasBox = document.querySelector('.exportCanvasBox .exportCanvasBox_center') - // let scrollBox = document.querySelector('.exportCanvasBox_scroll div') - // canvasBox.scroll({ - // top: 0, // 纵向滚动距离 - // left: 0, // 横向滚动距离 - // }); - // scrollBox.style.marginTop = 0+'px' - // let height = canvasBox.offsetHeight / (newVal / canvasBox.offsetHeight ) - // scrollBox.style.height = height +'px' - // let scale = (newVal - canvasBox.offsetHeight) / (canvasBox.offsetHeight - height) - - - // let mousedown = (event)=>{//按下 - // let position = { - // y:event.touches[0].screenY, - // top : scrollBox.style.marginTop?scrollBox.style.marginTop.split('px')[0]*1:0 - // } - // // let top = - // let scrollMousemove = (e)=>{ - // let height = scrollBox.style.height.split('px')[0]*1 - // let offsetTop = position.top+e.touches[0].screenY - position.y - // offsetTop = offsetTop <= 0? 0 : offsetTop - // offsetTop = height+offsetTop >= canvasBox.offsetHeight? canvasBox.offsetHeight - height : offsetTop - // scrollBox.style.marginTop = offsetTop+'px' - // canvasBox.scroll({ - // top: offsetTop*scale, // 纵向滚动距离 - // left: 0, // 横向滚动距离 - // }); - // } - // let mouseup = ()=>{//抬起 - // window.removeEventListener('touchmove',scrollMousemove) - // scrollBox.removeEventListener('touchend',mouseup) - // } - // window.addEventListener('touchmove',scrollMousemove) - // scrollBox.addEventListener('touchend',mouseup) - // } - // scrollBox.removeEventListener('touchstart',mousedown) - // scrollBox.addEventListener('touchstart',mousedown) - - - - // } - // }, + 'canvasWH.height':{ + handler(newVal,oldVal){ + let canvasBox = document.querySelector('.exportCanvasBox .exportCanvasBox_center') + let scrollBox = document.querySelector('.exportCanvasBox_scroll div') + if(!canvasBox || !scrollBox)return + canvasBox.scroll({ + top: 0, // 纵向滚动距离 + left: 0, // 横向滚动距离 + }); + scrollBox.style.marginTop = 0+'px' + let height = canvasBox.offsetHeight / (newVal / canvasBox.offsetHeight ) + scrollBox.style.height = height +'px' + } + }, }, - mounted() {}, + mounted() { + + }, methods: { @@ -2456,6 +2488,7 @@ export default defineComponent({ height: 100%; overflow-y: auto; overflow-x: hidden; + // overflow: hidden; position: relative; .editFrontBack_pencilbtn{ position: absolute; @@ -2465,31 +2498,18 @@ export default defineComponent({ pointer-events: none; transform: translate(-50%,-50%); } - &.exportCanvasBox_center::-webkit-scrollbar-button:single-button{ - } &.exportCanvasBox_center::-webkit-scrollbar { /* 竖轴的宽度 */ - width: 2rem; - /* 横轴的高度 */ - height: 1rem; - transition: all .3s; - } - /* 进度 */ - &.exportCanvasBox_center::-webkit-scrollbar-thumb { - border-radius: 1rem; - background: #543087; - } - /* 轨道 */ - &.exportCanvasBox_center::-webkit-scrollbar-track { - border-radius: 1rem; - background: rgba(84, 48, 135,.2); - // background: rgba(238, 238, 244, 0); + display: none } } .exportCanvasBox_scroll{ height: 100%; width: 2rem; background: #d6cfe3; + position: absolute; + right: 0; + top: 0; border-radius: 1rem; div{ background: #543087; diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 609cd5dc..468b0447 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -552,6 +552,8 @@ export default defineComponent({ width: 47%; display: flex; flex-direction: column; + flex-shrink: 0; + width: 50%; // width: 50rem*1.2); .switch_type_list { display: flex; diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index e98475d6..6abaa637 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -920,6 +920,9 @@ export default defineComponent({ position: relative; cursor: pointer; text-align: center; + &.modal_imgItem:nth-child(even) { + margin-right: 0; + } img{ object-fit: cover; height: 100%; diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index ba7b587b..2e7ad324 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -891,6 +891,9 @@ export default defineComponent({ position: relative; cursor: pointer; text-align: center; + &.modal_imgItem:nth-child(even) { + margin-right: 0; + } &:hover .delete_like_file_block{ display: block; opacity: 1; diff --git a/src/component/HomePage/layout.vue b/src/component/HomePage/layout.vue index e4514f34..af67e0ab 100644 --- a/src/component/HomePage/layout.vue +++ b/src/component/HomePage/layout.vue @@ -30,7 +30,7 @@
- +
  • diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index 694b5904..0f1f04a5 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -25,7 +25,7 @@
    - {{$t('ProductImg.MagicTools')}} +
    @@ -899,7 +899,11 @@ methods: { .productImg_content_item_imgBox{ .content_item_imgBox_itemImg{ width: auto; + max-width: 9rem; flex-shrink: 0; + img{ + object-fit: contain; + } } } .productImg_content_item_generate{ diff --git a/src/component/LoginPage/verificationCodeInput.vue b/src/component/LoginPage/verificationCodeInput.vue index c2d55c74..4d8b92b7 100644 --- a/src/component/LoginPage/verificationCodeInput.vue +++ b/src/component/LoginPage/verificationCodeInput.vue @@ -2,6 +2,7 @@
    { offsetY: touch.clientY - e.target.getBoundingClientRect().top, clientX:touch.clientX, clientY:touch.clientY, + screenX:touch.screenX, + screenY:touch.screenY, target:e.target, } if(dom){ @@ -19,6 +21,8 @@ const getMousePosition = (e,bor,dom) => { offsetY:e.offsetY, clientX:e.clientX, clientY:e.clientY, + screenX:e.screenX, + screenY:e.screenY, target:e.target, } } diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue index 41b11832..efe28313 100644 --- a/src/views/HomeRecommend.vue +++ b/src/views/HomeRecommend.vue @@ -1,69 +1,53 @@