Просмотр исходного кода

Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/jiangsu_518

任一存 2 лет назад
Родитель
Сommit
f75b35487f

+ 3 - 2
public/showMobile.html

@@ -23,8 +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>
+    <!-- <script src="<%= VUE_APP_STATIC_DIR %>/lib/vconsole.js"></script>
+
+    <script>
       var vConsole = new window.VConsole()
     </script> -->
   </body>

Разница между файлами не показана из-за своего большого размера
+ 10 - 0
public/showviewer/lib/vconsole.js


+ 1 - 1
src/components/UIGather/mobile/control.pano_js.vue

@@ -199,7 +199,7 @@ const onVR = () => {
         }
       }
     } else {
-      Dialog.alert('运动和方向访问失败,您需要完全关闭此应用,然后再次打开,并允许访问运动与方向')
+      alert('运动和方向访问失败,您需要完全关闭此应用,然后再次打开,并允许访问运动与方向')
     }
   });
 

+ 5 - 1
src/sdk/QJKanKan/modules/hotspot.js

@@ -53,6 +53,10 @@ const convertBaseStyle = (dest, origin) => {
         if (origin && origin.titleDisplayMode == "hover") {
             dest.visible = 2
         }
+        if ('visible' in origin && typeof origin.visible == "boolean") {
+            dest.visible = origin.visible ? 0 : 1
+            dest.style.position = "top"
+        }
         dest.style.borderColor = '';
         dest.style.fillColor = 'rgba(0,0,0,0.8)';
         dest.style.textColor = 'rgba(255,255,255,1)';
@@ -150,7 +154,7 @@ export const convertJQHotspot = (origin) => {
         case 'personalized_tag':
             return coverpersonalizedTag(origin);
         default:
-            return false;
+            return coverSystemIconPart(origin);
     }
 }