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

src/modules/editor/components/CompUI/basicUI/Video/index.ts

@@ -10,8 +10,9 @@ export const options = {
 };
 
 export const { createComp, useCompData } = createCompHooks({
+
   value: {
-    url: "//infishwaibao.oss-cn-chengdu.aliyuncs.com/release/sku3d/media/shoes.1c5c29ad.webm",
+    url: "//sku3d-test.obs.cn-east-3.myhuaweicloud.com/queenshow/1689723277730_hPbfyN_shoe.mp4",
     ratio: 1,
     autoplay: true,
     loop: true,

src/modules/editor/components/Viewport/Header/ShareBox.tsx

@@ -1,5 +1,6 @@
 import { useEditor } from "@/modules/editor";
 import { clipboard } from "@/utils";
+import { useAuth } from "@queenjs-modules/auth";
 import { useQRCode } from "@vueuse/integrations/useQRCode";
 import { Button } from "ant-design-vue";
 import { defineComponent } from "vue";
@@ -7,7 +8,15 @@ import { defineComponent } from "vue";
 export const ShareBox = defineComponent({
   setup() {
     const { store } = useEditor();
-    let shareLink = location.origin + "/share.html?id=" + store.designData._id;
+    const auth = useAuth();
+    const userInfo: any = auth.store.userInfo;
+    const isSys = userInfo.roles?.includes("system") ? true : false;
+    let shareLink =
+      location.origin +
+      "/share.html?id=" +
+      store.designData._id +
+      "&isSys=" +
+      isSys;
     // if (location.host == "www.infish.cn") {
     //   shareLink =
     //     location.origin +

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

@@ -97,7 +97,7 @@ export default defineComponent({
                 autoSize={{ minRows: 3, maxRows: 6 }}
                 placeholder={"请输入关键词，AI将自动帮您生成对应文案"}
               />
-              <div class={"px-12px text-right f-12px text-gray"}>
+              <div class={"px-12px text-right f-12px text-white"}>
                 {state.inputValue.length}/1000
               </div>
             </div>
@@ -148,13 +148,16 @@ export default defineComponent({
 const AIStyle = css`
   border-radius: 4px;
   box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.2);
+  background-color: rgba(38, 38, 38, 0.8);
+  color: #fff;
   .input_box,
   .result_text {
     position: relative;
-    background-color: #303030;
+    background-color: rgba(255, 255, 255, 0.2);
     border-radius: 4px;
 
     .ai_input {
+      color: #fff;
       font-size: 12px;
       border-color: transparent;
       &:hover,
@@ -162,6 +165,9 @@ const AIStyle = css`
         border-color: transparent;
         box-shadow: none;
       }
+      &::placeholder {
+        color: #fff;
+      }
     }
   }
   .input_box {
@@ -177,3 +183,6 @@ const AIStyle = css`
     background-color: @inf-primary-fade-color;
   }
 `;
+
+
+

src/pages/editor/EditPage/index.tsx

@@ -17,7 +17,7 @@ export default defineComponent(() => {
   auth.actions.on("getUserInfo:success", () => {
     if (prodId) {
       const userInfo: any = auth.store.userInfo;
-      const isSys = userInfo.roles?.includes("system");
+      const isSys = userInfo.roles?.includes("system") ? true : false;
       editor.actions.initDesign(prodId, isSys);
     } else {
       editor.jumpIndexHtml();

src/pages/h5/share/Promotion.tsx

@@ -6,11 +6,12 @@ export default defineComponent(() => {
   const editor = initEditor();
   const params = new URLSearchParams(location.href.split("?")[1]);
   const id = params.get("id");
+  const isSys = params.get("isSys");
 
   editor.actions.switchMode("preview");
 
   if (id) {
-    editor.actions.initDesign(id);
+    editor.actions.initDesign(id, isSys?.split("#")[0]);
     editor.controls.wxCtrl.setup(window.location.href);
 
     editor.actions.on("initDesign:success", () => {

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

@@ -1,6 +1,7 @@
 import { IconWechat } from "@/assets/icons";
 import { PromotionController } from "@/modules/resource/controllers/PromotionController";
 import { clipboard } from "@/utils";
+import { useAuth } from "@queenjs-modules/auth";
 import { Image } from "@queenjs/ui";
 import { useQRCode } from "@vueuse/integrations/useQRCode";
 import { Button, Divider, Input } from "ant-design-vue";
@@ -13,7 +14,15 @@ export default defineComponent({
     controller: any<PromotionController>().isRequired,
   },
   setup(props, { slots }) {
-    let shareLink = location.origin + "/share.html?id=" + props.record._id;
+    const auth = useAuth();
+    const userInfo: any = auth.store.userInfo;
+    const isSys = userInfo.roles?.includes("system") ? true : false;
+    let shareLink =
+      location.origin +
+      "/share.html?id=" +
+      props.record._id +
+      "&isSys=" +
+      isSys;
     // if (location.host == "www.infish.cn") {
     //   shareLink =
     //     location.origin +

src/pages/website/Promotion2/controller.tsx

@@ -37,7 +37,7 @@ export function createPromotinController(
 
   async function sharePromotion(record: any) {
     const userInfo: any = auth.store.userInfo;
-    const isSys = userInfo.roles?.includes("system");
+    const isSys = userInfo.roles?.includes("system") ? true : false;
     await editor.actions.initDesign(record._id, isSys);
     editor.actions.switchMode("preview");
     resource.showModal(

vue.config.js

@@ -18,7 +18,7 @@ module.exports = defineConfig({
     index: "src/pages/website/index.ts",
     editor: "src/pages/editor/index.ts",
     share: "src/pages/h5/share/index.ts",
-    // stat: "src/pages/h5/statistics/index.ts",
+    stat: "src/pages/h5/statistics/index.ts",
     treeapi: "src/pages/queentree/index.ts",
   },
   publicPath: publicPath,