diff --git a/.env.dev b/.env.dev index 9355c106..070bec3a 100644 --- a/.env.dev +++ b/.env.dev @@ -8,5 +8,5 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # 徐佩 # VUE_APP_BASE_URL = 'http://192.168.1.4:5567' # 海波 -# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.2:5567' diff --git a/public/image/events/AiDA2025-Cn.jpg b/public/image/events/AiDA2025-Cn.jpg new file mode 100644 index 00000000..7734147c Binary files /dev/null and b/public/image/events/AiDA2025-Cn.jpg differ diff --git a/public/image/events/AiDA2025-En.jpg b/public/image/events/AiDA2025-En.jpg new file mode 100644 index 00000000..d3285bf0 Binary files /dev/null and b/public/image/events/AiDA2025-En.jpg differ diff --git a/public/js/fabric.brushes.js b/public/js/fabric.brushes.js index e6ecf90c..c5e63310 100644 --- a/public/js/fabric.brushes.js +++ b/public/js/fabric.brushes.js @@ -127,7 +127,6 @@ fabric.Point.prototype.normalize = function(thickness) { * This makes the drawing editable, it can be moved, rotated, scaled, skewed etc. */ fabric.BaseBrush.prototype.convertToPath = function() { - console.log(this.canvas.upperCanvasEl); var pixelRatio = this.canvas.getRetinaScaling(), c = fabric.util.copyCanvasElement(this.canvas.upperCanvasEl), xy = fabric.util.trimCanvas(c), @@ -147,13 +146,16 @@ fabric.BaseBrush.prototype.convertToPath = function() { strokeWidth: this._width, stroke: 'black', fill:'transparent', + custom:{ + dashed:true + }, }).setCoords(); let group = new fabric.Group([pathElemetn],{ left:((xy.x)/pixelRatio-pointerX)/this.canvas.getZoom(), top:((xy.y)/pixelRatio-pointerY)/this.canvas.getZoom(), custom:{ dashed:true - } + }, }) this.canvas.add(group).clearContext(this.canvas.contextTop); diff --git a/src/assets/images/homePage/bankCard.svg b/src/assets/images/homePage/bankCard.svg deleted file mode 100644 index d81974d9..00000000 --- a/src/assets/images/homePage/bankCard.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/images/homePage/stripe.svg b/src/assets/images/homePage/stripe.svg new file mode 100644 index 00000000..a5db7e9b --- /dev/null +++ b/src/assets/images/homePage/stripe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon/details_color.png b/src/assets/images/icon/details_color.png new file mode 100644 index 00000000..6233167d Binary files /dev/null and b/src/assets/images/icon/details_color.png differ diff --git a/src/assets/images/icon/details_elements.png b/src/assets/images/icon/details_elements.png new file mode 100644 index 00000000..c08eabb4 Binary files /dev/null and b/src/assets/images/icon/details_elements.png differ diff --git a/src/assets/images/icon/details_print.png b/src/assets/images/icon/details_print.png new file mode 100644 index 00000000..6c5fb08a Binary files /dev/null and b/src/assets/images/icon/details_print.png differ diff --git a/src/assets/images/icon/details_sketch.png b/src/assets/images/icon/details_sketch.png new file mode 100644 index 00000000..328fed1b Binary files /dev/null and b/src/assets/images/icon/details_sketch.png differ diff --git a/src/assets/json/events.json b/src/assets/json/events.json index b3231f11..018fecae 100644 --- a/src/assets/json/events.json +++ b/src/assets/json/events.json @@ -8,7 +8,11 @@ "id": 2, "title":"AiDA X SFT AI Fashion Award 2024", "imgUrl": "/image/events/Fashion-Award-2024.png" - } + },{ + "id": 3, + "title":"✨New Year 2025！🎉Let's kick off the year with a burst of inspiration and design!", + "imgUrl": "/image/events/AiDA2025-En.jpg" + } ], "eventsItem":[ { @@ -88,6 +92,53 @@ ] } ] + },{ + "id":3, + "title":"✨New Year 2025！🎉Let's kick off the year with a burst of inspiration and design!", + "imgUrl": "/image/events/AiDA2025-En.jpg", + "textList":[ + { + "paragraph":[ + { + "text":"Share your work and get 1 month of free access to AiDA！" + } + ] + },{ + "paragraph":[ + { + "text":" Just do the following:" + } + ] + },{ + "paragraph":[ + { + "text":" ✅Share your designs on AiDA's Gallery " + },{ + "text":" ✅Add the tag #NewYear_2025 in the work description" + },{ + "text":" ✅At least 20 likes " + } + ] + },{ + "paragraph":[ + { + "text":"📅 Duration: January 1, 2025 – January 31, 2025" + } + ] + },{ + "paragraph":[ + { + "text":"Join in the fun and embark on a new year's journey of design. Mix your creativity with tech to make amazing, unique creations! Get your friends to help you seize this opportunity! Invite them to give your design some love with their likes～💗" + } + ] + },{ + "paragraph":[ + { + "text":"👍 AiDA is waiting for you to unlock a new world of design!" + } + ] + } + ] } ] } \ No newline at end of file diff --git a/src/assets/json/events_cn.json b/src/assets/json/events_cn.json index ce253a69..f4240123 100644 --- a/src/assets/json/events_cn.json +++ b/src/assets/json/events_cn.json @@ -8,7 +8,11 @@ "id": 2, "title":"AiDA X SFT AI时尚设计比赛2024", "imgUrl": "/image/events/Fashion-Award-2024.png" - } + },{ + "id": 3, + "title":"🎉搭上2025的列车！打开新设计的大门！", + "imgUrl": "/image/events/AiDA2025-Cn.jpg" + } ], "eventsItem":[ { @@ -88,6 +92,53 @@ ] } ] + },{ + "id":3, + "title":"🎉搭上2025的列车！打开新设计的大门！", + "imgUrl": "/image/events/AiDA2025-Cn.jpg", + "textList":[ + { + "paragraph":[ + { + "text":"快来发布作品获得1个月免费使用AiDA的福利！" + } + ] + },{ + "paragraph":[ + { + "text":" 只需要：" + } + ] + },{ + "paragraph":[ + { + "text":" ✅在AiDA将设计作品分享至广场/Gallery，" + },{ + "text":" ✅点赞至少20" + },{ + "text":" ✅在作品描述加上tag #NewYear_2025" + } + ] + },{ + "paragraph":[ + { + "text":"📅 活动时间：2025.1.1—2025.1.31" + } + ] + },{ + "paragraph":[ + { + "text":"快来参与，让我们共同开启新年的设计之旅，让创意与科技完美融合，创造出属于你的独一无二的作品！机会难得，叫上你的朋友们助你一臂之力，为你点上大拇指哦！" + } + ] + },{ + "paragraph":[ + { + "text":"👍 点赞即启程，AiDA等你来解锁设计新世界！" + } + ] + } + ] } ] } \ No newline at end of file diff --git a/src/assets/style/style.css b/src/assets/style/style.css index efad4e9c..7f2c6859 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -7,7 +7,7 @@ body, font-family: 'Roboto', sans-serif; overflow: hidden; --aida-fsize2: calc(2.6rem); - --aida-fsize1-8: calc(1.8rem*1.2); + --aida-fsize1-8: calc(1.8rem); --aida-fsize1-6: calc(1.6rem); --aida-fsize1-4: calc(1.4rem*1.2); --antd-wave-shadow-color: #39215b; @@ -217,6 +217,11 @@ li { box-sizing: border-box; white-space: nowrap; } +.gallery_btn.btnSamil { + padding: 0rem 2rem; + line-height: 4rem; + font-size: 1.6rem; +} .gallery_btn.gallery_btn_radius { border-radius: 1.4rem; } @@ -232,13 +237,21 @@ li { color: #fff; background-color: #000; } +.gallery_btn.white.active { + color: #fff; + background-color: #000; +} +.gallery_btn.active { + background-color: #fff; + color: #000; +} .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; @@ -261,57 +274,14 @@ li { transform: rotate(360deg); } } -.el-cascader { - font-size: 1.2rem; - width: 100%; - height: 3rem; - --el-color-primary: #d9d9d9; - --el-cascader-tag-background: #e1d9ec; -} -.el-cascader .el-input { - height: 100%; -} -.el-cascader .el-input .el-input__wrapper .el-input__inner { - height: 80% !important; - font-size: 1.2rem; +.el-popper.is-pure { + border: 1px solid; } .el-popper { padding: 0.5rem 1.1rem; } -.el-cascader__tags, -.el-cascader__collapse-tag { - --el-color-primary: #d9d9d9; - --el-cascader-tag-background: #e1d9ec; - --el-fill-color: #e1d9ec; - height: 100%; - width: 90% !important; - flex-wrap: nowrap; - overflow: hidden; - align-items: center; -} -.el-cascader__tags .el-tag--light, -.el-cascader__collapse-tag .el-tag--light { - margin: 0 0 0 0.6rem; - padding-right: 0.5rem; - height: 80%; - --el-icon-size: 1.4rem; - display: flex; -} -.el-cascader__tags .el-tag--light .el-tag__content, -.el-cascader__collapse-tag .el-tag--light .el-tag__content { - font-size: 1.4rem; - color: #000; -} -.el-cascader__tags .el-cascader__search-input, -.el-cascader__collapse-tag .el-cascader__search-input { - height: 100%; - margin: 0 0 0 1.1rem; -} -.el-cascader__collapse-tag { - margin-bottom: 0.5rem; -} -.el-cascader__collapse-tag .el-cascader__collapse-tag .el-tag--light { - display: flex !important; +.el-popper .el-popper__arrow { + display: none; } .hideEvents { pointer-events: none !important; @@ -728,18 +698,29 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte display: flex; align-items: center; margin-right: 5rem; + height: 6rem; +} +.generalModel_state .generalModel_state_item.smail > input { + padding: 1rem 2rem !important; +} +.generalModel_state .generalModel_state_item.smail .ant-picker-range, +.generalModel_state .generalModel_state_item.smail .ant-select-selector, +.generalModel_state .generalModel_state_item.smail .range_picker { + padding: 1rem 2rem !important; +} +.generalModel_state .generalModel_state_item.smail .el-cascader { + padding: 1rem 2rem; } .generalModel_state .generalModel_state_item > input { height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; + background-color: #fff; width: calc(100% - 4rem); font-size: 1.8rem; transition: all 0.3s; -} -.generalModel_state .generalModel_state_item > input:hover { border: 1px solid; } .generalModel_state .generalModel_state_item > span { @@ -757,10 +738,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .generalModel_state .generalModel_state_item .range_picker { height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; + background-color: #fff; width: calc(100% - 4rem); + border: 1px solid #000; } .generalModel_state .generalModel_state_item .ant-picker-input > input { font-size: 1.8rem; @@ -773,6 +756,77 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte display: flex; align-items: center; } +.generalModel_state .generalModel_state_item .el-cascader { + font-size: 1.8rem; + width: 100%; + border: 1px solid #dcdfe6; + border-radius: 4rem; + background-color: #fff; + height: 2.5rem; + padding: 2rem; + transition: all 0.3s; + box-sizing: content-box; + border: 1px solid; +} +.generalModel_state .generalModel_state_item .el-cascader .el-cascader__tags, +.generalModel_state .generalModel_state_item .el-cascader .el-input { + height: 100%; +} +.generalModel_state .generalModel_state_item .el-cascader .el-input .el-input__wrapper { + box-shadow: none; + padding: 0; + width: 100%; +} +.generalModel_state .generalModel_state_item .el-cascader .el-input .el-input__wrapper .el-input__inner { + font-size: 1.8rem; +} +.generalModel_state .generalModel_state_item .el-cascader__tags { + padding-left: 1rem; +} +.generalModel_state .generalModel_state_item .el-cascader__tags, +.generalModel_state .generalModel_state_item .el-cascader__collapse-tag { + --el-color-primary: #d9d9d9; + --el-cascader-tag-background: #000; + --el-fill-color: #e1d9ec; + box-sizing: content-box; + width: 90% !important; + flex-wrap: nowrap; + overflow: hidden; + align-items: center; +} +.generalModel_state .generalModel_state_item .el-cascader__tags .el-tag--light, +.generalModel_state .generalModel_state_item .el-cascader__collapse-tag .el-tag--light { + margin: 0 0 0 0.6rem; + padding-right: 0.5rem; + height: 70%; + --el-icon-size: 1.4rem; + display: flex; +} +.generalModel_state .generalModel_state_item .el-cascader__tags .el-tag--light .el-tag__content, +.generalModel_state .generalModel_state_item .el-cascader__collapse-tag .el-tag--light .el-tag__content { + font-size: 1.4rem; + color: #fff; +} +.generalModel_state .generalModel_state_item .el-cascader__tags .el-cascader__search-input, +.generalModel_state .generalModel_state_item .el-cascader__collapse-tag .el-cascader__search-input { + height: 100%; +} +.generalModel_state .generalModel_state_item .el-cascader__search-input, +.generalModel_state .generalModel_state_item .el-input__inner { + margin: 0; + width: 100%; + height: 4.6rem; + padding-left: 2.1rem; + line-height: 4.6rem; + font-size: 1.8rem; + box-sizing: border-box; +} +.generalModel_state .generalModel_state_item .el-cascader__collapse-tag { + margin-bottom: 0.5rem; +} +.generalModel_state .generalModel_state_item .el-cascader__collapse-tag .el-cascader__collapse-tag .el-tag--light { + display: flex !important; +} .generalModel_state .generalModel_current { background: #fff; width: 100%; @@ -801,6 +855,13 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .generalModel_state .header_user_content.active { display: block; } +.ant-select-dropdown { + border: 1px solid #000; + border-radius: 1rem; +} +.ant-select-dropdown .ant-select-item-option-selected:not(.ant-select-item-option-disabled) { + background-color: #f3f3f6; +} .generalModel { -moz-user-select: none; -webkit-user-select: none; @@ -811,6 +872,15 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte box-shadow: none; height: calc(65rem*1.2); } +.generalModel.fullScreen { + max-width: 100%; +} +.generalModel.fullScreen .ant-modal-content { + border-radius: 0rem; +} +.generalModel.fullScreen .ant-modal-body { + padding: 2.5rem 3rem; +} .generalModel .ant-modal-content { border-radius: 3rem; height: 100%; @@ -872,6 +942,14 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte display: flex; align-items: center; justify-content: center; + border-radius: 50%; + border: 1px solid; + z-index: 2; +} +@media (max-width: 768px) { + .generalModel .generalModel_btn .generalModel_closeIcon { + transform: translate(-100%, 100%); + } } .generalModel .generalModel_btn .generalModel_closeIcon.download { transform: translate(-100%, 100%); @@ -1029,10 +1107,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .sketchboard_upload_modal .switch_type_list.showEvents * { pointer-events: auto; } -.ant-modal-wrap { - height: 100vh; - overflow: auto; -} .ant-btn:hover, .ant-btn:focus, .ant-btn:active, @@ -1071,7 +1145,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte margin: 0 3rem 0 1rem; } .ant-message { - z-index: 1049 !important; + z-index: 9999 !important; top: 6rem; } .ant-modal-confirm-btns .ant-btn:hover { @@ -1088,7 +1162,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte background: #543087 !important; } .ant-spin-dot-item { - background-color: #543087; + background-color: #000000; } .ant-spin { color: #000; @@ -1169,6 +1243,16 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-pagination-prev:hover .ant-pagination-item-link, .ant-pagination-next:hover .ant-pagination-item-link { color: #000; + background-color: #fff; + border: 1px solid #000; +} +.ant-pagination-item:hover { + border: 1px solid #000; +} +.ant-pagination-prev .ant-pagination-item-link, +.ant-pagination-next .ant-pagination-item-link { + background-color: #000; + color: #fff; } .ant-pagination-item:hover a { color: #000; @@ -1179,7 +1263,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; } @@ -1532,10 +1615,14 @@ textarea:focus { .upload_item .upload_file_item .ant-upload-picture-card-wrapper .ant-upload-select-picture-card { width: calc(6rem*1.2); height: calc(6rem*1.2); - border: calc(0.3rem*1.2) solid #ededed; + border: calc(0.3rem*1.2) solid #000; border-radius: calc(1rem*1.2); margin: 0; } +.upload_item .upload_file_item .ant-upload-picture-card-wrapper .ant-upload-select-picture-card .fi-br-upload { + font-size: 2rem; + color: #000; +} .upload_item .upload_file_item.upload_file_item:last-child { margin: 0; } @@ -1602,12 +1689,11 @@ textarea:focus { z-index: 2; display: flex; align-items: center; - position: sticky; padding-bottom: calc(2rem*1.2); background: #fff; top: 0; flex-wrap: wrap; - --width: 70%; + --width: 65%; } .collection_modal_body .input_border .input_box, .design_detail_modal_component .input_border .input_box, @@ -1671,16 +1757,15 @@ textarea:focus { .productImg_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 { + margin-top: 1rem; justify-content: space-between; display: flex; width: var(--width); background-color: #fff; padding: 1rem 2rem; border-radius: 0 0 0.4rem 0.4rem; - border-top: solid 0 #f1f1f1; - border-right: solid 1px #f1f1f1; - border-left: solid 1px #f1f1f1; - border-bottom: solid 1px #f1f1f1; + border: 1px solid; + border-radius: 1rem; max-height: 30rem; overflow-y: scroll; } @@ -1702,8 +1787,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; @@ -1726,18 +1810,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, @@ -1752,6 +1839,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, @@ -1763,7 +1873,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, @@ -1948,6 +2060,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; @@ -1969,6 +2082,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 e2fefa50..59419bf7 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -7,7 +7,7 @@ html,body,#app{ overflow: hidden; // --antd-wave-shadow-color: #341e57; --aida-fsize2: calc(2.6rem); - --aida-fsize1-8: calc(1.8rem*1.2); + --aida-fsize1-8: calc(1.8rem); --aida-fsize1-6: calc(1.6rem); --aida-fsize1-4: calc(1.4rem*1.2); --antd-wave-shadow-color:#39215b; @@ -221,6 +221,11 @@ input:focus{ cursor: pointer; box-sizing: border-box; white-space: nowrap; + &.btnSamil{ + padding: 0rem 2rem; + line-height: 4rem; + font-size: 1.6rem; + } &.gallery_btn_radius{ border-radius: 1.4rem; } @@ -235,17 +240,26 @@ input:focus{ color: #fff; background-color: #000; } + &.active{ + color: #fff; + background-color: #000; + } } + &.active{ + background-color: #fff; + color: #000; + } + } //started公共按钮样式 .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; @@ -272,59 +286,16 @@ input:focus{ -.el-cascader{ - font-size: 1.2rem; - width: 100%; - height: 3rem; - --el-color-primary: #d9d9d9; - --el-cascader-tag-background:#e1d9ec; - .el-input{ - height: 100%; - .el-input__wrapper{ - .el-input__inner{ - height: 80% !important; - font-size: 1.2rem; - } - } - } +.el-popper.is-pure{ + border: 1px solid; } .el-popper{ padding: .5rem 1.1rem; -} -.el-cascader__tags,.el-cascader__collapse-tag{ - --el-color-primary: #d9d9d9; - --el-cascader-tag-background:#e1d9ec; - --el-fill-color:#e1d9ec; - height: 100%; - width: 90% !important; - flex-wrap: nowrap; - overflow: hidden; - align-items: center; - .el-tag--light{ - margin: 0 0 0 .6rem; - padding-right: .5rem; - height: 80%; - --el-icon-size: 1.4rem; - display: flex; - .el-tag__content{ - font-size: 1.4rem; - color: #000; - - } - } - .el-cascader__search-input{ - height: 100%; - margin: 0 0 0 1.1rem; - } -} -.el-cascader__collapse-tag{ - margin-bottom: .5rem; - .el-cascader__collapse-tag{ - .el-tag--light{ - display: flex !important; - } + .el-popper__arrow{ + display: none; } } + .hideEvents{ pointer-events:none !important; *{ @@ -794,18 +765,32 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte display: flex; align-items: center; margin-right: 5rem; + height: 6rem; + &.smail{ + >input{ + padding: 1rem 2rem !important; + } + .ant-picker-range,.ant-select-selector,.range_picker{ + padding: 1rem 2rem !important; + } + .el-cascader{ + padding: 1rem 2rem; + } + + } >input{ height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; + background-color: #fff; width: calc(100% - 4rem); font-size: 1.8rem; transition: all .3s; + border: 1px solid; } >input:hover{ - border: 1px solid; } >span{ font-size: 2rem; @@ -820,10 +805,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-picker-range,.ant-select-selector,.range_picker{ height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; + background-color: #fff; width: calc(100% - 4rem); + border: 1px solid #000; } .ant-picker-input > input{ font-size: 1.8rem; @@ -838,6 +825,78 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte } } } + + .el-cascader{ + font-size: 1.8rem; + width: 100%; + border: 1px solid #dcdfe6; + border-radius: 4rem; + background-color: #fff; + height: 2.5rem; + padding: 2rem; + transition: all .3s; + box-sizing: content-box; + border: 1px solid; + .el-cascader__tags,.el-input{ + height: 100%; + } + .el-input{ + .el-input__wrapper{ + box-shadow: none; + padding: 0; + width: 100%; + .el-input__inner{ + font-size: 1.8rem; + } + } + } + } + .el-cascader:hover{ + } + .el-cascader__tags{ + padding-left: 1rem; + } + .el-cascader__tags,.el-cascader__collapse-tag{ + --el-color-primary: #d9d9d9; + --el-cascader-tag-background:#000; + --el-fill-color:#e1d9ec; + box-sizing: content-box; + width: 90% !important; + flex-wrap: nowrap; + overflow: hidden; + align-items: center; + .el-tag--light{ + margin: 0 0 0 .6rem; + padding-right: .5rem; + height: 70%; + --el-icon-size: 1.4rem; + display: flex; + .el-tag__content{ + font-size: 1.4rem; + color: #fff; + } + } + .el-cascader__search-input{ + height: 100%; + } + } + .el-cascader__search-input,.el-input__inner{ + margin: 0; + width: 100%; + height: 4.6rem; + padding-left: 2.1rem; + line-height: 4.6rem; + font-size: 1.8rem; + box-sizing: border-box; + } + .el-cascader__collapse-tag{ + margin-bottom: .5rem; + .el-cascader__collapse-tag{ + .el-tag--light{ + display: flex !important; + } + } + } } .generalModel_current{ background: #fff; @@ -869,6 +928,14 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte } } +//下拉的内容 +.ant-select-dropdown{ + border: 1px solid #000; + border-radius: 1rem; + .ant-select-item-option-selected:not(.ant-select-item-option-disabled){ + background-color: #f3f3f6; + } +} .generalModel{//自带关闭的页面 -moz-user-select: none; @@ -879,6 +946,15 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte position: relative; box-shadow: none; height: calc(65rem*1.2); + &.fullScreen{ + max-width: 100%; + .ant-modal-content{ + border-radius: 0rem; + } + .ant-modal-body{ + padding: 2.5rem 3rem; + } + } .ant-modal-content{ border-radius: 3rem; height: 100%; @@ -941,6 +1017,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte display: flex; align-items: center; justify-content: center; + border-radius: 50%; + border: 1px solid; + z-index: 2; + @media (max-width: 768px) { + transform: translate(-100%, 100%); + } &.download{ transform: translate(-100%, 100%); } @@ -1119,12 +1201,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte } } -.ant-modal-wrap{ - height: 100vh; - // overflow: hidden; - overflow: auto; - // position: fixed; -} +// .ant-modal-wrap{ +// height: 100vh; +// overflow: auto; +// } // .driver-overlay-animated{ // z-index: 10002 !important; // } @@ -1172,7 +1252,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte margin: 0 3rem 0 1rem; } .ant-message{ - z-index: 1049 !important; + z-index: 9999 !important; top: 6rem; } .ant-modal-confirm-btns{ @@ -1192,7 +1272,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte } //loding样式 .ant-spin-dot-item{ - background-color: #543087; + background-color: #000000; } .ant-spin{ color: #000; @@ -1271,9 +1351,21 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte border-color: #000; box-shadow: none; } -.ant-pagination-prev:hover .ant-pagination-item-link, -.ant-pagination-next:hover .ant-pagination-item-link{ - color: #000; +.ant-pagination-prev:hover .ant-pagination-item-link, +.ant-pagination-next:hover .ant-pagination-item-link { + color: #000; + background-color: #fff; + border: 1px solid #000; +} +.ant-pagination-item:hover{ + border: 1px solid #000; +} +.ant-pagination-prev, +.ant-pagination-next{ + .ant-pagination-item-link{ + background-color: #000; + color: #fff; + } } .ant-pagination-item:hover a{ color: #000; @@ -1285,7 +1377,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{ @@ -1658,9 +1749,13 @@ textarea:focus{ .ant-upload-select-picture-card { width: calc(6rem*1.2); height: calc(6rem*1.2); - border: calc(0.3rem*1.2) solid #ededed; + border: calc(0.3rem*1.2) solid #000; border-radius: calc(1rem*1.2); margin: 0; + .fi-br-upload{ + font-size: 2rem; + color: #000; + } } @@ -1732,12 +1827,11 @@ textarea:focus{ z-index: 2; display: flex; align-items: center; - position: sticky; padding-bottom: calc(2rem*1.2); background: #fff; top: 0; flex-wrap: wrap; - --width:70%; + --width:65%; .input_box{ position: relative; z-index: 2; @@ -1766,16 +1860,19 @@ textarea:focus{ height: 0; flex-basis: 100%; .search_keyword_center{ + margin-top: 1rem; justify-content: space-between; display: flex; width: var(--width); background-color: #fff; padding: 1rem 2rem; border-radius: 0 0 .4rem .4rem; - border-top: solid 0 #f1f1f1; - border-right: solid 1px#f1f1f1; - border-left: solid 1px#f1f1f1; - border-bottom: solid 1px#f1f1f1; + // border-top: solid 0 #f1f1f1; + // border-right: solid 1px#f1f1f1; + // border-left: solid 1px#f1f1f1; + // border-bottom: solid 1px#f1f1f1; + border: 1px solid; + border-radius: 1rem; max-height: 30rem; overflow-y: scroll; .search_keyword_center_left{ @@ -1787,8 +1884,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; @@ -1803,11 +1899,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; } @@ -1818,6 +1918,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{ @@ -1827,7 +1940,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); @@ -1912,6 +2027,7 @@ textarea:focus{ position: relative; display: flex; align-items: center; + .icon-xiala{ margin-left: 1rem; transition: all .3s; @@ -1933,6 +2049,7 @@ textarea:focus{ >div{ background: #cccccc; line-height: 2; + font-size: 1.8rem; cursor: pointer; white-space: nowrap; overflow: hidden; @@ -1947,6 +2064,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/Account/account.vue b/src/component/Account/account.vue index 83686146..0ccdbec5 100644 --- a/src/component/Account/account.vue +++ b/src/component/Account/account.vue @@ -7,12 +7,54 @@
- + +
+ + +
+ + +
+ +
-
{{ userDetail.userName }}
-
{{$t('account.email')}}: {{ userDetail.email }}
+
+
+
{{ userDetail.userName }}
+ +
+
+ + +
+ {{ $t('account.remainingModifications') }}{{ userDetail.usernameModify }}/5 + {{ $t('account.notModifiable') }} {{ userDetail.usernameModify }}/5 +
+
+ {{$t('account.email')}}: +
+
{{ userDetail.email }}
+ +
+
+ + +
+
@@ -46,6 +88,8 @@
+ +
\ No newline at end of file diff --git a/src/component/Administrator/affiliate/affiliateAudit.vue b/src/component/Administrator/affiliate/affiliateAudit.vue index fe4df65a..d6040f11 100644 --- a/src/component/Administrator/affiliate/affiliateAudit.vue +++ b/src/component/Administrator/affiliate/affiliateAudit.vue @@ -96,6 +96,13 @@ export default defineComponent({ dataIndex: "id", key: "id", fixed: "left", + }, + { + title: 'User Name', + align: "center", + width: 100, + dataIndex: "username", + key: "username", }, { title: 'Create Time', @@ -112,13 +119,6 @@ export default defineComponent({ dataIndex: "status", key: "status", - },{ - title: 'Updata Time', - align: "center", - width: 200, - dataIndex: "updateTime", - key: "updateTime", - },{ title: 'Total income', align: "center", @@ -135,6 +135,13 @@ export default defineComponent({ dataIndex: "monthlyEarnings", key: "monthlyEarnings", openType:'all', + },{ + title: 'Unpaid amount', + align: "center", + ellipsis: true, + width: 100, + dataIndex: "unpaidEarnings", + key: "unpaidEarnings", },{ title: 'Invitation Link', align: "center", @@ -143,12 +150,12 @@ export default defineComponent({ dataIndex: "link", key: "link", },{ - title: 'Unpaid amount', + title: 'Updata Time', align: "center", - ellipsis: true, - width: 100, - dataIndex: "unpaidEarnings", - key: "unpaidEarnings", + width: 200, + dataIndex: "updateTime", + key: "updateTime", + }, { title: 'Operations', @@ -263,7 +270,7 @@ export default defineComponent({ }; Https.axiosPost(Https.httpUrls.affiliateList, data).then( (rv: any) => { - this.collectionList = rv.records; + this.collectionList = rv.content; this.total=rv.total } ); diff --git a/src/component/Administrator/affiliate/itemAffiliateDetail.vue b/src/component/Administrator/affiliate/itemAffiliateDetail.vue index e6d9dcaa..080bd102 100644 --- a/src/component/Administrator/affiliate/itemAffiliateDetail.vue +++ b/src/component/Administrator/affiliate/itemAffiliateDetail.vue @@ -14,10 +14,11 @@
- - - - + + + + +
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index dd06e151..78660a84 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -415,7 +415,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0] + " " + "00:00:00" : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1] + " " + "00:00:00" + ? filterData.rangePickerValue[1] + " " + "23:59:59" : ""; let data = { endTime: endDate, @@ -424,7 +424,7 @@ export default defineComponent({ page: filterData.currentPage, systemUser: filterData.systemUser, country: filterData.country, - email: filterData.email, + email: filterData.email.trim(), userType: filterData.userType, ids: filterData.ids, occupation: filterData.occupation, diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue index 6eb4dd46..63b8ae99 100644 --- a/src/component/Administrator/allUserPoerations.vue +++ b/src/component/Administrator/allUserPoerations.vue @@ -16,10 +16,11 @@
- - - - + + + + +
diff --git a/src/component/Administrator/questionnaire.vue b/src/component/Administrator/questionnaire.vue index fad5b005..321ffbf7 100644 --- a/src/component/Administrator/questionnaire.vue +++ b/src/component/Administrator/questionnaire.vue @@ -48,10 +48,11 @@
- - - - + + + + +
diff --git a/src/component/Canvas/test.vue b/src/component/Canvas/test.vue index c4119db3..ede26c46 100644 --- a/src/component/Canvas/test.vue +++ b/src/component/Canvas/test.vue @@ -14,10 +14,11 @@
- - - - + + + + +
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/Detail/addDetails.vue b/src/component/Detail/addDetails.vue index fc83417f..54225dec 100644 --- a/src/component/Detail/addDetails.vue +++ b/src/component/Detail/addDetails.vue @@ -16,10 +16,11 @@
- - - - + + + + +
diff --git a/src/component/Detail/habitSetStyle.vue b/src/component/Detail/habitSetStyle.vue index 1e69f52c..a62f2fb7 100644 --- a/src/component/Detail/habitSetStyle.vue +++ b/src/component/Detail/habitSetStyle.vue @@ -15,10 +15,11 @@
- - - - + + + + +
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index 99aa63e3..3530a16b 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -382,7 +382,6 @@ export default defineComponent({ //判断尺寸是否到边 this.frontBack.front[this.imgDomIndex].style.width = width this.frontBack.front[this.imgDomIndex].style.height = height - }, //鼠标抬起 sizeMouseup(e){ diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue new file mode 100644 index 00000000..a44841b1 --- /dev/null +++ b/src/component/DetailCopy/designDetail.vue @@ -0,0 +1,270 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/editSketchPosition.vue b/src/component/DetailCopy/editSketchPosition.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/component/DetailCopy/libraryList.vue b/src/component/DetailCopy/libraryList.vue new file mode 100644 index 00000000..c5c75481 --- /dev/null +++ b/src/component/DetailCopy/libraryList.vue @@ -0,0 +1,221 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/model/index.vue b/src/component/DetailCopy/model/index.vue new file mode 100644 index 00000000..f25b9c27 --- /dev/null +++ b/src/component/DetailCopy/model/index.vue @@ -0,0 +1,77 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/model/modelPosition.vue b/src/component/DetailCopy/model/modelPosition.vue new file mode 100644 index 00000000..5ee459fd --- /dev/null +++ b/src/component/DetailCopy/model/modelPosition.vue @@ -0,0 +1,233 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/sketchLeft.vue b/src/component/DetailCopy/sketchLeft.vue new file mode 100644 index 00000000..b8e0f1b8 --- /dev/null +++ b/src/component/DetailCopy/sketchLeft.vue @@ -0,0 +1,165 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/uploadList.vue b/src/component/DetailCopy/uploadList.vue new file mode 100644 index 00000000..3ff626dc --- /dev/null +++ b/src/component/DetailCopy/uploadList.vue @@ -0,0 +1,212 @@ + + + + \ No newline at end of file diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 95fc0508..9738d8e3 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -15,10 +15,11 @@
- - - - + + + + +
@@ -160,6 +161,22 @@
-->
+
+
+ {{ $t('exportModel.ShortcutKeys') }} + +
+
+
+
{{ item.name }}
+
+
{{ item.macKey }}
+
{{ item.winDowKey }}
+
+
+
+
+ - - - - + + + + +
@@ -44,7 +45,7 @@
- + @@ -27,56 +41,80 @@ 'login_active', ]" > - Bind Email + Modify Email + Bind personal information - +
+
+ + + + + +
+ @@ -100,7 +139,7 @@ diff --git a/src/views/affiliate/affiliateRegister.vue b/src/views/affiliate/affiliateRegister.vue index d58b1802..40275c50 100644 --- a/src/views/affiliate/affiliateRegister.vue +++ b/src/views/affiliate/affiliateRegister.vue @@ -1,7 +1,7 @@