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

code/src/components/maps/index.vue

@@ -243,7 +243,9 @@ onMounted(() => {
 
         // Handle double tap
         hammer.value.on("doubletap", function () {
-          instance.zoomIn();
+          console.log('-------sss------1');
+          return
+          // instance.zoomIn();
         });
 
         // Handle pan
@@ -262,6 +264,7 @@ onMounted(() => {
 
         // Handle pinch
         hammer.value.on("pinchstart pinchmove", function (ev) {
+          console.log('-------------2');
           // On pinch start remember initial zoom
           if (ev.type === "pinchstart") {
             initialScale = instance.getZoom();
@@ -279,6 +282,7 @@ onMounted(() => {
 
         // Prevent moving the page on some devices when panning over SVG
         options.svgElement.addEventListener("touchmove", function (e) {
+          console.log('-------------3');
           e.preventDefault();
         });
       },
@@ -294,6 +298,8 @@ onMounted(() => {
       controlIconsEnabled: false,
       fit: 1,
       center: 1,
+      // 禁止双击放大
+      dblClickZoomEnabled:false,
       customEventsHandler: eventsHandler,
     });
   });

code/src/components/showCollection/showCollection.vue

@@ -21,7 +21,7 @@
               :key="index"
             >
               <div class="sl-item">
-                <img :src="sub.filePath" />
+                <img :src="'http://gdbwg.4dage.com/'+sub.filePath" />
               </div>
             </li>
           </ul>
@@ -275,7 +275,7 @@ export default {
 
           > img {
             width: auto;
-            max-height: 80%;
+            max-height: 60%;
             max-width: 100%;
             position: absolute;
             top: 50%;