Merge branch 'master' of http://124.70.149.18:10880/lianghj/queenshow

src/modules/editor/components/CompUI/basicUI/Text/component.tsx

@@ -89,9 +89,6 @@ const textStyle = css`
   p {
     margin: 0;
   }
-  &.ck.ck-editor__editable_inline[dir="ltr"] {
-    text-align: inherit;
-  }
   &.ck.ck-editor__editable_inline {
     > :last-child,
     > :first-child {

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

@@ -12,19 +12,23 @@ export const Component = createUIComp({
     const { children } = useCompData(props.compId);
 
     return () => (
-      <div class={rootStyles}>
-        <Text.Component compId={children.text?.id} />
-        <Image.Component
-          compId={children.img1.id}
-          class="w-1.67rem h-3.06rem object-cover"
-        />
-        <Image.Component
-          compId={children.img2.id}
-          class="w-1.67rem h-3.06rem object-cover"
-        />
+      <div class="flex">
+        <div class="flex-1">
+          <Text.Component compId={children.text?.id} />
+        </div>
+        <div class="w-2.5rem relative">
+          <Image.Component
+            compId={children.img1.id}
+            class="w-1.67rem h-3.06rem object-cover"
+          />
+          <div class="absolute bottom-0 right-1rem">
+            <Image.Component
+              compId={children.img2.id}
+              class="w-3.17rem h-2.4rem object-cover"
+            />
+          </div>
+        </div>
       </div>
     );
   },
 });
-
-const rootStyles = css``;

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

@@ -12,11 +12,7 @@ export const { options, useCompData } = createOptions({
   },
   children: {
     text: {
-      value: `<p style="text-align:center;"><span style="color:#666;font-size:12px;font-weight: bold;">皮中贵族，触及之处皆舒适，
-      柔韧度高的细腻肌理皮革，触感柔润亲肤，透气
-      质量经久耐磨，性价比高，
-      经典之作用不过时。
-      潮流耐磨的2023年最新款皮革材料</span></p>`,
+      value: `<p><span style="color:#666;font-size:12px;"><strong>皮中贵族，触及之处皆舒适，柔韧度高的细腻肌理皮革，触感柔润亲肤，透气</strong></span></p><p><span style="color:#666;font-size:12px;"><strong>质量经久耐磨，性价比高， 经典之作用不过时。 潮流耐磨的2023年最新款皮革材料</strong></span></p>`,
       layout: {
         textAlign: "center",
       },
@@ -30,7 +26,7 @@ export const { options, useCompData } = createOptions({
     img2: {
       compKey: "Image",
       value: {
-        url: require("@/assets/comps/Card11/img_shoe.jpg"),
+        url: require("@/assets/comps/Card11/img_shoe.png"),
       },
     },
   },

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

@@ -14,10 +14,15 @@ export const Component = createUIComp({
     return () => (
       <div class={rootStyles}>
         <Text.Component compId={children.text?.id} />
-        <Image.Component
-          compId={children.img1.id}
-          class="w-1.67rem h-3.06rem object-cover"
-        />
+        <div class="w-6.22rem mx-auto mt-0.4rem">
+          <Image.Component
+            compId={children.img1.id}
+            class="w-6.22rem h-6.22rem object-cover"
+          />
+        </div>
+        <div>
+          <Text.Component compId={children.text2?.id} />
+        </div>
       </div>
     );
   },

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

@@ -12,6 +12,12 @@ export const { options, useCompData } = createOptions({
   },
   children: {
     text: {
+      value: `<p style="text-align:right;"><span style="color:hsl(0, 0%, 0%);font-size:20px;"><strong>P190-2#</strong></span></p>`,
+      layout: {
+        textAlign: "center",
+      },
+    },
+    text2: {
       value: `<p style="text-align:center;">P190-2#</p>`,
       layout: {
         textAlign: "center",

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

@@ -12,11 +12,7 @@ export const { options, useCompData } = createOptions({
   },
   children: {
     text: {
-      value: `<p style="text-align:center;"><span style="color:#666;font-size:12px;font-weight: bold;">两面开边珠，无漆皮光亮
-      却比漆皮更耐用，不容易爆皮
-      逛着干看起来更加高档
-      丰富多彩的流行色水，增加无限魅力
-      既有复古的韵味更有时下的潮流元素</span></p>`,
+      value: `<p ><span >两面开边珠，无漆皮光亮&nbsp;</span></p><p ><span >却比漆皮更耐用，不容易爆皮&nbsp;</span></p><p ><span >逛着干看起来更加高档&nbsp;</span></p><p ><span >丰富多彩的流行色水，增加无限魅力</span></p><p ><span >既有复古的韵味更有时下的潮流元素</span></p>`,
       layout: {
         textAlign: "center",
       },

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

@@ -12,11 +12,7 @@ export const { options, useCompData } = createOptions({
   },
   children: {
     text: {
-      value: `<p style="text-align:center;"><span style="color:#666;font-size:12px;font-weight: bold;">蓝色是个舒服的颜色，
-      处处充满着生机和希望，
-      其明净空旷往往让人迷失其中，
-      给人无限的对未来的憧憬，
-      不需要过多的言语，让心灵感到平和</span></p>`,
+      value: `<p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">蓝色是个舒服的颜色，</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">&nbsp;处处充满着生机和希望，</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">&nbsp;其明净空旷往往让人迷失其中，&nbsp;</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">给人无限的对未来的憧憬，&nbsp;</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">不需要过多的言语，</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">让心灵感到平和</span></p>`,
       layout: {
         textAlign: "center",
       },

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

@@ -15,7 +15,7 @@ export const Component = createUIComp({
       <div
         class={cx(rootStyles, " pl-0.28rem")}
         style={{
-          backgroundImage: `linear-gradient(#fff 1.3rem,${value.themeColor} 1.3rem, ${value.themeColor} 80%, #fff 80%)`,
+          backgroundImage: `linear-gradient(#fff 1.3rem,${value.themeColor} 1.3rem, ${value.themeColor} 85%, #fff 85%)`,
         }}
       >
         <div class="h-1.3rem">
@@ -26,14 +26,20 @@ export const Component = createUIComp({
           class="w-6.22rem h-6.22rem object-cover -ml-0.28rem"
         />
         <div class="absolute right-1rem top-3rem">
-          <Text.Component compId={children.colorText?.id} />
+          <div
+            class="p-0.08rem pt-1rem border-light-50 border-6px border-solid"
+            style={{
+              backgroundColor: value.themeColor,
+            }}
+          >
+            <div class="px-0.33rem py-0.06rem bg-light-50">
+              <Text.Component compId={children.colorText?.id} />
+            </div>
+          </div>
         </div>
-        <div class="flex flex-row-reverse">
-          <div class="w-4.75rem px-0.35rem py-0.55rem bg-light-50 border-r-cool-gray-900">
-            <Text.Component
-              compId={children.text?.id}
-              // class=""
-            />
+        <div class="flex flex-row-reverse mt-0.5rem mb-0.35rem">
+          <div class="w-4.75rem py-0.55rem bg-light-50 text-center border-dark-200 border-2 border-solid leading-2">
+            <Text.Component compId={children.text?.id} />
           </div>
         </div>
         <Image.Component

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

@@ -20,10 +20,10 @@ export const { options, useCompData } = createOptions({
         '<p><span style="color:hsl(0, 0%, 0%);font-size:24px;"><strong>P190-3#</strong></span></p>',
     },
     colorText: {
-      value: "3#      铜绿色",
+      value: `<p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">3#&nbsp;</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">铜绿色</span></p>`,
     },
     text: {
-      value: `<p><span style="color:hsl(0, 0%, 0%);font-size:12px;">绿色是个舒服的颜色， 处处充满着生机和希望， 其明净空旷往往让人迷失其中， 给人无限的对未来的憧憬， 不需要过多的言语，让心灵感到平和</span></p>`,
+      value: `<p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">绿色是个舒服的颜色，&nbsp;</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">处处充满着生机和希望，</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">&nbsp;其明净空旷往往让人迷失其中，</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">&nbsp;给人无限的对未来的憧憬，</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">&nbsp;不需要过多的言语，让心灵感到平和</span></p>`,
       layout: {
         textAlign: "center",
       },
@@ -31,7 +31,7 @@ export const { options, useCompData } = createOptions({
     img2: {
       compKey: "Image",
       value: {
-        url: "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/queenshow/1685609522134_nGPo9k_2.png",
+        url: require("@/assets/comps/Card15/img_shoe.png"),
       },
     },
     img1: {

src/pages/website/Home/index.tsx

@@ -3,7 +3,7 @@ import { defineComponent } from "vue";
 
 export default defineComponent(() => {
   return () => (
-    <div class="text-center pt-20px">
+    <div class="text-center pt-120px">
       <router-link to="/workbench/promotion">
         <Button type="primary">工作台</Button>
       </router-link>