fix-自动导览和背景音乐冲突问题

scene/package-lock.json

@@ -11,7 +11,7 @@
         "axios": "^0.27.2",
         "core-js": "^3.6.5",
         "element-ui": "^2.15.6",
-        "html2canvas": "^1.3.3",
+        "html2canvas": "^1.4.1",
         "install": "^0.13.0",
         "npm": "^8.10.0",
         "swiper": "^5.3.8",
@@ -3332,9 +3332,9 @@
       }
     },
     "node_modules/base64-arraybuffer": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
-      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -4878,11 +4878,11 @@
       }
     },
     "node_modules/css-line-break": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz",
-      "integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
       "dependencies": {
-        "base64-arraybuffer": "^0.2.0"
+        "utrie": "^1.0.2"
       }
     },
     "node_modules/css-loader": {
@@ -7482,12 +7482,12 @@
       }
     },
     "node_modules/html2canvas": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.3.tgz",
-      "integrity": "sha512-nQi0ayEY1cMiUMbq/F5hRwMAqsRMo7NIP6VaCqaXnXO6b/FfZO49oSfIJjdyRha28EuY8D6FBCzQOXPQV0TCrA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
       "dependencies": {
-        "css-line-break": "2.0.1",
-        "text-segmentation": "^1.0.2"
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -15262,11 +15262,11 @@
       }
     },
     "node_modules/text-segmentation": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz",
-      "integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
       "dependencies": {
-        "utrie": "^1.0.1"
+        "utrie": "^1.0.2"
       }
     },
     "node_modules/text-table": {
@@ -15897,19 +15897,11 @@
       }
     },
     "node_modules/utrie": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz",
-      "integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
       "dependencies": {
-        "base64-arraybuffer": "^1.0.1"
-      }
-    },
-    "node_modules/utrie/node_modules/base64-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==",
-      "engines": {
-        "node": ">= 0.6.0"
+        "base64-arraybuffer": "^1.0.2"
       }
     },
     "node_modules/uuid": {
@@ -19848,9 +19840,9 @@
       }
     },
     "base64-arraybuffer": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
-      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
     },
     "base64-js": {
       "version": "1.5.1",
@@ -21177,11 +21169,11 @@
       }
     },
     "css-line-break": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz",
-      "integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
       "requires": {
-        "base64-arraybuffer": "^0.2.0"
+        "utrie": "^1.0.2"
       }
     },
     "css-loader": {
@@ -23321,12 +23313,12 @@
       }
     },
     "html2canvas": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.3.tgz",
-      "integrity": "sha512-nQi0ayEY1cMiUMbq/F5hRwMAqsRMo7NIP6VaCqaXnXO6b/FfZO49oSfIJjdyRha28EuY8D6FBCzQOXPQV0TCrA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
       "requires": {
-        "css-line-break": "2.0.1",
-        "text-segmentation": "^1.0.2"
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
       }
     },
     "htmlparser2": {
@@ -29467,11 +29459,11 @@
       }
     },
     "text-segmentation": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz",
-      "integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
       "requires": {
-        "utrie": "^1.0.1"
+        "utrie": "^1.0.2"
       }
     },
     "text-table": {
@@ -29990,18 +29982,11 @@
       "dev": true
     },
     "utrie": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz",
-      "integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
       "requires": {
-        "base64-arraybuffer": "^1.0.1"
-      },
-      "dependencies": {
-        "base64-arraybuffer": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-          "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
-        }
+        "base64-arraybuffer": "^1.0.2"
       }
     },
     "uuid": {

scene/public/index.html

@@ -63,70 +63,6 @@
     <!-- <script src="<%= VUE_APP_STATIC_DIR %>/js/CAD/bundle.js"></script> -->
     <script src="<%= VUE_APP_STATIC_DIR %>/js/loadCAD.js"></script>
 
-
-    <!-- 微信分享 -->
-    <!-- <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-    <script>
-        $.ajax({
-            url: 'https://www.4dage.com/wechat/jssdk/share/',
-            type: "post",
-            data: {
-                'uri': location.href.split('#')[0], //当前页面地址
-                'name': "四维6号" //哪个公众号，对应上方的名称
-            },
-            dataType: "jsonp",
-            jsonpCallback: "success_jsonp",
-            success: function (data, textStatus) {
-                wx.config({
-                    debug: false,
-                    appId: data.appId,
-                    timestamp: data.timestamp,
-                    nonceStr: data.nonceStr,
-                    signature: data.signature,
-                    jsApiList: ['checkJsApi', 'onMenuShareTimeline',
-                        'onMenuShareAppMessage', 'onMenuShareQQ',
-                        'onMenuShareWeibo', 'hideMenuItems',
-                        'showMenuItems', 'hideAllNonBaseMenuItem',
-                        'showAllNonBaseMenuItem', 'translateVoice',
-                        'startRecord', 'stopRecord', 'onRecordEnd',
-                        'playVoice', 'pauseVoice', 'stopVoice',
-                        'uploadVoice', 'downloadVoice', 'chooseImage',
-                        'previewImage', 'uploadImage', 'downloadImage',
-                        'getNetworkType', 'openLocation', 'getLocation',
-                        'hideOptionMenu', 'showOptionMenu', 'closeWindow',
-                        'scanQRCode', 'chooseWXPay',
-                        'openProductSpecificView', 'addCard', 'chooseCard',
-                        'openCard'
-                    ]
-                });
-
-                wx.ready(function () {
-                    wx.onMenuShareTimeline({
-                        title: '雷锋纪念馆',
-                        desc: '欢迎参观雷锋纪念馆',
-                        link: location.href,
-                        imgUrl: `${location.href.split('#')[0]}/leifengWeiXin.jpg`,
-                        success: function () { },
-                        cancel: function () { },
-                    });
-                    wx.onMenuShareAppMessage({
-                        title: '雷锋纪念馆',
-                        desc: '欢迎参观雷锋纪念馆',
-                        link: location.href,
-                        imgUrl: `${location.href.split('#')[0]}/leifengWeiXin.jpg`,
-                        type: "",
-                        dataUrl: "",
-                        success: function () { },
-                        cancel: function () { },
-                    });
-                    wx.error(function () { });
-                });
-            },
-            error: function (XMLHttpRequest, textStatus, errorThrown) {
-                console.log("jsonp.error:" + textStatus);
-            }
-        });
-    </script> -->
 </body>
 
 </html>

scene/public/static/js/main_2020_show.js

@@ -17570,6 +17570,16 @@ window.Modernizr = function(n, e, t) {
                     responseType: "json",
                     auth: this.isPublic ? null : f.authorizationHeader
                 }).done(function(e) {
+
+  
+
+                    // 更换热点图片地址
+                    // const tempArr =['1262']
+                    // if(tempArr.includes(this.sid)) {
+                    //     console.log('-------------111',e);
+                    // }
+
+
                     window.data2 = e;
                     
                     this.roomLabels = []

scene/src/views/gui/menu.vue

@@ -294,6 +294,10 @@ export default {
         window.manage.switchBgmState(true);
         document.querySelector("#openMusic").style.display = "none";
         document.querySelector("#closeMusic").style.display = "block";
+
+        // 手动停止自动导览
+        window.player.director.stopTour()
+
       } else {
         window.manage.switchBgmState(false);
         document.querySelector("#openMusic").style.display = "block";