From e5489e4dc1beec1d790292b4a1b79115d03fb1b1 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 27 Feb 2024 15:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8F=AF=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style/style.css | 44 ++- src/assets/style/style.less | 35 ++- src/component/Detail/DesignDetail.vue | 4 +- src/component/Detail/DesignPrintOperation.vue | 2 +- .../Detail/DesignPrintOperationMobile.vue | 2 +- src/component/HomePage/ExportModel.vue | 274 +++++++++++++++++- src/component/Pay/payOrder.vue | 105 ++++++- src/tool/canvasDrawing.js | 0 8 files changed, 405 insertions(+), 61 deletions(-) create mode 100644 src/tool/canvasDrawing.js diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 02c177d7..915daa2e 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -13,6 +13,7 @@ body, } input { outline: none; + border: 0.1rem solid #dcdfe6; } ul, li { @@ -617,6 +618,18 @@ li { border: solid 2px rgba(0, 0, 0, 0.55); color: #000000; } +.modal_title_text { + font-size: var(--aida-fsize2); + font-weight: 900; + color: rgba(0, 0, 0, 0.65); + align-items: center; + margin-bottom: calc(2rem*1.2); +} +.modal_title_text .modal_title_text_intro { + font-size: var(--aida-fsize1-4); + font-weight: 400; + color: rgba(0, 0, 0, 0.45); +} .collection_modal .ant-modal-body, .payOrder_modal .ant-modal-body, .design_detail_modal_component .ant-modal-body, @@ -625,28 +638,6 @@ li { .Export .ant-modal-body { overflow-y: hidden; } -.collection_modal .design_title_text, -.payOrder_modal .design_title_text, -.design_detail_modal_component .design_title_text, -.designOpenrtion_modal .design_title_text, -.library_page .design_title_text, -.Export .design_title_text { - font-size: var(--aida-fsize2); - font-weight: 900; - color: rgba(0, 0, 0, 0.65); - align-items: center; - margin-bottom: calc(2rem*1.2); -} -.collection_modal .design_title_text .design_title_text_intro, -.payOrder_modal .design_title_text .design_title_text_intro, -.design_detail_modal_component .design_title_text .design_title_text_intro, -.designOpenrtion_modal .design_title_text .design_title_text_intro, -.library_page .design_title_text .design_title_text_intro, -.Export .design_title_text .design_title_text_intro { - font-size: var(--aida-fsize1-4); - font-weight: 400; - color: rgba(0, 0, 0, 0.45); -} .collection_modal .ant-upload.ant-upload-select-picture-card, .payOrder_modal .ant-upload.ant-upload-select-picture-card, .design_detail_modal_component .ant-upload.ant-upload-select-picture-card, @@ -722,18 +713,21 @@ li { } .design_detail_modal_component .ant-upload-list-picture-card-container, .designOpenrtion_modal .ant-upload-list-picture-card-container, -.UpgradePlan_modal .ant-upload-list-picture-card-container { +.UpgradePlan_modal .ant-upload-list-picture-card-container, +.refund_reason .ant-upload-list-picture-card-container { display: none !important; } .design_detail_modal_component .ant-upload-picture-card-wrapper, .designOpenrtion_modal .ant-upload-picture-card-wrapper, -.UpgradePlan_modal .ant-upload-picture-card-wrapper { +.UpgradePlan_modal .ant-upload-picture-card-wrapper, +.refund_reason .ant-upload-picture-card-wrapper { width: auto; vertical-align: top; } .design_detail_modal_component .subitOkPreviewBtn, .designOpenrtion_modal .subitOkPreviewBtn, -.UpgradePlan_modal .subitOkPreviewBtn { +.UpgradePlan_modal .subitOkPreviewBtn, +.refund_reason .subitOkPreviewBtn { background-color: #38205b; color: #fff; cursor: pointer; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index cc3623dc..f9ba0b1e 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -12,12 +12,16 @@ html,body,#app{ --aida-fsize1-4: calc(1.4rem*1.2); } input{ - outline:none + outline:none; + outline: none; + border: .1rem solid #dcdfe6; } ul,li{ list-style: none; padding: 0; } +input:focus{ +} .page_content{ // width: 1440px; max-width: 100%; @@ -56,6 +60,8 @@ ul,li{ .ant-slider{ margin: 0; width: 12rem; + + .ant-slider-rail{ height: 0.6rem; @@ -721,24 +727,25 @@ ul,li{ color: rgba(0, 0, 0, 1); } } +.modal_title_text{ + font-size: var(--aida-fsize2); + font-weight: 900; + color: rgba(0,0,0,.65); + align-items: center; + margin-bottom: calc(2rem*1.2); + .modal_title_text_intro{ + font-size: var(--aida-fsize1-4); + font-weight: 400; + color: rgba(0,0,0,.45); + } +} //collection 弹窗 .collection_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export{ .ant-modal-body{ overflow-y: hidden; } - .design_title_text{ - font-size: var(--aida-fsize2); - font-weight: 900; - color: rgba(0,0,0,.65); - align-items: center; - margin-bottom: calc(2rem*1.2); - .design_title_text_intro{ - font-size: var(--aida-fsize1-4); - font-weight: 400; - color: rgba(0,0,0,.45); - } - } + .ant-upload.ant-upload-select-picture-card{ background: #FFFFFF; width: calc(6rem*1.2); @@ -791,7 +798,7 @@ ul,li{ } } } -.design_detail_modal_component,.designOpenrtion_modal,.UpgradePlan_modal{ +.design_detail_modal_component,.designOpenrtion_modal,.UpgradePlan_modal,.refund_reason{ .ant-upload-list-picture-card-container{ display: none !important; } diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 3271f1b3..41570a7b 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -11,9 +11,9 @@ :keyboard="false" :closable="false" > -