update1032

package.json

@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "@panzoom/panzoom": "^4.4.1",
-    "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "dom-to-image": "^2.6.0",
     "qs": "^6.10.1",

public/index.html

@@ -6,7 +6,6 @@
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta http-equiv="X-Content-Type-Options" content="nosniff">
-  <meta http-equiv="Content-Security-Policy" content="script-src 'self'; object-src 'none'; style-src cdn.example.org third-party.org; child-src https:">
   <meta name="renderer" content="webkit">
   <meta name="viewport"
     content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">

public/mobile.html

@@ -5,7 +5,6 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="X-Content-Type-Options" content="nosniff">
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self'; object-src 'none'; style-src cdn.example.org third-party.org; child-src https:">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta name="format-detection" content="telephone=no">

public/model/index.html

@@ -21,7 +21,6 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
   <meta name="msapplication-tap-highlight" content="no">
   <meta http-equiv="X-Content-Type-Options" content="nosniff">
-  <meta http-equiv="Content-Security-Policy" content="script-src 'self'; object-src 'none'; style-src cdn.example.org third-party.org; child-src https:">
 
   <!-- force full screen on some browser -->
   <meta name="full-screen" content="yes"/>

public/scene.html

@@ -5,7 +5,6 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="X-Content-Type-Options" content="nosniff">
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self'; object-src 'none'; style-src cdn.example.org third-party.org; child-src https:">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta name="format-detection" content="telephone=no">

src/components/hotspot/image.vue

@@ -218,15 +218,20 @@ export default {
         margin-top: 6%;
         .imgmain {
           width: 90%;
-          // height: 100%;
+          height: 100%;
           overflow-x: hidden;
           overflow-y: auto;
           position: relative;
           margin: 0 auto;
+          display: flex;
+          align-items: center;
+          justify-content: center;
           img {
             cursor: pointer;
             max-width: 100%;
-            // height: 100%;
+            width: auto;
+            max-height: 100%;
+            height: auto;
           }
         }
         @h: 100%;

src/components/hotspot/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="hotspotcon" @mousemove.stop>
+  <div class="hotspotcon" v-clickoutside="handleoutside" @mousemove.stop>
     <component @close="close" :type="scene" :is="active" :hotspot="hotspot"></component>
   </div>
 </template>
@@ -33,6 +33,9 @@ export default {
     vModel:model,
   },
   methods:{
+    handleoutside(){
+      this.close()
+    },
     close(){
       this.$emit('close')
     }
@@ -67,17 +70,15 @@ export default {
   height: 100%;
   left: 0;
   top: 0;
-  .close{
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    width: 30px;
-    height: 70px;
-    cursor: pointer;
+  pointer-events: none;
+  & /deep/ .vhotspotcon{
+    pointer-events: auto;
   }
-  .ifrclose{
-    top: 100px;
+   & /deep/ .close{
+  
+    pointer-events: auto;
   }
+ 
 }
 
 

src/components/mapsvg/xuting.vue

@@ -232,7 +232,6 @@ export default {
       deep: true,
       handler: function(newVal) {
         if (newVal) {
-          console.log(newVal, 111111);
           document.querySelector("." + this.cls) &&
             Array.from(
               document.querySelector("." + this.cls).childNodes

src/config/http.js

@@ -89,4 +89,4 @@ axios.interceptors.response.use(
     return Promise.reject(error)
   }
 )
-export { serverName,orginLink, axios }
+export { serverName,orginLink }

src/mixins/index.js

@@ -2,11 +2,10 @@ import Vue from 'vue'
 import browser from '@/utils/browser'
 import {u_extend} from '@/utils'
 
-import {axios, serverName,orginLink} from '../config/http'
+// import { serverName,orginLink} from '../config/http'
 
-Vue.prototype.$http = axios
-Vue.prototype.$serverName = serverName 
-Vue.prototype.$orginLink = orginLink 
+// Vue.prototype.$serverName = serverName 
+// Vue.prototype.$orginLink = orginLink 
 
 import {
   $showTips,$showLoading,$hideLoading

src/pages/mobilescene/bar.vue

@@ -3,7 +3,7 @@
     <img @click="$router.push({name:'home'})" :src="require(`@/assets/images/mobile/icon/home.png`)" alt="">
     <div @click="$emit('openAside')">
       <span v-html="name"></span>
-      <img :src="require(`@/assets/images/mobile/icon/xiala.png`)" alt="">
+      <img :class="{active:showAside}" :src="require(`@/assets/images/mobile/icon/xiala.png`)" alt="">
     </div>
     <img  @click="$emit('showSearch')" :src="require(`@/assets/images/mobile/icon/search.png`)" alt="">
   </div>
@@ -11,7 +11,7 @@
 
 <script>
 export default {
-  props:['name']
+  props:['name',"showAside"]
 }
 </script>
 
@@ -37,6 +37,9 @@ export default {
     >img{
       width: 12px;
     }
+    .active{
+      transform: rotate(180deg);
+    }
   }
   >img{
     width: 26px;

src/pages/mobilescene/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div :class="`theme${theme}`" class="scene-body">
     <div class="scene-con">
-      <vbar v-if="!tourStatus" :name="currentItem.name" @showSearch="showSearch=true" @openAside="showAside=!showAside"></vbar>
+      <vbar :showAside="showAside" v-if="!tourStatus" :name="currentItem.name" @showSearch="showSearch=true" @openAside="showAside=!showAside"></vbar>
       <scene :tourStatus="tourStatus"/>
 
       <vside :isShow="!tourStatus&&showAside" @close="showAside=false" />