diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 2a6a72bf..64efbb76 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -237,7 +237,7 @@ li { color: #fff; background-color: #000; text-align: center; - font-weight: 600; + font-weight: 500; border: 2px solid #000; cursor: pointer; box-sizing: border-box; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 63056cd4..e9c26827 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -241,7 +241,7 @@ input:focus{ color: #fff; background-color: #000; text-align: center; - font-weight: 600; + font-weight: 500; border: 2px solid #000; cursor: pointer; box-sizing: border-box; diff --git a/src/component/Canvas/ExistsImageList/index.vue b/src/component/Canvas/ExistsImageList/index.vue index 2e6e2d3c..b8219544 100644 --- a/src/component/Canvas/ExistsImageList/index.vue +++ b/src/component/Canvas/ExistsImageList/index.vue @@ -174,6 +174,7 @@ const handleImageError = (event) => { //提交选中的T图片 const confirm = ()=>{ + selectList.value = [] emits("select", selectList.value); showPanel.value = false; } @@ -482,6 +483,10 @@ const confirm = ()=>{ justify-content: space-between; align-items: center; flex-shrink: 0; + > .image-submit{ + font-size: 1.2rem; + line-height: 4rem; + } } .image-count { diff --git a/src/component/Canvas/canvasExample.vue b/src/component/Canvas/canvasExample.vue index 567fdd5a..fe69e875 100644 --- a/src/component/Canvas/canvasExample.vue +++ b/src/component/Canvas/canvasExample.vue @@ -176,6 +176,10 @@ const canvasInit = () => { // }); }; +const frontBackChange =(value)=>{ + console.log(value) +} + const isShowLeft = ref(true); @@ -195,6 +199,7 @@ const isShowLeft = ref(true); diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 0da7011a..2e4f533f 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -68,7 +68,7 @@ -
+
@@ -579,10 +579,12 @@ export default defineComponent({ display: flex; flex-direction: column; justify-content: space-between; + overflow: hidden; } &.isEditPattern{width: 0px;} &.model{ - width: 45rem; + flex: 1; + // width: 45rem; // width: 50rem; margin: 0 8rem; // margin: 0 10rem; @@ -590,7 +592,10 @@ export default defineComponent({ flex-direction: column; } &.detailRight{ - flex: 1; + width: 30%; + &.canvas{ + width: 60%; + } display: flex; flex-direction: column; // padding-bottom: calc(6rem + 1rem); diff --git a/src/component/Detail/detailLeft/module/libraryList.vue b/src/component/Detail/detailLeft/module/libraryList.vue index 284999c8..16d586a3 100644 --- a/src/component/Detail/detailLeft/module/libraryList.vue +++ b/src/component/Detail/detailLeft/module/libraryList.vue @@ -347,7 +347,7 @@ export default defineComponent({ margin-top: 1rem; justify-content: space-between; align-content: flex-start; - &::-webkit-scrollbar{display: none;} + // &::-webkit-scrollbar{display: none;} > .content_img_item{ width: calc((50% - 1rem)); > .content_img_item_block{ diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 8d54a4da..ea52b080 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -40,8 +40,7 @@
- - +