gemercheung 2 år sedan
förälder
incheckning
0a832e3b82

+ 1 - 1
packages/qjkankan-editor/src/lang/_en.json

@@ -415,7 +415,7 @@
     "waiting": "Waiting...",
     "audio": "Audio",
     "second": "s",
-    "frame": "",
+    "frame": "frame",
     "delete": "Delete",
     "prev": "Go back",
     "next": "Next",

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

@@ -90,7 +90,7 @@
             $i18n.t(`edit_settings.button_name`)
           }}</span>
           <div style="margin-left: 16px" class="item-value">
-            {{ item.name }}
+            {{ translateName(item.name) }}
           </div>
         </div>
         <div class="edit-content-item">
@@ -225,7 +225,20 @@ export default {
     ...mapGetters({
       info: "info",
     }),
+    translateName() {
+      return (name) => {
+        switch (name) {
+          case "电话":
+            return this.$i18n.t("edit_settings.phone_short");
+          case "链接":
+            return this.$i18n.t("edit_settings.link_short");
+          default:
+            return name;
+        }
+      };
+    },
     //1.3.1后用这个过滤中文Key
+    // eslint-disable-next-line vue/return-in-computed-property
     customButton() {
       if (this.info.customButton && this.info.customButton.length > 0) {
         return Array.from(this.info.customButton).map((item) => {
@@ -298,6 +311,8 @@ export default {
         console.log("current.name", current.name);
         if (current.name.length === 0) {
           this.editingInfo.name = item.label;
+        } else {
+          this.editingInfo.name = this.translateName(current.name);
         }
       },
     },

+ 2 - 0
packages/qjkankan-editor/src/views/hotspot/hotspotIconType/serial_frame.vue

@@ -296,6 +296,8 @@ export default {
       > .tip {
         font-size: 12px;
         color: rgba(255, 255, 255, 0.3);
+        flex: 1;
+        word-break: break-all;
       }
     }
   }

+ 2 - 1
packages/qjkankan-kankan-view/src/components/Information/View.Mobile.vue

@@ -505,7 +505,8 @@ const onChangeMode = () => {
     text-align: center;
     max-height: 80vh;
     max-height: calc(var(--vh) * 80);
-    overflow: scroll;
+    overflow-y: auto;
+    overflow-x: hidden;
     -webkit-overflow-scrolling: touch;
     // z-index: 10000;
     pointer-events: auto;

+ 5 - 2
packages/qjkankan-kankan-view/src/components/Information/View.Pc.vue

@@ -128,7 +128,9 @@ const onShowDescription = () => {
     }
   }
 }
-
+// ::-webkit-scrollbar-track {
+//     background: none;
+//   }
 .description {
   display: none;
   position: absolute;
@@ -138,8 +140,9 @@ const onShowDescription = () => {
   background: rgba(15, 15, 15, 0.5);
   border-radius: 10px;
   max-height: 60vh;
-  overflow-y: scroll;
+  overflow-y: auto;
   overflow-x: hidden;
+
   &.show {
     display: block;
   }

+ 3 - 1
packages/qjkankan-view/src/components/UIGather/list.vue

@@ -220,8 +220,10 @@ const loadList = () => {
           centerInsufficientSlides: true,
           centeredSlidesBounds: true,
           freeMode: true,
+          touchMoveStopPropagation: true,
+          touchStartPreventDefault : true,
           // slidesPerView : 6,
-          slidesPerGroup: 10,
+          // slidesPerGroup: 10,
           // resistanceRatio: 0,
         });
       });