Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev

src/modules/editor/components/CompUI/customUI/Cards/Card12/index.ts

@@ -39,6 +39,9 @@ export const { createComp, useCompData } = createCompHooks({
         value: {
           url: require("@/assets/comps/Card12/img_1.jpg"),
         },
+        layout: {
+          size: [622, 622],
+        },
       }),
   },
 });

src/modules/editor/components/CompUI/customUI/Cards/Card13/component.tsx

@@ -11,7 +11,7 @@ export const Component = createUIComp({
     const { children } = useCompData(props.compId);
 
     return () => (
-      <div class="flex text-black overflow-hidden">
+      <div class="relative flex text-black overflow-hidden">
         <div class="ml-0.15rem mr-0.2rem">
           <Image.Component
             compId={children.img1}

src/modules/editor/components/CompUI/customUI/Cards/Card13/index.ts

@@ -12,8 +12,7 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.5rem 0",
-    // margin: "0 0.35rem",
+    padding: "0 0.35rem",
     size: [750, 500],
   },
   children: {
@@ -29,12 +28,18 @@ export const { createComp, useCompData } = createCompHooks({
         value: {
           url: require("@/assets/comps/Card13/img_1.jpg"),
         },
+        layout: {
+          size: [274, 256],
+        },
       }),
     imgShoe: () =>
       createCompId("Text", {
         value: {
           url: require("@/assets/comps/Card13/img_shoe.png"),
         },
+        layout: {
+          size: [350, 280],
+        },
       }),
   },
 });

src/modules/editor/components/CompUI/customUI/Cards/Card14/index.ts

@@ -12,8 +12,7 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.5rem 0",
-    // margin: "0 0.35rem",
+    padding: "0 0.35rem",
     size: [750, 500],
   },
   children: {
@@ -29,12 +28,18 @@ export const { createComp, useCompData } = createCompHooks({
         value: {
           url: require("@/assets/comps/Card14/img_1.jpg"),
         },
+        layout: {
+          size: [400, 330],
+        },
       }),
     imgShoe: () =>
       createCompId("Image", {
         value: {
           url: require("@/assets/comps/Card14/img_shoe.png"),
         },
+        layout: {
+          size: [350, 260],
+        },
       }),
   },
 });

src/modules/editor/components/CompUI/customUI/Cards/Card15/index.ts

@@ -15,8 +15,7 @@ export const { createComp, useCompData } = createCompHooks({
     themeColor: "#6D8D70",
   },
   layout: {
-    padding: "0.5rem 0",
-    // margin: "0.5rem 0.35rem",
+    padding: "0 0.35rem",
     size: [750, 500],
   },
   children: {
@@ -41,12 +40,18 @@ export const { createComp, useCompData } = createCompHooks({
         value: {
           url: require("@/assets/comps/Card15/img_shoe.png"),
         },
+        layout: {
+          size: [400, 285],
+        },
       }),
     img1: () =>
       createCompId("Image", {
         value: {
           url: require("@/assets/comps/Card15/img_1.jpg"),
         },
+        layout: {
+          size: [622, 622],
+        },
       }),
   },
 });