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

src/modules/editor/components/CompUI/basicUI/Page/PageMusic.tsx

@@ -96,6 +96,10 @@ export const PageMusic = defineComponent({
       }, 500);
     };
     const checkAutoPlay = () => {
+      const duration = audioBgm.value.duration();
+      if (duration) {
+        state.duration = duration;
+      }
       if (!audioBgm.value || store.isEditMode) {
         return;
       }

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

@@ -30,6 +30,7 @@ export const Component = defineComponent({
           {slots.Container?.(
             children.default.map((compId) => {
               const comp = helper.findComp(compId);
+              if (!comp) return;
               return slots.CompItem?.(comp);
             })
           )}

src/modules/editor/components/Viewport/Toolbar/AiText.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
       const xhr = new XMLHttpRequest();
       xhr.open(
         "post",
-        "http://186b2d5554134321a0afd4b1be443273.apig.ap-southeast-1.huaweicloudapis.com/chatgpt"
+        "https://186b2d5554134321a0afd4b1be443273.apig.ap-southeast-1.huaweicloudapis.com/chatgpt"
       );
       xhr.setRequestHeader("content-type", "application/json");
       xhr.send(JSON.stringify(reqData));

src/pages/website/Promotion2/controller.tsx

@@ -34,7 +34,7 @@ export function createPromotinController(
   };
 
   async function sharePromotion(record: any) {
-    editor.actions.initDesign(record._id);
+    await editor.actions.initDesign(record._id);
     editor.actions.switchMode("preview");
     resource.showModal(
       <ShareModal record={record} controller={ctrl}>