Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/yangshi_cloudExbition

src/clients/index.vue

@@ -8,7 +8,11 @@ import '@/assets/style/public.less'
 import '@/assets/theme/color.less'
 
 export default {
-    
+    mounted(){
+        if (this.isMobile) {
+            window.location.href = window.location.href.replace('index.html','mobile.html')
+        }
+    }
 }
 </script>
 <style lang="less">

src/clients/mobile.vue

@@ -15,7 +15,13 @@ import "@/assets/style/reset.less";
 import "@/assets/style/public.less";
 import "@/assets/theme/color.less";
 
-export default {};
+export default {
+  mounted(){
+        if (!this.isMobile) {
+            window.location.href = window.location.href.replace('mobile.html','index.html')
+        }
+    }
+};
 </script>
 <style lang="less">
 html,

src/components/hotspot/iframe.vue

@@ -239,7 +239,7 @@ export default {
     left: 0;
     top: 0;
     z-index: -1;
-    clip-path: polygon(1% 11%, 10% 2%, 99% 2%, 99% 89%, 92% 99%, 1% 99%);
+    clip-path: polygon(1% 11%, 10% 2%, 99% 2%, 99% 89%, 91% 98%, 1% 98%);
   }
   .close {
     position: absolute;

src/components/hotspot/image.vue

@@ -15,7 +15,7 @@
 
     <div class="vhotspotcon">
       <div class="vtitle" v-html="hotspot.title"></div>
-      <div class="hotspotcon">
+      <div class="hotspotcon" :class="{fullcon:!hotspot.content}">
         <div class="img-con">
           <img
             class="aa"
@@ -146,10 +146,9 @@ export default {
   mounted(){
     const elem = document.getElementById('map')
     this.panzoom = Panzoom(elem, {
-      maxScale: 10
+      maxScale: 10,
+      startScale: !this.hotspot.content?0.8:1
     })
-    this.panzoom.pan(10, 10)
-    this.panzoom.zoom(1, { animate: true })
     elem.addEventListener('wheel', this.panzoom.zoomWithWheel)
   }
 };
@@ -179,7 +178,7 @@ export default {
     left: 0;
     top: 0;
     z-index: -1;
-    clip-path: polygon(1% 11%, 10% 2%, 99% 2%, 99% 89%, 92% 99%, 1% 99%);
+    clip-path: polygon(1% 11%, 10% 2%, 99% 2%, 99% 89%, 91% 98%, 1% 98%);
   }
   .close {
     position: absolute;
@@ -230,9 +229,10 @@ export default {
             max-height: 60vh;
           }
         }
-        @h:72vh;
+        @h:100%;
         .bigImg{
           max-height: @h;
+          margin: 0;
           >img{
             max-height: @h;
           }
@@ -261,6 +261,19 @@ export default {
         overflow-y: auto;
       }
     }
+    .fullcon{
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      clip-path: polygon(1% 12%, 3.8% 8%, 42% 8%, 45.2% 2.7%, 99% 2.7%, 99% 89%, 92% 98%, 1% 98%);
+      .img-con {
+        height: 100%;
+        .imgmain {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
   }
 }
 
@@ -297,7 +310,7 @@ export default {
     display: inline-block;
     font-size: 16px;
     margin: 0px auto;
-    width: 50vw;
+    width: 60vw;
   }
   .mbhcon {
     position: absolute;

src/components/hotspot/video.vue

@@ -169,7 +169,7 @@ export default {
     left: 0;
     top: 0;
     z-index: -1;
-    clip-path: polygon(1% 11%, 10% 2%, 99% 2%, 99% 89%, 92% 99%, 1% 99%);
+    clip-path: polygon(1% 11%, 10% 2%, 99% 2%, 99% 89%, 91% 98%, 1% 98%);
   }
   .close {
     position: absolute;

src/pages/scenePage/index.vue

@@ -176,7 +176,7 @@ export default {
         if (Object.prototype.toString.call(res.data) == "[object Object]") {
           let data = res.data.data;
           if (res.data.source === "changeExhition") {
-            window.player.flyToPano({
+            window.player.blackToPano({
               pano: window.player.model.panos.index[data.index],
               quaternion: new THREE.Quaternion(...data.quat),
             });