gemercheung %!s(int64=2) %!d(string=hai) anos
pai
achega
8c637ce9ce

+ 1 - 1
packages/qjkankan-editor/.env.prod

@@ -7,4 +7,4 @@ VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
 VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0510-01
+VUE_APP_DEBBUG_FLAG=0510-02

+ 1 - 1
packages/qjkankan-editor/someData.json

@@ -38,7 +38,7 @@
   "id": "",
   "remindTime": 1,
   "status": 0,
-  "isShowOpeningAnimation": true,
+  "isShowOpeningAnimation": false,
   "openingAnimationType": "小行星开场",
   "backgroundMusic": {
     "id": "",

+ 1 - 1
packages/qjkankan-editor/src/views/base/openingAnimationSettings.vue

@@ -58,7 +58,7 @@ export default {
   },
   mounted() {
     if (this.info.isShowOpeningAnimation === undefined) {
-      this.$set(this.info, 'isShowOpeningAnimation', true)
+      this.$set(this.info, 'isShowOpeningAnimation', false)
     }
     if (!this.info.openingAnimationType) {
       this.$set(this.info, 'openingAnimationType', this.openingTypeList[0])

+ 12 - 0
packages/qjkankan-kankan-view/src/components/Tags/constant.js

@@ -41,5 +41,17 @@ export const custom = () => {
             icon: 'web',
             name: t('common.link'),
         },
+        text: {
+            icon: 'pic',
+            upload: true,
+            uploadPlace: t('common.upload') + t('common.image'),
+            accept: `.jpg,.png`,
+            multiple: true,
+            name: t('common.image'),
+            maxSize: 5 * 1024 * 1024,
+            maxNum: 9,
+            // othPlaceholder: '支持JPG、PNG图片格式,单张不超过5MB,最多支持上传9张。',
+            othPlaceholder: t('tag.toolbox.metaImageTips', { form: 'jpg/png', size: '5MB', maxlength: '9' }),
+        },
     }
 }

+ 1 - 1
packages/qjkankan-view/.env.prod

@@ -7,4 +7,4 @@ VUE_APP_URL_FILL=/qjkankan
 
 # 接口请求地址
 VUE_APP_APIS_URL=https://www.4dkankan.com/
-VUE_APP_DEBBUG_FLAG=0510-01
+VUE_APP_DEBBUG_FLAG=0510-02

+ 3 - 3
packages/qjkankan-view/public/showMobile.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontVR/iconfont.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontV1.2.0/iconfont.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper-bundle.min.css" />
-    <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> 
+    <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> 
     <link rel="icon" href="./favicon.png" />
     <title>-</title>
   </head>
@@ -23,9 +23,9 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/howler/howler.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper-bundle.min.js"></script>
     <!-- <script src="<%= VUE_APP_STATIC_DIR %>/lib/jssor/jssor.slider-28.1.0.min.js"></script> -->
-    <script src="https://4dkk.4dage.com/v4-test/www/viewer/static/lib/vconsole.js"></script>
+    <!-- <script src="https://4dkk.4dage.com/v4-test/www/viewer/static/lib/vconsole.js"></script>
     <script>
       var vConsole = new window.VConsole()
-  </script>
+  </script> -->
   </body>
 </html>

+ 9 - 0
packages/qjkankan-view/src/pages/show.vue

@@ -86,6 +86,15 @@ onMounted(async () => {
     isShowOpeningAnimation.value = data.isShowOpeningAnimation
       ? Number(data.isShowOpeningAnimation)
       : 0;
+    //TODO 兼容1.2.0或以下数据
+    if (
+      !("isShowOpeningAnimation" in data) &&
+      "openingAnimationType" in data &&
+      data.openingAnimationType.length > 0
+    ) {
+      console.log("小行星没有开关,但有openingAnimationType强制开启");
+      isShowOpeningAnimation.value = 1;
+    }
     store.commit("scene/setScenes", data.scenes);
     store.commit(
       "scene/setPassword",

+ 9 - 0
packages/qjkankan-view/src/pages/showMobile.vue

@@ -82,6 +82,15 @@ onMounted(async () => {
     isShowOpeningAnimation.value = data.isShowOpeningAnimation
       ? Number(data.isShowOpeningAnimation)
       : 0;
+    //TODO 兼容1.2.0或以下数据
+    if (
+      !("isShowOpeningAnimation" in data) &&
+      "openingAnimationType" in data &&
+      data.openingAnimationType.length > 0
+    ) {
+      console.log("小行星没有开关,但有openingAnimationType强制开启");
+      isShowOpeningAnimation.value = 1;
+    }
     store.commit("scene/setScenes", data.scenes);
     store.commit(
       "scene/setPassword",