From 37f1b36e54da1f6c1b9f7b8156fc81576bc02984 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 9 Apr 2025 14:09:19 +0800 Subject: [PATCH] fix --- src/assets/images/homePage/sketchDesign.png | Bin 700 -> 6974 bytes src/assets/style/style.css | 147 +++-- src/assets/style/style.less | 65 ++- src/component/Canvas/argument.vue | 6 +- src/component/Canvas/canvasContent.vue | 22 +- src/component/Canvas/detail.vue | 25 +- src/component/Canvas/index.vue | 18 +- src/component/Canvas/tool.vue | 1 + src/component/Detail/addDetails.vue | 14 +- src/component/Detail/editFrontBack.vue | 24 +- src/component/Detail/habitSetStyle.vue | 4 +- src/component/DetailCopy/canvas/argument.vue | 75 +-- .../DetailCopy/canvas/canvasContent.vue | 7 +- src/component/DetailCopy/canvas/index.vue | 5 +- src/component/DetailCopy/designDetail.vue | 62 ++- .../DetailCopy/detailLeft/colorBox/index.vue | 15 +- .../DetailCopy/detailLeft/colorBox/pallet.vue | 2 +- .../DetailCopy/detailLeft/colorBox/upload.vue | 2 +- src/component/DetailCopy/detailLeft/index.vue | 2 +- .../detailLeft/module/libraryList.vue | 19 +- .../detailLeft/module/selectList.vue | 15 +- .../detailRight/editPrintElement.vue | 13 +- .../DetailCopy/detailRight/sketchType.vue | 2 +- src/component/DetailCopy/model/index.vue | 34 +- src/component/DetailCopy/model/modelNav.vue | 10 +- .../DetailCopy/model/modelPosition.vue | 21 +- src/component/HomePage/Cropper.vue | 48 +- src/component/HomePage/Generate.vue | 84 ++- src/component/HomePage/Material.vue | 2 +- .../HomePage/NewCollectionReview.vue | 4 +- src/component/HomePage/SketchboardUpload.vue | 4 +- src/component/HomePage/generalMenu.vue | 31 +- src/component/HomePage/index/index.vue | 5 +- .../model/collection/ColorboardUpload.vue | 10 +- .../model/collection/MoodboardUpload.vue | 1 + .../model/collection/PrintboardUpload.vue | 1 + .../model/collection/SketchboardUpload.vue | 5 +- .../deReconstruction/canvas/argument.vue | 8 + .../deReconstruction/canvas/canvasContent.vue | 8 +- .../HomePage/index/model/design/index.vue | 201 ++++--- .../HomePage/index/model/mannequin/edit.vue | 42 +- .../HomePage/index/model/mannequin/index.vue | 73 ++- .../index/model/patternMaking3D/download.vue | 37 +- .../index/model/patternMaking3D/index.vue | 9 +- .../index/model/patternMaking3D/three.vue | 8 +- .../index/model/poseTransfer/index.vue | 177 ++++-- .../HomePage/index/model/toProduct/index.vue | 175 +++--- .../HomePage/index/workflow/content/index.vue | 14 +- .../workflow/content/printingDesign3D.vue | 2 +- .../index/workflow/content/seriesDesign.vue | 8 +- .../workflow/content/singleProductDesign.vue | 2 +- .../index/workflow/content/sketchDesign.vue | 9 +- .../HomePage/index/workflow/index.vue | 143 ++--- .../HomePage/index/workflow/navBox.vue | 15 +- .../HomePage/index/workflow/workspace.vue | 13 +- src/component/HomePage/scaleImage.vue | 55 +- src/component/LibraryPage/brandDetail.vue | 144 ++++- src/component/LibraryPage/createBrand.vue | 29 +- src/component/WorksPage/publish.vue | 3 +- src/component/modules/generalDrag.vue | 128 +++-- src/component/modules/liquefaction.vue | 41 +- src/lang/cn.ts | 36 +- src/lang/en.ts | 40 +- src/store/Detail/designDetailCopy.ts | 5 +- src/store/homeStore/homeStore.ts | 1 + src/store/uploadFile/uploadFile.ts | 19 +- src/store/workspace/workspace.ts | 4 +- src/tool/canvasGeneralCopy.js | 518 +++++++++++++----- src/tool/https.js | 11 +- src/tool/listData.js | 81 ++- src/views/HomeMain.vue | 1 + src/views/HomeRecommend.vue | 1 + src/views/HomeView/history.vue | 10 +- src/views/HomeView/library.vue | 51 +- src/views/Register.vue | 1 + tsconfig.json | 11 +- 76 files changed, 1969 insertions(+), 970 deletions(-) diff --git a/src/assets/images/homePage/sketchDesign.png b/src/assets/images/homePage/sketchDesign.png index 808d32e89ae9f9cc66d757924b6e34ca328fc989..d4d8da90100d28f34da5e7ca078dc0ce872c86a4 100644 GIT binary patch literal 6974 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 literal 700 zcmV;t0z>_YP)`8dH&q} zf|*T*+4tLTcdLLro+9E)L>&5jT3y#32LM1}LIAlmv-g*X_>}&3A_M?1RaIr$MHX2K zuWvjHGMYuiuZZ|+Pyqmnm`B9VH1Fz62%v;zN~yhGP5=Nd>RouXE=4Yv`goeQpvQ>V z-TEEcfdH5)?LcI5I$7FA#HwvOwv_-%YEtSC?Lhzl#mv)u>tmZQ5J}19S_yw25f9f= zs+9l$rpihHnfz_Cv`ni4S6K;QDDP8B{cOYm0E$@Nx@lMlU`VsnxAx7b0{|3pQ{mOR z6uGqR0N3K zdP@HT0Fc+k!fVx`jRQ(Jwg=U9-Rg{60QgsE2O^U`bN6j(4>|||jLD|1YwbY*Oj1=< z=3I=yvG6JcFcwWJUE3H8z*GqVjL1d^U@VSnq(T4yQzZm2634=;<}`BY^22s^OsEh5 zz*GqVjKp#N|JKvsPM#y;vDuj70RZryP<$naEQMD`gmMq7h3a=kdFK874 z7}6nC|CdG`0HC;63$NON7|Kg}3HL@E0HCNt+5o(L?Ms9JhOkcoz(rsH0A<}&c-0O> zY2Qybq5uF;#6Hctu6AAs0hHAAq0Mao1^_6oRpC`T5GDNC0Q_up0RW0ywLN%62q3q! zb7%noD57)WRR|!bo%8 .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte padding: 1rem 2rem; } .generalModel_state .generalModel_state_item > input { - height: 2.5rem !important; + height: 6rem !important; + padding: 1rem !important; border-radius: 1rem; - padding: calc(2rem - 1px * 2) !important; - box-sizing: content-box; + box-sizing: border-box; background-color: #f3f3f3; background-color: #fff; - width: calc(100% - 4rem); + width: 25rem; font-size: 1.8rem; transition: all 0.3s; border: 1px solid; @@ -754,9 +754,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte width: calc(100% - 4rem); border: 1px solid #000; } -.generalModel_state .generalModel_state_item .ant-select-selector { - border-radius: 4rem; -} .generalModel_state .generalModel_state_item .ant-picker-input > input { font-size: 1.8rem; } @@ -898,6 +895,9 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .generalModel.fullScreen > .ant-modal-body { padding: 2.5rem 3rem; } +.generalModel.fullScreen .generalModel_btn .generalModel_closeIcon { + transform: translate(-100%, 100%); +} .generalModel .ant-modal-content { border-radius: 3rem; height: 100%; @@ -1165,18 +1165,9 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte z-index: 9999 !important; top: 6rem; } -.ant-modal-confirm-btns .ant-btn:hover { - color: #fff !important; - border-color: #39215b !important; -} .ant-modal-confirm-btns .ant-btn-primary { - background: #39215b !important; - border-color: #39215b !important; -} -.ant-modal-confirm-btns .ant-btn-primary:hover { - color: #fff !important; - border-color: #543087 !important; - background: #543087 !important; + background: #000 !important; + border-color: #000 !important; } .ant-spin-dot-item { background-color: #000000; @@ -1617,6 +1608,7 @@ textarea:focus { } .upload_item .upload_file_item .ant-upload-picture-card-wrapper .ant-upload-select-picture-card .fi-br-upload { font-size: 2rem; + display: flex; color: #000; } .upload_item .upload_file_item.upload_file_item:last-child { @@ -1680,6 +1672,7 @@ textarea:focus { .design_detail_modal_component .input_border, .library_page .input_border, .productImg_content .input_border, +.poseTransfer .input_border, .scaleImage_modal .input_border, .accountEdit_page .input_border, .generalMenu_printModel_upload .input_border, @@ -1696,6 +1689,7 @@ textarea:focus { .design_detail_modal_component .input_border .input_box, .library_page .input_border .input_box, .productImg_content .input_border .input_box, +.poseTransfer .input_border .input_box, .scaleImage_modal .input_border .input_box, .accountEdit_page .input_border .input_box, .generalMenu_printModel_upload .input_border .input_box, @@ -1706,11 +1700,13 @@ textarea:focus { display: flex; align-items: center; flex-wrap: wrap; + justify-content: space-between; } .collection_modal_body .input_border .input_box .inputShowText, .design_detail_modal_component .input_border .input_box .inputShowText, .library_page .input_border .input_box .inputShowText, .productImg_content .input_border .input_box .inputShowText, +.poseTransfer .input_border .input_box .inputShowText, .scaleImage_modal .input_border .input_box .inputShowText, .accountEdit_page .input_border .input_box .inputShowText, .generalMenu_printModel_upload .input_border .input_box .inputShowText, @@ -1722,29 +1718,32 @@ textarea:focus { .design_detail_modal_component .input_border .input_box.active .input_box_btnBox, .library_page .input_border .input_box.active .input_box_btnBox, .productImg_content .input_border .input_box.active .input_box_btnBox, +.poseTransfer .input_border .input_box.active .input_box_btnBox, .scaleImage_modal .input_border .input_box.active .input_box_btnBox, .accountEdit_page .input_border .input_box.active .input_box_btnBox, .generalMenu_printModel_upload .input_border .input_box.active .input_box_btnBox, .generate .input_border .input_box.active .input_box_btnBox, -.collection_modal_body .input_border .input_box.active textarea, -.design_detail_modal_component .input_border .input_box.active textarea, -.library_page .input_border .input_box.active textarea, -.productImg_content .input_border .input_box.active textarea, -.scaleImage_modal .input_border .input_box.active textarea, -.accountEdit_page .input_border .input_box.active textarea, -.generalMenu_printModel_upload .input_border .input_box.active textarea, -.generate .input_border .input_box.active textarea { +.collection_modal_body .input_border .input_box.active .search_textarea, +.design_detail_modal_component .input_border .input_box.active .search_textarea, +.library_page .input_border .input_box.active .search_textarea, +.productImg_content .input_border .input_box.active .search_textarea, +.poseTransfer .input_border .input_box.active .search_textarea, +.scaleImage_modal .input_border .input_box.active .search_textarea, +.accountEdit_page .input_border .input_box.active .search_textarea, +.generalMenu_printModel_upload .input_border .input_box.active .search_textarea, +.generate .input_border .input_box.active .search_textarea { border: 1px solid #ff0001; box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); } -.collection_modal_body .input_border .input_box.active span, -.design_detail_modal_component .input_border .input_box.active span, -.library_page .input_border .input_box.active span, -.productImg_content .input_border .input_box.active span, -.scaleImage_modal .input_border .input_box.active span, -.accountEdit_page .input_border .input_box.active span, -.generalMenu_printModel_upload .input_border .input_box.active span, -.generate .input_border .input_box.active span { +.collection_modal_body .input_border .input_box.active .inputShowText, +.design_detail_modal_component .input_border .input_box.active .inputShowText, +.library_page .input_border .input_box.active .inputShowText, +.productImg_content .input_border .input_box.active .inputShowText, +.poseTransfer .input_border .input_box.active .inputShowText, +.scaleImage_modal .input_border .input_box.active .inputShowText, +.accountEdit_page .input_border .input_box.active .inputShowText, +.generalMenu_printModel_upload .input_border .input_box.active .inputShowText, +.generate .input_border .input_box.active .inputShowText { opacity: 1; display: block; color: rgba(255, 0, 0.7); @@ -1753,6 +1752,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_keyword, .library_page .input_border .search_keyword, .productImg_content .input_border .search_keyword, +.poseTransfer .input_border .search_keyword, .scaleImage_modal .input_border .search_keyword, .accountEdit_page .input_border .search_keyword, .generalMenu_printModel_upload .input_border .search_keyword, @@ -1764,6 +1764,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_keyword .search_keyword_center, .library_page .input_border .search_keyword .search_keyword_center, .productImg_content .input_border .search_keyword .search_keyword_center, +.poseTransfer .input_border .search_keyword .search_keyword_center, .scaleImage_modal .input_border .search_keyword .search_keyword_center, .accountEdit_page .input_border .search_keyword .search_keyword_center, .generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center, @@ -1784,6 +1785,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .productImg_content .input_border .search_keyword .search_keyword_center .search_keyword_center_left, +.poseTransfer .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .scaleImage_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center .search_keyword_center_left, @@ -1797,6 +1799,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .productImg_content .input_border .search_keyword .search_keyword_center .search_keyword_center_item, +.poseTransfer .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .scaleImage_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center .search_keyword_center_item, @@ -1815,6 +1818,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .productImg_content .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, +.poseTransfer .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .scaleImage_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, @@ -1825,6 +1829,7 @@ textarea:focus { .design_detail_modal_component .input_border .input_box_btnBox, .library_page .input_border .input_box_btnBox, .productImg_content .input_border .input_box_btnBox, +.poseTransfer .input_border .input_box_btnBox, .scaleImage_modal .input_border .input_box_btnBox, .accountEdit_page .input_border .input_box_btnBox, .generalMenu_printModel_upload .input_border .input_box_btnBox, @@ -1838,21 +1843,43 @@ textarea:focus { padding: 1.5rem 2rem; padding-right: 0; background-color: #fff; + flex: 1; } .collection_modal_body .input_border .input_box_btnBox.sketch, .design_detail_modal_component .input_border .input_box_btnBox.sketch, .library_page .input_border .input_box_btnBox.sketch, .productImg_content .input_border .input_box_btnBox.sketch, +.poseTransfer .input_border .input_box_btnBox.sketch, .scaleImage_modal .input_border .input_box_btnBox.sketch, .accountEdit_page .input_border .input_box_btnBox.sketch, .generalMenu_printModel_upload .input_border .input_box_btnBox.sketch, .generate .input_border .input_box_btnBox.sketch { padding: 0; } +.collection_modal_body .input_border .input_box_btnBox > .textarea, +.design_detail_modal_component .input_border .input_box_btnBox > .textarea, +.library_page .input_border .input_box_btnBox > .textarea, +.productImg_content .input_border .input_box_btnBox > .textarea, +.poseTransfer .input_border .input_box_btnBox > .textarea, +.scaleImage_modal .input_border .input_box_btnBox > .textarea, +.accountEdit_page .input_border .input_box_btnBox > .textarea, +.generalMenu_printModel_upload .input_border .input_box_btnBox > .textarea, +.generate .input_border .input_box_btnBox > .textarea { + border-radius: 1rem; + min-height: 2rem; + max-height: 20rem; + border: none; + resize: none; + height: 2.7rem; + font-size: 1.8rem; + flex: 1; + line-height: 2rem; +} .collection_modal_body .input_border .input_box_btnBox .ant-spin-text, .design_detail_modal_component .input_border .input_box_btnBox .ant-spin-text, .library_page .input_border .input_box_btnBox .ant-spin-text, .productImg_content .input_border .input_box_btnBox .ant-spin-text, +.poseTransfer .input_border .input_box_btnBox .ant-spin-text, .scaleImage_modal .input_border .input_box_btnBox .ant-spin-text, .accountEdit_page .input_border .input_box_btnBox .ant-spin-text, .generalMenu_printModel_upload .input_border .input_box_btnBox .ant-spin-text, @@ -1863,6 +1890,7 @@ textarea:focus { .design_detail_modal_component .input_border .input_box_btnBox .search_seed, .library_page .input_border .input_box_btnBox .search_seed, .productImg_content .input_border .input_box_btnBox .search_seed, +.poseTransfer .input_border .input_box_btnBox .search_seed, .scaleImage_modal .input_border .input_box_btnBox .search_seed, .accountEdit_page .input_border .input_box_btnBox .search_seed, .generalMenu_printModel_upload .input_border .input_box_btnBox .search_seed, @@ -1877,6 +1905,7 @@ textarea:focus { .design_detail_modal_component .input_border .input_box_btnBox .upload_item, .library_page .input_border .input_box_btnBox .upload_item, .productImg_content .input_border .input_box_btnBox .upload_item, +.poseTransfer .input_border .input_box_btnBox .upload_item, .scaleImage_modal .input_border .input_box_btnBox .upload_item, .accountEdit_page .input_border .input_box_btnBox .upload_item, .generalMenu_printModel_upload .input_border .input_box_btnBox .upload_item, @@ -1887,6 +1916,7 @@ textarea:focus { .design_detail_modal_component .input_border .input_box_btnBox .upload_item .upload_file_item, .library_page .input_border .input_box_btnBox .upload_item .upload_file_item, .productImg_content .input_border .input_box_btnBox .upload_item .upload_file_item, +.poseTransfer .input_border .input_box_btnBox .upload_item .upload_file_item, .scaleImage_modal .input_border .input_box_btnBox .upload_item .upload_file_item, .accountEdit_page .input_border .input_box_btnBox .upload_item .upload_file_item, .generalMenu_printModel_upload .input_border .input_box_btnBox .upload_item .upload_file_item, @@ -1897,13 +1927,14 @@ textarea:focus { transform: translateY(-50%); height: 5.7rem; width: 5.7rem; - border-radius: 50%; + border-radius: 1rem; overflow: hidden; } .collection_modal_body .input_border input, .design_detail_modal_component .input_border input, .library_page .input_border input, .productImg_content .input_border input, +.poseTransfer .input_border input, .scaleImage_modal .input_border input, .accountEdit_page .input_border input, .generalMenu_printModel_upload .input_border input, @@ -1921,6 +1952,7 @@ textarea:focus { .design_detail_modal_component .input_border inputinput:-moz-placeholder, .library_page .input_border inputinput:-moz-placeholder, .productImg_content .input_border inputinput:-moz-placeholder, +.poseTransfer .input_border inputinput:-moz-placeholder, .scaleImage_modal .input_border inputinput:-moz-placeholder, .accountEdit_page .input_border inputinput:-moz-placeholder, .generalMenu_printModel_upload .input_border inputinput:-moz-placeholder, @@ -1931,6 +1963,7 @@ textarea:focus { .design_detail_modal_component .input_border inputinput:-ms-input-placeholder, .library_page .input_border inputinput:-ms-input-placeholder, .productImg_content .input_border inputinput:-ms-input-placeholder, +.poseTransfer .input_border inputinput:-ms-input-placeholder, .scaleImage_modal .input_border inputinput:-ms-input-placeholder, .accountEdit_page .input_border inputinput:-ms-input-placeholder, .generalMenu_printModel_upload .input_border inputinput:-ms-input-placeholder, @@ -1941,6 +1974,7 @@ textarea:focus { .design_detail_modal_component .input_border inputinput::-webkit-input-placeholder, .library_page .input_border inputinput::-webkit-input-placeholder, .productImg_content .input_border inputinput::-webkit-input-placeholder, +.poseTransfer .input_border inputinput::-webkit-input-placeholder, .scaleImage_modal .input_border inputinput::-webkit-input-placeholder, .accountEdit_page .input_border inputinput::-webkit-input-placeholder, .generalMenu_printModel_upload .input_border inputinput::-webkit-input-placeholder, @@ -1951,6 +1985,7 @@ textarea:focus { .design_detail_modal_component .input_border input.forbidden, .library_page .input_border input.forbidden, .productImg_content .input_border input.forbidden, +.poseTransfer .input_border input.forbidden, .scaleImage_modal .input_border input.forbidden, .accountEdit_page .input_border input.forbidden, .generalMenu_printModel_upload .input_border input.forbidden, @@ -1961,6 +1996,7 @@ textarea:focus { .design_detail_modal_component .input_border .input_box_btnBox_upImg, .library_page .input_border .input_box_btnBox_upImg, .productImg_content .input_border .input_box_btnBox_upImg, +.poseTransfer .input_border .input_box_btnBox_upImg, .scaleImage_modal .input_border .input_box_btnBox_upImg, .accountEdit_page .input_border .input_box_btnBox_upImg, .generalMenu_printModel_upload .input_border .input_box_btnBox_upImg, @@ -1971,6 +2007,7 @@ textarea:focus { .design_detail_modal_component .input_border .fi, .library_page .input_border .fi, .productImg_content .input_border .fi, +.poseTransfer .input_border .fi, .scaleImage_modal .input_border .fi, .accountEdit_page .input_border .fi, .generalMenu_printModel_upload .input_border .fi, @@ -1990,6 +2027,7 @@ textarea:focus { .design_detail_modal_component .input_border .fi.fi-br-loading, .library_page .input_border .fi.fi-br-loading, .productImg_content .input_border .fi.fi-br-loading, +.poseTransfer .input_border .fi.fi-br-loading, .scaleImage_modal .input_border .fi.fi-br-loading, .accountEdit_page .input_border .fi.fi-br-loading, .generalMenu_printModel_upload .input_border .fi.fi-br-loading, @@ -2001,6 +2039,7 @@ textarea:focus { .design_detail_modal_component .input_border .fi.active, .library_page .input_border .fi.active, .productImg_content .input_border .fi.active, +.poseTransfer .input_border .fi.active, .scaleImage_modal .input_border .fi.active, .accountEdit_page .input_border .fi.active, .generalMenu_printModel_upload .input_border .fi.active, @@ -2011,6 +2050,7 @@ textarea:focus { .design_detail_modal_component .input_border .fi.forbidden, .library_page .input_border .fi.forbidden, .productImg_content .input_border .fi.forbidden, +.poseTransfer .input_border .fi.forbidden, .scaleImage_modal .input_border .fi.forbidden, .accountEdit_page .input_border .fi.forbidden, .generalMenu_printModel_upload .input_border .fi.forbidden, @@ -2021,6 +2061,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_upImg, .library_page .input_border .search_upImg, .productImg_content .input_border .search_upImg, +.poseTransfer .input_border .search_upImg, .scaleImage_modal .input_border .search_upImg, .accountEdit_page .input_border .search_upImg, .generalMenu_printModel_upload .input_border .search_upImg, @@ -2035,6 +2076,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_upImg span, .library_page .input_border .search_upImg span, .productImg_content .input_border .search_upImg span, +.poseTransfer .input_border .search_upImg span, .scaleImage_modal .input_border .search_upImg span, .accountEdit_page .input_border .search_upImg span, .generalMenu_printModel_upload .input_border .search_upImg span, @@ -2046,6 +2088,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_upImg .ant-upload-select-picture-card, .library_page .input_border .search_upImg .ant-upload-select-picture-card, .productImg_content .input_border .search_upImg .ant-upload-select-picture-card, +.poseTransfer .input_border .search_upImg .ant-upload-select-picture-card, .scaleImage_modal .input_border .search_upImg .ant-upload-select-picture-card, .accountEdit_page .input_border .search_upImg .ant-upload-select-picture-card, .generalMenu_printModel_upload .input_border .search_upImg .ant-upload-select-picture-card, @@ -2058,6 +2101,7 @@ textarea:focus { .design_detail_modal_component .input_border .search_textarea, .library_page .input_border .search_textarea, .productImg_content .input_border .search_textarea, +.poseTransfer .input_border .search_textarea, .scaleImage_modal .input_border .search_textarea, .accountEdit_page .input_border .search_textarea, .generalMenu_printModel_upload .input_border .search_textarea, @@ -2077,6 +2121,7 @@ textarea:focus { .design_detail_modal_component .input_border .generage_btn_box, .library_page .input_border .generage_btn_box, .productImg_content .input_border .generage_btn_box, +.poseTransfer .input_border .generage_btn_box, .scaleImage_modal .input_border .generage_btn_box, .accountEdit_page .input_border .generage_btn_box, .generalMenu_printModel_upload .input_border .generage_btn_box, @@ -2085,10 +2130,22 @@ textarea:focus { display: flex; align-items: center; } +.collection_modal_body .input_border .generage_btn_box .generage_btn, +.design_detail_modal_component .input_border .generage_btn_box .generage_btn, +.library_page .input_border .generage_btn_box .generage_btn, +.productImg_content .input_border .generage_btn_box .generage_btn, +.poseTransfer .input_border .generage_btn_box .generage_btn, +.scaleImage_modal .input_border .generage_btn_box .generage_btn, +.accountEdit_page .input_border .generage_btn_box .generage_btn, +.generalMenu_printModel_upload .input_border .generage_btn_box .generage_btn, +.generate .input_border .generage_btn_box .generage_btn { + width: 10rem; +} .collection_modal_body .input_border .generage_btn_box .icon-xiala, .design_detail_modal_component .input_border .generage_btn_box .icon-xiala, .library_page .input_border .generage_btn_box .icon-xiala, .productImg_content .input_border .generage_btn_box .icon-xiala, +.poseTransfer .input_border .generage_btn_box .icon-xiala, .scaleImage_modal .input_border .generage_btn_box .icon-xiala, .accountEdit_page .input_border .generage_btn_box .icon-xiala, .generalMenu_printModel_upload .input_border .generage_btn_box .icon-xiala, @@ -2101,6 +2158,7 @@ textarea:focus { .design_detail_modal_component .input_border .generage_btn_box .icon-xiala.active, .library_page .input_border .generage_btn_box .icon-xiala.active, .productImg_content .input_border .generage_btn_box .icon-xiala.active, +.poseTransfer .input_border .generage_btn_box .icon-xiala.active, .scaleImage_modal .input_border .generage_btn_box .icon-xiala.active, .accountEdit_page .input_border .generage_btn_box .icon-xiala.active, .generalMenu_printModel_upload .input_border .generage_btn_box .icon-xiala.active, @@ -2111,6 +2169,7 @@ textarea:focus { .design_detail_modal_component .input_border .generage_btn_box .content, .library_page .input_border .generage_btn_box .content, .productImg_content .input_border .generage_btn_box .content, +.poseTransfer .input_border .generage_btn_box .content, .scaleImage_modal .input_border .generage_btn_box .content, .accountEdit_page .input_border .generage_btn_box .content, .generalMenu_printModel_upload .input_border .generage_btn_box .content, @@ -2118,17 +2177,19 @@ textarea:focus { position: absolute; top: 100%; width: calc(100% - 2rem); - left: 2rem; + left: 0rem; text-align: center; border-radius: calc(1rem*1.2); overflow: hidden; z-index: 3; margin-top: 0.2rem; + margin-left: 2rem; } .collection_modal_body .input_border .generage_btn_box .content > div, .design_detail_modal_component .input_border .generage_btn_box .content > div, .library_page .input_border .generage_btn_box .content > div, .productImg_content .input_border .generage_btn_box .content > div, +.poseTransfer .input_border .generage_btn_box .content > div, .scaleImage_modal .input_border .generage_btn_box .content > div, .accountEdit_page .input_border .generage_btn_box .content > div, .generalMenu_printModel_upload .input_border .generage_btn_box .content > div, @@ -2141,10 +2202,22 @@ textarea:focus { overflow: hidden; text-overflow: ellipsis; } +.collection_modal_body .input_border .generage_btn_box .content > div.active, +.design_detail_modal_component .input_border .generage_btn_box .content > div.active, +.library_page .input_border .generage_btn_box .content > div.active, +.productImg_content .input_border .generage_btn_box .content > div.active, +.poseTransfer .input_border .generage_btn_box .content > div.active, +.scaleImage_modal .input_border .generage_btn_box .content > div.active, +.accountEdit_page .input_border .generage_btn_box .content > div.active, +.generalMenu_printModel_upload .input_border .generage_btn_box .content > div.active, +.generate .input_border .generage_btn_box .content > div.active { + background-color: #616161; +} .collection_modal_body .input_border .generage_btn_box .content > div:hover, .design_detail_modal_component .input_border .generage_btn_box .content > div:hover, .library_page .input_border .generage_btn_box .content > div:hover, .productImg_content .input_border .generage_btn_box .content > div:hover, +.poseTransfer .input_border .generage_btn_box .content > div:hover, .scaleImage_modal .input_border .generage_btn_box .content > div:hover, .accountEdit_page .input_border .generage_btn_box .content > div:hover, .generalMenu_printModel_upload .input_border .generage_btn_box .content > div:hover, @@ -2155,6 +2228,7 @@ textarea:focus { .design_detail_modal_component .input_border .generage_btn, .library_page .input_border .generage_btn, .productImg_content .input_border .generage_btn, +.poseTransfer .input_border .generage_btn, .scaleImage_modal .input_border .generage_btn, .accountEdit_page .input_border .generage_btn, .generalMenu_printModel_upload .input_border .generage_btn, @@ -2164,6 +2238,7 @@ textarea:focus { font-size: 1.8rem; padding: 1rem 2rem; box-sizing: content-box; + justify-content: center; } .hideChecked { user-select: none; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 658e5c29..50d5a2a0 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -793,14 +793,16 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte } >input{ - height: 2.5rem !important; + height: 6rem !important; + box-sizing: border-box; + padding: 1rem !important; border-radius: 1rem; // border-radius: 4rem; - padding: calc(2rem - 1px * 2) !important; - box-sizing: content-box; + // box-sizing: content-box; + box-sizing: border-box; background-color: #f3f3f3; background-color: #fff; - width: calc(100% - 4rem); + width: 25rem; font-size: 1.8rem; transition: all .3s; border: 1px solid; @@ -827,9 +829,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte width: calc(100% - 4rem); border: 1px solid #000; } - .ant-select-selector{ - border-radius: 4rem; - } .ant-picker-input > input{ font-size: 1.8rem; } @@ -977,6 +976,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte > .ant-modal-body{ padding: 2.5rem 3rem; } + .generalModel_btn { + .generalModel_closeIcon{ + transform: translate(-100%, 100%); + } + } } .ant-modal-content{ border-radius: 3rem; @@ -1280,18 +1284,9 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte top: 6rem; } .ant-modal-confirm-btns{ - .ant-btn:hover{ - color: #fff !important; - border-color: #39215b !important; - } .ant-btn-primary{ - background: #39215b !important; - border-color: #39215b !important; - } - .ant-btn-primary:hover{ - color: #fff !important; - border-color: #543087 !important; - background: #543087 !important; + background: #000 !important; + border-color: #000 !important; } } //loding样式 @@ -1759,6 +1754,7 @@ textarea:focus{ margin: 0; .fi-br-upload{ font-size: 2rem; + display: flex; color: #000; } } @@ -1827,7 +1823,7 @@ textarea:focus{ } //设计input和上传按钮样式 -.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_content,.scaleImage_modal,.accountEdit_page,.generalMenu_printModel_upload,.generate{ +.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_content,.poseTransfer,.scaleImage_modal,.accountEdit_page,.generalMenu_printModel_upload,.generate{ .input_border{ z-index: 2; display: flex; @@ -1843,17 +1839,18 @@ textarea:focus{ display: flex; align-items: center; flex-wrap: wrap; + justify-content: space-between; .inputShowText{ width: 100%; display: none; } &.active{ - .input_box_btnBox,textarea{ + .input_box_btnBox,.search_textarea{ // color: rgb(255, 0, .7); border: 1px solid rgb(255, 0, .7); box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); } - span{ + .inputShowText{ opacity: 1; display: block; color: rgba(255, 0, .7); @@ -1912,10 +1909,23 @@ textarea:focus{ padding: 1.5rem 2rem; padding-right: 0; background-color: #fff; + flex: 1; // border &.sketch{ padding: 0; } + > .textarea{ + border-radius: 1rem; + min-height: 2rem; + max-height: 20rem; + border: none; + resize: none; + height: 2.7rem; + font-size: 1.8rem; + flex: 1; + line-height: 2rem; + // overflow: hidden; + } .ant-spin-text{ font-size: 1.2rem; } @@ -1935,7 +1945,7 @@ textarea:focus{ transform: translateY(-50%); height: 5.7rem; width: 5.7rem; - border-radius: 50%; + border-radius: 1rem; overflow: hidden; } } @@ -2034,7 +2044,9 @@ textarea:focus{ position: relative; display: flex; align-items: center; - + .generage_btn{ + width: 10rem; + } .icon-xiala{ margin-left: 1rem; transition: all .3s; @@ -2047,12 +2059,13 @@ textarea:focus{ position: absolute; top: 100%; width: calc(100% - 2rem); - left: 2rem; + left: 0rem; text-align: center; border-radius: calc(1rem* 1.2); overflow: hidden; z-index: 3; margin-top: .2rem; + margin-left: 2rem; >div{ background: #cccccc; line-height: 2; @@ -2061,6 +2074,9 @@ textarea:focus{ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + &.active{ + background-color: #616161; + } } >div:hover{ background: #999999; @@ -2074,6 +2090,7 @@ textarea:focus{ font-size: 1.8rem; padding: 1rem 2rem; box-sizing: content-box; + justify-content: center; } } diff --git a/src/component/Canvas/argument.vue b/src/component/Canvas/argument.vue index e09700d1..70bb4d80 100644 --- a/src/component/Canvas/argument.vue +++ b/src/component/Canvas/argument.vue @@ -2,11 +2,11 @@
{{ $t('exportModel.Width') }}
- +
{{ $t('exportModel.Height') }}
- +
- {{item.name}}
@@ -148,6 +147,7 @@ } const addImage = (item:any)=>{ if(!item.minioUrl)item.minioUrl = item.imgUrl + item.imgUrl = item?.url || item?.designOutfitUrl || item?.imgUrl || item?.minioUrl canvasGeneral.addImage(item) } return { diff --git a/src/component/Canvas/canvasContent.vue b/src/component/Canvas/canvasContent.vue index 59854801..1728a32f 100644 --- a/src/component/Canvas/canvasContent.vue +++ b/src/component/Canvas/canvasContent.vue @@ -1,12 +1,12 @@ @@ -90,7 +92,7 @@ const openMenu = (event:any,item:any,index:number)=>{ if(event.preventDefault)event.preventDefault(); data.itemMenu = item; - data.itemMenu.index = index + // data.itemMenu.index = index let position = data.detailDom.getBoundingClientRect(); data.styleMenu = { left:event.clientX - position.left+'px', @@ -191,7 +193,6 @@ } }); if(str == 'up')time = setTimeout(()=>canvasGeneral.upLayerIndex(list),500) - } return { canvasGeneral, diff --git a/src/component/Canvas/index.vue b/src/component/Canvas/index.vue index fb61ac31..03bd6dee 100644 --- a/src/component/Canvas/index.vue +++ b/src/component/Canvas/index.vue @@ -20,7 +20,7 @@
{{ $t('exportModel.Export') }}
- +