diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 1f3726f5..a2775b2d 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1204,6 +1204,29 @@ li { border: solid 2px rgba(0, 0, 0, 0.55); color: #000000; } +.homeMain_heade .ant-badge { + width: auto; + height: auto; +} +.homeMain_heade sup.ant-scroll-number { + height: 2rem; + min-height: 2rem; + width: 2rem; + min-width: 2rem; + padding: 0; +} +.homeMain_heade sup.ant-scroll-number .ant-scroll-number-only { + width: 100%; + height: 100%; + font-size: 1.2rem; + display: flex; + align-items: center; + justify-content: center; +} +.homeMain_heade p.ant-scroll-number-only-unit { + line-height: 2rem; + height: 100%; +} .modal_title_text { font-size: var(--aida-fsize2); font-weight: 900; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index cf181ea0..1890dc36 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1343,6 +1343,32 @@ input:focus{ color: rgba(0, 0, 0, 1); } } +.homeMain_heade{ + .ant-badge{ + width: auto; + height: auto; + } + sup.ant-scroll-number{ + height: 2rem; + min-height: 2rem; + width: 2rem; + min-width: 2rem; + padding: 0; + .ant-scroll-number-only{ + width: 100%; + height: 100%; + font-size: 1.2rem; + display: flex; + align-items: center; + justify-content: center; + } + } + p.ant-scroll-number-only-unit{ + line-height: 2rem; + height: 100%; + } +} + .modal_title_text{ font-size: var(--aida-fsize2); font-weight: 900; diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index dd1f77a0..38d76f12 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -154,7 +154,7 @@ export default defineComponent({ v.layersObject[i].style = { top:v.layersObject[i].position?.[0]*ratio+'px', left:v.layersObject[i].position?.[1]*ratio+'px', - width:v.layersObject[i].imageSize?.[0]*ratio * +'px', + width:v.layersObject[i].imageSize?.[0]*ratio+'px', height:v.layersObject[i].imageSize?.[1]*ratio+'px', // zIndex:zIndex-=1 } diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 592d1d7b..f22204fc 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -357,13 +357,10 @@ export default defineComponent({ } }, beforeUpload(file: any) { - console.log(123); - const isJpgOrPng = file.type === "image/jpeg" || file.type === "image/png" || file.type === "image/jpg" || - file.type === "image/JFIF" || file.type === "image/bmp"; if (!isJpgOrPng) { message.info(this.t('MoodboardUpload.jsContent3')); diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 5cec5332..589c338e 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -18,6 +18,11 @@ > +
+ + + +
@@ -445,6 +450,9 @@ export default defineComponent({ let taskPage = this.$refs.TaskPage taskPage.init(data) }, + openMessage(){ + + }, }, }); @@ -486,6 +494,7 @@ export default defineComponent({ height: 3.2rem; margin: 2.1rem 2.8rem 0 ; // position: absolute; + line-height: 2rem; margin-top: 0; } @@ -578,6 +587,23 @@ export default defineComponent({ font-size: 1.8rem; cursor: pointer; } + &.message{ + // padding: 1rem; + i{ + margin-left: 0rem; + border-left: none; + padding-left: 0rem; + height: auto; + width: 3rem; + } + span{ + overflow: initial; + align-items: center; + width: auto; + margin: auto; + height: auto; + } + } .fi-br-refresh{ margin-left: 0; border-left: none;