diff --git a/components.d.ts b/components.d.ts index 940b8980..1c57248a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,7 +20,6 @@ declare module 'vue' { AModal: typeof import('ant-design-vue/es')['Modal'] APagination: typeof import('ant-design-vue/es')['Pagination'] APopover: typeof import('ant-design-vue/es')['Popover'] - AProgress: typeof import('ant-design-vue/es')['Progress'] ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] diff --git a/src/assets/images/homePage/toolsGuide/productCN.png b/src/assets/images/homePage/toolsGuide/productCN.png new file mode 100644 index 00000000..ca854daf Binary files /dev/null and b/src/assets/images/homePage/toolsGuide/productCN.png differ diff --git a/src/assets/images/homePage/toolsGuide/productEN.png b/src/assets/images/homePage/toolsGuide/productEN.png new file mode 100644 index 00000000..eac75263 Binary files /dev/null and b/src/assets/images/homePage/toolsGuide/productEN.png differ diff --git a/src/assets/images/homePage/toolsGuide/relightCN.png b/src/assets/images/homePage/toolsGuide/relightCN.png new file mode 100644 index 00000000..a29c25ca Binary files /dev/null and b/src/assets/images/homePage/toolsGuide/relightCN.png differ diff --git a/src/assets/images/homePage/toolsGuide/relightEN.png b/src/assets/images/homePage/toolsGuide/relightEN.png new file mode 100644 index 00000000..79b2e70a Binary files /dev/null and b/src/assets/images/homePage/toolsGuide/relightEN.png differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 4cc0b585..7d046635 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -4,6 +4,7 @@ body, margin: 0; padding: 0; height: 100%; + font-weight: 500; font-family: pingfang_medium, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; overflow: hidden; --aida-fsize2: calc(2.6rem); @@ -19,6 +20,19 @@ input { outline: none; border: 0.1rem solid #dcdfe6; } +input[type="radio"] { + accent-color: #000; + /* 统一修改选中颜色 */ +} +input[type="number"] { + -moz-appearance: textfield; + /* Firefox */ +} +/* Chrome/Safari等Webkit浏览器 */ +input[type="number"]::-webkit-outer-spin-button, +input[type="number"]::-webkit-inner-spin-button { + -webkit-appearance: none; +} @media (max-width: 768px) { .mdhidden { display: none !important; @@ -62,19 +76,25 @@ li { width: calc(100% - 2rem); } .ant-slider.system_silder .ant-slider-rail { - height: 0.6rem; - border-radius: 0.3rem; + height: 1rem; + border-radius: 4rem; background: #F2F0FD; } .ant-slider.system_silder .ant-slider-track { - height: 0.6rem; - border-radius: 0.3rem; + height: 1rem; + border-radius: 3rem; background: #000; } .ant-slider.system_silder .ant-slider-handle { - margin-top: -0.4rem; + margin-top: 0.1rem; + top: 0; + height: 1.7rem; + width: 1.7rem; border: solid 0.2rem #000; } +.ant-slider.system_silder .ant-slider-step { + height: 1rem; +} .ant-slider:hover .ant-slider-handle { box-shadow: rgba(0, 0, 0, 0.16) 0px 0 0 4px; } @@ -88,7 +108,6 @@ li { .ant-slider-handle { background-color: #000000 !important; border: none !important; - margin-top: -4px; } .ant-slider-handle:hover { box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.2); @@ -233,7 +252,7 @@ li { font-size: 1.6rem; } .gallery_btn.gallery_btn_radius { - border-radius: 1.4rem; + border-radius: 1.3rem; } .gallery_btn.gallery_btn:hover { background-color: #fff; @@ -913,6 +932,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte box-shadow: none; height: calc(65rem*1.2); } +@media (max-width: 768px) { + .generalModel { + height: calc(48rem*1.2); + } +} .generalModel.fullScreen { max-width: 100%; } @@ -938,7 +962,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte font-size: 1.4rem; padding: 6rem 7rem; position: relative; - } .generalModel .fi-rr-down-to-line, .generalModel .fi-rr-arrow-small-right, @@ -989,6 +1012,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte justify-content: center; z-index: 2; } +@media (max-width: 768px) { + .generalModel .generalModel_btn .generalModel_closeIcon { + width: 2.5rem; + height: 2.5rem; + } +} .generalModel .generalModel_btn .generalModel_closeIcon > svg { flex-shrink: 0; border-radius: 50%; @@ -1792,6 +1821,7 @@ textarea:focus { align-items: center; flex-wrap: wrap; justify-content: space-between; + width: 100%; } .collection_modal_body .input_border .input_box .inputShowText, .design_detail_modal_component .input_border .input_box .inputShowText, @@ -2156,14 +2186,15 @@ textarea:focus { .generalMenu_printModel_upload .input_border .fi, .generate .input_border .fi { margin-right: 1rem; - display: flex; cursor: pointer; transition: all 0.3s; position: relative; z-index: 4; width: 4rem; - align-items: center; + display: flex; + min-height: 3rem; justify-content: center; + align-items: center; } .collection_modal_body .input_border .fi.fi-br-loading, .design_detail_modal_component .input_border .fi.fi-br-loading, diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 31190412..93e0a985 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -2126,6 +2126,11 @@ textarea:focus{ width: 4rem; align-items: center; justify-content: center; + + display: flex; + min-height: 3rem; + justify-content: center; + align-items: center; &.fi-br-loading{ height: 100%; background-color: rgba(0, 0, 0, 0); @@ -2146,6 +2151,7 @@ textarea:focus{ span{ position: absolute; width: 100%; + } .ant-upload-select-picture-card{ width: 100%; diff --git a/src/component/Account/followFans/fans.vue b/src/component/Account/followFans/fans.vue index ea089fa6..0dd560cf 100644 --- a/src/component/Account/followFans/fans.vue +++ b/src/component/Account/followFans/fans.vue @@ -139,6 +139,7 @@ export default defineComponent({ width: 100%; .account_generalMessage_center{ .account_generalMessage_item{ + font-size: var(--aida-fsize1-6); .account_generalMessage_item_right{ display: flex; align-items: center; diff --git a/src/component/Account/followFans/follow.vue b/src/component/Account/followFans/follow.vue index d53357de..50101b0f 100644 --- a/src/component/Account/followFans/follow.vue +++ b/src/component/Account/followFans/follow.vue @@ -147,6 +147,7 @@ export default defineComponent({ width: 100%; .account_generalMessage_center{ .account_generalMessage_item{ + font-size: var(--aida-fsize1-6); .account_generalMessage_item_right{ display: flex; align-items: center; diff --git a/src/component/Administrator/affiliate/affiliateAudit.vue b/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue similarity index 100% rename from src/component/Administrator/affiliate/affiliateAudit.vue rename to src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue diff --git a/src/component/Administrator/affiliate/itemAffiliateDetail.vue b/src/component/Administrator/affiliate/affiliateAudit/itemAffiliateDetail.vue similarity index 100% rename from src/component/Administrator/affiliate/itemAffiliateDetail.vue rename to src/component/Administrator/affiliate/affiliateAudit/itemAffiliateDetail.vue diff --git a/src/component/affiliate/Referral/editReferral.vue b/src/component/Administrator/affiliate/affiliateReferral/editReferral.vue similarity index 100% rename from src/component/affiliate/Referral/editReferral.vue rename to src/component/Administrator/affiliate/affiliateReferral/editReferral.vue diff --git a/src/component/affiliate/Referral/index.vue b/src/component/Administrator/affiliate/affiliateReferral/index.vue similarity index 100% rename from src/component/affiliate/Referral/index.vue rename to src/component/Administrator/affiliate/affiliateReferral/index.vue diff --git a/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue b/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue index ecaaac73..b58f52fb 100644 --- a/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue +++ b/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue @@ -1,8 +1,9 @@