diff --git a/.gitignore b/.gitignore index bf373419..ed3b7af3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .DS_Store node_modules -/dist +# /dist # local env files diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 9935747f..9ae6b09a 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -185,6 +185,10 @@ li { .operate_file_block .select_img_type .category_list .category_item:hover { background: linear-gradient(-137deg, #eeefdb, #e7dbed); } +.ant-message { + z-index: 1049 !important; + top: 6rem; +} .ant-modal-confirm-btns .ant-btn:hover { color: #39215b !important; border-color: #39215b !important; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index b61d9ca0..b985f0a5 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -229,6 +229,10 @@ ul,li{ } } } +.ant-message{ + z-index: 1049 !important; + top: 6rem; +} .ant-modal-confirm-btns{ .ant-btn:hover{ color: #39215b !important; diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 279b3c46..f2a8c6e2 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -653,10 +653,6 @@ export default defineComponent({ // console.log(this.current.printObject,imgData); } - - - // imgData.type_ = this.type_ - // this.store.commit("addGenerateMaterialFils", imgData); }, //请求我的印花&&模型 getLibraryList(){ diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index 146a6f79..b891f2db 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -487,7 +487,7 @@ export default defineComponent({ justify-content: space-between; } .modal_img{ - width: 45rem; + width: 50rem; // width: 40rem; height: 5rem; overflow-x: hidden; diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 8249ea8a..9633abdc 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -166,10 +166,11 @@ +