diff --git a/src/assets/style/style.css b/src/assets/style/style.css index e0296515..6da9114c 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -772,7 +772,7 @@ i { .collection_modal_body .upload_item .upload_file_item, .design_detail_modal_component .upload_item .upload_file_item, .library_page .upload_item .upload_file_item { - margin: 0 2rem 2rem 0; + margin: 0 1rem 2rem 0; display: inline-block; width: 10rem; height: 10rem; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 186929b8..cd494c9a 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -866,7 +866,7 @@ i{ display: flex; flex-wrap: wrap; .upload_file_item { - margin: 0 2rem 2rem 0; + margin: 0 1rem 2rem 0; display: inline-block; // width: 16.5rem; // height: 16.5rem; diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 77374851..e7f13187 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -5,7 +5,7 @@ :class="[driver__.driver?'hideEvents':'']" v-model:visible="designDetailShow" :footer="null" - width="65%" + width="75%" :maskClosable="false" :centered="true" :keyboard="false" diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 7d4072eb..ade8e950 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -1052,7 +1052,7 @@ export default defineComponent({ // background: #FFFFFF; border: 0.1rem solid #F1F1F1; // font-size: 1.6rem; - font-size: 1.2rem; + font-size: 1.4rem; font-weight: 400; height: 3rem; @@ -1125,6 +1125,8 @@ export default defineComponent({ vertical-align: top; // padding: 0 1.4rem; // margin-bottom: 2.8rem; + max-width: 48%; + margin-bottom: 2rem; padding: 0; // height: 9rem; @@ -1139,6 +1141,7 @@ export default defineComponent({ } .content_img_item_block{ // border: 0.1rem solid transparent; + max-width: 100%; width: 10rem; height: 10rem; display: flex; @@ -1307,7 +1310,7 @@ export default defineComponent({ } .upload_file_item{ - // margin: 0 2rem 2rem 0; + // margin: 0 1rem 2rem 0; margin: 0; display: inline-block; // width: 16.5rem; @@ -1676,7 +1679,7 @@ export default defineComponent({ display: flex; justify-content: center; .ant-upload-select-picture-card{ - // margin: 0 2rem 2rem 0; + // margin: 0 1rem 2rem 0; margin: 0; display: inline-block; width: 6rem; diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 1311ec5c..14c7be4f 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -5,7 +5,7 @@ :class="[driver__.driver?'hideEvents':'']" v-model:visible="designOpenrtion" :footer="null" - width="65%" + width="75%" :maskClosable="false" :centered="true" :closable="false" diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index f8e88d9c..41915a88 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -5,7 +5,7 @@ v-model:visible="designOpenrtion" :class="[driver__.driver?'hideEvents':'']" :footer="null" - width="65%" + width="75%" :maskClosable="false" :centered="true" :closable="false" diff --git a/src/component/Detail/HistoryDetail.vue b/src/component/Detail/HistoryDetail.vue index d317b635..557583d2 100644 --- a/src/component/Detail/HistoryDetail.vue +++ b/src/component/Detail/HistoryDetail.vue @@ -65,8 +65,8 @@ export default defineComponent({ .ant-modal-body{ background: #F2F3FB; - height: 80vh; - min-height: 72rem; + height: 70vh; + min-height: 62rem; overflow-y: hidden; padding: 0; } diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index 7c3717c6..5bd3d42a 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -608,7 +608,7 @@ export default defineComponent({ display: none; } .upload_file_item{ - // margin: 0 2rem 2rem 0; + // margin: 0 1rem 2rem 0; margin: 0; display: inline-block; // width: 16.5rem; @@ -979,7 +979,7 @@ export default defineComponent({ .ant-upload-picture-card-wrapper{ .ant-upload-list{ .ant-upload-select-picture-card{ - // margin: 0 2rem 2rem 0; + // margin: 0 1rem 2rem 0; margin: 0; display: inline-block; width: 12rem; diff --git a/src/component/HomePage/Cropper.vue b/src/component/HomePage/Cropper.vue index c0860279..70760bb0 100644 --- a/src/component/HomePage/Cropper.vue +++ b/src/component/HomePage/Cropper.vue @@ -2,7 +2,7 @@ { + el.onmousedown = (e:MouseEvent) => { e.stopPropagation() el.parentNode.children.forEach((v:any) =>{ @@ -469,13 +469,13 @@ export default defineComponent({ } el.parentNode.addEventListener('mousemove', mouseMove); - }) + } } }, //移动图片 translate:{ mounted (el,layout:any,binding) { - el.addEventListener('mousedown',(e: MouseEvent)=>{ + el.onmouseup = (e: MouseEvent)=>{ e.stopPropagation() let elParent = el.parentNode.parentNode el.style.left = (el.offsetLeft+2)/(elParent.offsetWidth)*100+'%' @@ -530,7 +530,7 @@ export default defineComponent({ mouse = false document.onmousemove = ()=>{} } - }) + } }, }, modelImg:{ @@ -732,8 +732,8 @@ export default defineComponent({ .layout_centent{ display: flex; // height: 55%; - height: 35rem; - width: 57rem; + width: 49rem; + height: calc(49rem*0.614); // height: 60%; flex-direction: column; flex-wrap: wrap; diff --git a/src/component/HomePage/layoutMobile.vue b/src/component/HomePage/layoutMobile.vue index 496ccec1..de35c3c1 100644 --- a/src/component/HomePage/layoutMobile.vue +++ b/src/component/HomePage/layoutMobile.vue @@ -4,7 +4,7 @@ class="layout_modal" v-model:visible="layout" :footer="null" - width="65%" + width="75%" :maskClosable="false" :centered="true" :closable="false" @@ -28,7 +28,7 @@