diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 5acffe2e..b9e6b355 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -235,10 +235,10 @@ li { .started_btn { padding: 0 calc(1.8rem*1.2); display: inline-block; - border-radius: calc(2rem*1.2); + border-radius: 4rem; font-size: calc(1.2rem*1.2); color: #fff; - background-color: #39215b; + background-color: #000000; cursor: pointer; height: 3.3rem; line-height: 3.3rem; @@ -263,6 +263,10 @@ li { } .el-popper { padding: 0.5rem 1.1rem; + border: 2px solid; +} +.el-popper .el-popper__arrow { + display: none; } .hideEvents { pointer-events: none !important; @@ -1232,7 +1236,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .libraryPageCascader .cascader_btn_max { height: 4.5rem; width: 100%; - border-bottom: 1px solid #e1e1e1; display: flex; align-items: center; } @@ -1755,8 +1758,7 @@ textarea:focus { .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 { border-radius: 0.4rem; - border: solid 1px #39215b; - background-color: #8156bd; + background-color: #000000; margin-right: 1rem; margin-bottom: 1rem; padding: 0.5rem 1rem; @@ -1779,18 +1781,21 @@ textarea:focus { .productImg_modal .input_border .input_box_btnBox, .accountEdit_page .input_border .input_box_btnBox, .generalMenu_printModel_upload .input_border .input_box_btnBox { - border: calc(0.1rem*1.2) solid #F1F1F1; + border: 1px solid #000; + border-radius: 4rem; width: var(--width); display: flex; float: left; align-items: center; + padding: 1.5rem 2rem; + padding-right: 0; } -.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_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 { +.collection_modal_body .input_border .input_box_btnBox border .ant-spin-text, +.design_detail_modal_component .input_border .input_box_btnBox border .ant-spin-text, +.library_page .input_border .input_box_btnBox border .ant-spin-text, +.productImg_modal .input_border .input_box_btnBox border .ant-spin-text, +.accountEdit_page .input_border .input_box_btnBox border .ant-spin-text, +.generalMenu_printModel_upload .input_border .input_box_btnBox border .ant-spin-text { font-size: 1.2rem; } .collection_modal_body .input_border .input_box_btnBox .search_seed, @@ -1805,6 +1810,29 @@ textarea:focus { font-size: 1.2rem; border-right: calc(0.1rem*1.2) solid #F1F1F1; } +.collection_modal_body .input_border .input_box_btnBox .upload_item, +.design_detail_modal_component .input_border .input_box_btnBox .upload_item, +.library_page .input_border .input_box_btnBox .upload_item, +.productImg_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 { + width: 5.7rem; +} +.collection_modal_body .input_border .input_box_btnBox .upload_item .upload_file_item, +.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_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 { + position: absolute; + left: 0; + top: 50%; + transform: translateY(-50%); + height: 5.7rem; + width: 5.7rem; + border-radius: 50%; + overflow: hidden; +} .collection_modal_body .input_border input, .design_detail_modal_component .input_border input, .library_page .input_border input, @@ -1816,7 +1844,9 @@ textarea:focus { border: 1px solid rgba(0, 0, 0, 0.15); padding-left: calc(1.5rem*1.2); border: calc(0.1rem*1.2) solid #ffffff00; - font-size: calc(1.6rem*1.2); + font-size: 1.8rem; + height: 2.5rem; + line-height: 2.5rem; font-weight: 400; } .collection_modal_body .input_border inputinput:-moz-placeholder, @@ -2001,6 +2031,7 @@ textarea:focus { .generalMenu_printModel_upload .input_border .generage_btn_box .content > div { background: #cccccc; line-height: 2; + font-size: 1.8rem; cursor: pointer; white-space: nowrap; overflow: hidden; @@ -2022,6 +2053,9 @@ textarea:focus { .generalMenu_printModel_upload .input_border .generage_btn { margin-left: 2rem; display: flex; + font-size: 1.8rem; + padding: 1rem 2rem; + box-sizing: content-box; } .hideChecked { user-select: none; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 89f15aa5..d0d90154 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -242,10 +242,10 @@ input:focus{ .started_btn{ padding: 0 calc(1.8rem*1.2); display: inline-block; - border-radius: calc(2rem*1.2); + border-radius: 4rem; font-size: calc(1.2rem*1.2); color: #fff; - background-color: #39215b; + background-color: #000000; cursor: pointer; height: 3.3rem; line-height: 3.3rem; @@ -275,6 +275,10 @@ input:focus{ .el-popper{ padding: .5rem 1.1rem; + border: 2px solid; + .el-popper__arrow{ + display: none; + } } .hideEvents{ @@ -1342,7 +1346,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .cascader_btn_max{ height: 4.5rem; width: 100%; - border-bottom: 1px solid rgb(225 225 225); display: flex; align-items: center; .cascader_btn1{ @@ -1844,8 +1847,7 @@ textarea:focus{ } .search_keyword_center_item{ border-radius: .4rem; - border: solid 1px #39215b; - background-color: #8156bd; + background-color: #000000; margin-right: 1rem; margin-bottom: 1rem; padding: .5rem 1rem; @@ -1860,11 +1862,15 @@ textarea:focus{ } } .input_box_btnBox{ - border: calc(0.1rem*1.2) solid #F1F1F1; + border: 1px solid #000; + border-radius: 4rem; width: var(--width); display: flex; float: left; align-items: center; + padding: 1.5rem 2rem; + padding-right: 0; + border .ant-spin-text{ font-size: 1.2rem; } @@ -1875,6 +1881,19 @@ textarea:focus{ font-size: 1.2rem; border-right: calc(0.1rem* 1.2) solid #F1F1F1; } + .upload_item{ + width: 5.7rem; + .upload_file_item{ + position: absolute; + left: 0; + top: 50%; + transform: translateY(-50%); + height: 5.7rem; + width: 5.7rem; + border-radius: 50%; + overflow: hidden; + } + } } input{ @@ -1884,7 +1903,9 @@ textarea:focus{ padding-left: calc(1.5rem*1.2); border: calc(0.1rem*1.2) solid #ffffff00; // border: calc(0.1rem*1.2) solid #F1F1F1; - font-size: calc(1.6rem*1.2); + font-size: 1.8rem; + height: 2.5rem; + line-height: 2.5rem; font-weight: 400; &input:-moz-placeholder{ color: rgba(0,0,0,.15); @@ -1969,6 +1990,7 @@ textarea:focus{ position: relative; display: flex; align-items: center; + .icon-xiala{ margin-left: 1rem; transition: all .3s; @@ -1990,6 +2012,7 @@ textarea:focus{ >div{ background: #cccccc; line-height: 2; + font-size: 1.8rem; cursor: pointer; white-space: nowrap; overflow: hidden; @@ -2004,6 +2027,9 @@ textarea:focus{ // margin: 0 auto; margin-left: 2rem; display: flex; + font-size: 1.8rem; + padding: 1rem 2rem; + box-sizing: content-box; } } diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 5a4a2ccc..08742c77 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -1364,8 +1364,8 @@ export default defineComponent({ margin: 0; margin-bottom: calc(2rem*1.2); - width: calc(9rem*1.2); - height: calc(9rem*1.2); + width: 10rem; + height: 10rem; display: flex; align-items: center; justify-content: center; diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 14b426a9..d0f33fcf 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -15,7 +15,7 @@
-
+