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

src/modules/editor/objects/DesignTemp/index.ts

@@ -6,6 +6,7 @@ export class DesignTemp {
   version?: string;
   _id!: string;
   title = "";
+  desc = "";
   pageStyle?: any;
   content: string[] = ["root"];
   thumbnail?: string;

src/pages/share/Promotion/index.tsx

@@ -19,7 +19,7 @@ export default defineComponent(() => {
         title: data.title,
         link: location.href,
         imgUrl: data.thumbnail || "",
-        desc: data.title,
+        desc: data.desc,
       });
     });
   }

src/pages/website/CreateMat/components/AttrPanel/MatAttr.tsx

@@ -88,9 +88,7 @@ export default defineUI({
       const { data } = props;
       return (
         <div class="w-300px flex flex-col">
-          <div class="p-15px text-16px text-white border-dark-800 border-0 border-b-1 border-solid">
-            面料编辑
-          </div>
+          <div class="border-bottom p-15px text-16px text-white">面料编辑</div>
           <div class="px-15px py-15px flex-1 overflow-y-auto scrollbar">
             <BaseInfo data={data} />
             <div class="border-bottom my-16px"></div>

src/pages/website/CreateMat/components/AttrPanel/MeshAttr.tsx

@@ -49,9 +49,7 @@ export default defineUI({
       const { data } = props;
       return (
         <div class="w-300px flex flex-col">
-          <div class="p-15px text-16px text-white border-dark-800 border-0 border-b-1 border-solid">
-            属性编辑
-          </div>
+          <div class="border-bottom p-15px text-16px text-white">属性编辑</div>
           <div class="py-15px flex-1 overflow-y-auto scrollbar">
             <FormUI data={data} columns={meshColumns} onChange={changeVal} />
           </div>

src/pages/website/CreateMat/components/TreePanel/index.tsx

@@ -101,9 +101,7 @@ export default defineComponent({
 
       return (
         <div class="w-300px flex flex-col">
-          <div class="p-15px text-16px text-white border-dark-800 border-0 border-b-1 border-solid">
-            模型列表
-          </div>
+          <div class="border-bottom p-15px text-16px text-white">模型列表</div>
           <List
             data={Meshlist}
             gap="10px"

src/pages/website/Promotion2/components/ShareModal.tsx

@@ -55,15 +55,24 @@ export default defineComponent({
               <div class="flex-1 ml-20px">
                 <Input
                   class="w-1/1"
-                  defaultValue={record.title}
                   placeholder="请输入标题"
+                  defaultValue={record.title}
                   onBlur={(e: any) => {
                     const title = e.target.value;
                     if (!title) return;
                     emit("update", { title });
                   }}
                 />
-                {/* <Input placeholder="请输入描述" class="mt-10px w-1/1" /> */}
+                <Input
+                  class="mt-10px w-1/1"
+                  placeholder="请输入描述"
+                  defaultValue={record.desc}
+                  onBlur={(e: any) => {
+                    const desc = e.target.value;
+                    if (!desc) return;
+                    emit("update", { desc });
+                  }}
+                />
               </div>
             </div>
             <div class="mt-40px flex">

src/pages/website/components/layout/index.tsx

@@ -17,9 +17,8 @@ export default defineUI({
       return (
         <Layout class={cx("!h-100vh flex", rootStyles)}>
           <Layout.Sider
-            class="scrollbar !bg-transparent overflow-y-auto border-dark-800 border-0 border-r-1 border-solid"
+            class="scrollbar !min-w-300px xl:(!min-w-320px) 2xl:(!min-w-380px) border-right !bg-transparent overflow-y-auto"
             theme="light"
-            width="380px"
           >
             <slots.Left Controller={props.Controller} />
           </Layout.Sider>
@@ -33,7 +32,6 @@ export default defineUI({
 });
 
 const rootStyles = css`
-  min-width: 1560px;
   background-color: @inf-layout-bg;
   .page_container {
     background-color: @inf-modal-bg;