diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index dd8f9373..eefe3350 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -110,7 +110,7 @@
- +
@@ -169,8 +169,7 @@ export default defineComponent({ }, workspace:{ type:Object, - default:{ - } + default:false }, }, setup(props:any,{emit}) { @@ -360,7 +359,7 @@ export default defineComponent({ }) let data = { "base64": rv, - "category": scaleImageList.value[scaleImageIndex.value]?.categoryValue, + "category": scaleImageList.value[scaleImageIndex.value]?.categoryValue || scaleImageList.value[scaleImageIndex.value]?.level2Type, "gender": props.workspace.sexEnum.value, "originalId":scaleImageList.value[scaleImageIndex.value]?.id, "isOverride":isOverlay, diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 626fca7f..af986824 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -192,20 +192,22 @@
-
-
- -
-
- -
-
- -
+
+
+ +
-
+
+
+ +
+
+
+ +
+
{{img.name}}
@@ -409,13 +411,15 @@
-
+
+
+
@@ -2096,12 +2100,21 @@ export default defineComponent({ .img_operate_content{ position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%,-50%); - max-width: 90%; + // top: 50%; + // left: 50%; + // transform: translate(-50%,-50%); + // max-width: 90%; display: flex; - flex-wrap: wrap; + flex-direction: column; + top: 1rem; + &.left{ + left: 1rem; + right: auto; + } + &.right{ + right: 1rem; + left: auto; + } >div{ margin-bottom: .5rem; margin-right: .5rem;