feat5

scene/public/static/js/Hot.js

@@ -44,7 +44,7 @@ window.initHot = function (model) {
     farBound: 15,
   };
 
-  hotGroup = new THREE.Object3D();
+  window.hotGroup = new THREE.Object3D();
   hotGroup.name = "hotGroup";
   model.add(hotGroup);
   model.hotGroup = hotGroup;
@@ -68,14 +68,14 @@ window.initHot = function (model) {
           "&id=" +
           window.number +
           o);
-    return src.replace(
-      "https://www.4dmodel.com/SuperTwo/hot_online1",
-      "http://192.168.0.68:8080"
-    );
     // return src.replace(
     //   "https://www.4dmodel.com/SuperTwo/hot_online1",
-    //   "https://houseoss.4dkankan.com/project/aoMenScene/hot"
+    //   "http://192.168.0.68:8080"
     // );
+    return src.replace(
+      "https://www.4dmodel.com/SuperTwo/hot_online1",
+      "https://houseoss.4dkankan.com/project/aoMenScene/hot"
+    );
 
     // return src //打包
   };

scene/src/il8n.js

@@ -257,8 +257,8 @@ const messages = {
         value: "增強維護國家安全意識，持之以恆推動愛國愛澳教育",
       },
       {
-        title: "電子裝置",
-        value: "電子裝置",
+        title: "電子裝置一：照片",
+        value: "電子裝置一：照片",
       },
       {
         title: "加快經濟適度多元發展",
@@ -285,8 +285,8 @@ const messages = {
         value: "會展商貿及文化體育產業",
       },
       {
-        title: "電子裝置一",
-        value: "電子裝置一",
+        title: "電子裝置五：照片",
+        value: "電子裝置五：照片",
       },
       {
         title: "全力推動橫琴粵澳深度合作區建設",
@@ -313,8 +313,8 @@ const messages = {
         value: "提升治理水平　完善法制建設",
       },
       {
-        title: "電子裝置二",
-        value: "電子裝置二",
+        title: "電子裝置二：照片",
+        value: "電子裝置二：照片",
       },
       {
         title: "加強城市規劃　建設宜居城市",
@@ -325,17 +325,37 @@ const messages = {
         value: "優化民生建設　促進文化繁榮",
       },
       {
-        title: "電子裝置四",
-        value: "電子裝置四",
+        title: "電子裝置三：照片",
+        value: "電子裝置三：照片",
       },
       {
-        title: "電子裝置三",
-        value: "電子裝置三",
+        title: "電子裝置四：照片",
+        value: "電子裝置四：照片",
       },
       {
         title: "揭開看看吧！",
         value: "揭開看看吧！",
       },
+      {
+        title: "電子裝置一：視頻",
+        value: "電子裝置一：視頻",
+      },
+      {
+        title: "電子裝置二：視頻",
+        value: "電子裝置二：視頻",
+      },
+      {
+        title: "電子裝置三：視頻",
+        value: "電子裝置三：視頻",
+      },
+      {
+        title: "電子裝置四：視頻",
+        value: "電子裝置四：視頻",
+      },
+      {
+        title: "電子裝置五：視頻",
+        value: "電子裝置五：視頻",
+      },
     ],
   },
   en: {
@@ -486,8 +506,8 @@ const messages = {
         value: "增強維護國家安全意識，持之以恆推動愛國愛澳教育",
       },
       {
-        title: "Electronic Devices",
-        value: "電子裝置",
+        title: "Electronic Device 1: Photo",
+        value: "電子裝置一：照片",
       },
       {
         title: "Accelerate Appropriate Diversification of the Economy",
@@ -514,8 +534,8 @@ const messages = {
         value: "會展商貿及文化體育產業",
       },
       {
-        title: "Electronic Device 1",
-        value: "電子裝置一",
+        title: "Electronic Device 2: Photo",
+        value: "電子裝置二：照片",
       },
       {
         title:
@@ -545,8 +565,8 @@ const messages = {
         value: "提升治理水平　完善法制建設",
       },
       {
-        title: "Electronic Device 2",
-        value: "電子裝置二",
+        title: "Electronic Device 3: Photo",
+        value: "電子裝置三：照片",
       },
       {
         title: "Strengthen Urban Planning and Build a Livable City",
@@ -558,17 +578,37 @@ const messages = {
         value: "優化民生建設　促進文化繁榮",
       },
       {
-        title: "Electronic Device 4",
-        value: "電子裝置四",
+        title: "Electronic Device 4: Photo",
+        value: "電子裝置四：照片",
       },
       {
-        title: "Electronic Device 3",
-        value: "電子裝置三",
+        title: "Electronic Device 5: Photo",
+        value: "電子裝置五：照片",
       },
       {
         title: "Take a Look Inside!",
         value: "揭開看看吧！",
       },
+      {
+        title: "Electronic device 1: Video",
+        value: "電子裝置一：視頻",
+      },
+      {
+        title: "Electronic device 2: Video",
+        value: "電子裝置二：視頻",
+      },
+      {
+        title: "Electronic device 3: Video",
+        value: "電子裝置三：視頻",
+      },
+      {
+        title: "Electronic device 4: Video",
+        value: "電子裝置四：視頻",
+      },
+      {
+        title: "Electronic device 5: Video",
+        value: "電子裝置五：視頻",
+      },
     ],
   },
   pe: {
@@ -717,8 +757,8 @@ const messages = {
         value: "增強維護國家安全意識，持之以恆推動愛國愛澳教育",
       },
       {
-        title: "Dispositivos Eletrônicos",
-        value: "電子裝置",
+        title: "Dispositivo electrónico no.1: Fotografias",
+        value: "電子裝置一：照片",
       },
       {
         title:
@@ -746,8 +786,8 @@ const messages = {
         value: "會展商貿及文化體育產業",
       },
       {
-        title: "Dispositivos Eletrônicos I",
-        value: "電子裝置一",
+        title: "Dispositivo electrónico no.2: Fotografias",
+        value: "電子裝置二：照片",
       },
       {
         title:
@@ -778,8 +818,8 @@ const messages = {
         value: "提升治理水平　完善法制建設",
       },
       {
-        title: "Dispositivos Eletrônicos II",
-        value: "電子裝置二",
+        title: "Dispositivo electrónico no.3: Fotografias",
+        value: "電子裝置三：照片",
       },
       {
         title:
@@ -792,17 +832,37 @@ const messages = {
         value: "優化民生建設　促進文化繁榮",
       },
       {
-        title: "Dispositivos Eletrônicos IV",
-        value: "電子裝置四",
+        title: "Dispositivo electrónico no.4: Fotografias",
+        value: "電子裝置四：照片",
       },
       {
-        title: "Dispositivos Eletrônicos III",
-        value: "電子裝置三",
+        title: "Dispositivo electrónico no.5: Fotografias",
+        value: "電子裝置五：照片",
       },
       {
         title: "Desvendar e Dê - uma Olhada!",
         value: "揭開看看吧！",
       },
+      {
+        title: "Dispositivo electrónico no.1: Vídeos",
+        value: "電子裝置一：視頻",
+      },
+      {
+        title: "Dispositivo electrónico no.2: Vídeos",
+        value: "電子裝置二：視頻",
+      },
+      {
+        title: "Dispositivo electrónico no.3: Vídeos",
+        value: "電子裝置三：視頻",
+      },
+      {
+        title: "Dispositivo electrónico no.4: Vídeos",
+        value: "電子裝置四：視頻",
+      },
+      {
+        title: "Dispositivo electrónico no.5: Vídeos",
+        value: "電子裝置五：視頻",
+      },
     ],
   },
 };

scene/src/mixins/index.js

@@ -1,42 +1,36 @@
-import Vue from 'vue'
-import browser from '@/utils/browser'
+import Vue from "vue";
+import browser from "@/utils/browser";
 
 import {
-  $showShare,
-  $hideShare,
   $showTips,
   $hideTips,
   $showLoading,
-  $hideLoading
-} from '@/components/popupLayout'
+  $hideLoading,
+} from "@/components/popupLayout";
 
-import {$showHotspot,$hideHotspot } from '@/components/hotspot/index.js'
-
-Vue.prototype.$bus = new Vue()
-Vue.prototype.is_bendi = process.env.VUE_APP_ISBENDI
+import { $showHotspot, $hideHotspot } from "@/components/hotspot/index.js";
 
+Vue.prototype.$bus = new Vue();
+Vue.prototype.is_bendi = process.env.VUE_APP_ISBENDI;
 
 Vue.mixin({
-    data() {
-        return {
-          isMobile: browser.mobile
-        }
+  data() {
+    return {
+      isMobile: browser.mobile,
+    };
+  },
+  methods: {
+    $showHotspot,
+    $hideHotspot,
+    $showTips,
+    $hideTips,
+    $showLoading,
+    $hideLoading,
+    g_dealUrl(src) {
+      return window.manage.dealURL(src);
     },
-    methods: {
-      $showShare,
-      $hideShare,
-      $showHotspot,
-      $hideHotspot,
-      $showTips,
-      $hideTips,
-      $showLoading,
-      $hideLoading,
-      g_dealUrl(src){
-        return window.manage.dealURL(src)
-      }
-      // $showLoading,
-      // $showBroadcast,
-      // $hideBroadcast
-    }
-})
-
+    // $showLoading,
+    // $showBroadcast,
+    // $hideBroadcast
+  },
+});

scene/src/views/gui/components/hotList.vue

@@ -14,7 +14,7 @@
         <span
           :class="{ active: hotInd === index }"
           @click="openHot(item, index)"
-          v-for="(item, index) in data "
+          v-for="(item, index) in data"
           :key="index"
           >{{ item.title ? item.title : "热点" }}</span
         >
@@ -36,11 +36,14 @@ export default {
   watch: {},
   methods: {
     openHot(e, index) {
-       window.selectedHotTitle = e.value;
+      window.selectedHotTitle = e.value;
       // 停止自动导览
       window.player.director.stopTour();
-     const curHot = myHotList.filter(item => item.info.title === e.value);
-     console.log("myHotList", myHotList.map(item=>item.info.title));
+      const curHot = myHotList.filter((item) => item.info.title === e.value);
+      console.log(
+        "myHotList",
+        myHotList.map((item) => item.info.title)
+      );
       setTimeout(() => {
         curHot && curHot[0].examine(window.player, true);
         this.hotInd = index;
@@ -50,7 +53,6 @@ export default {
   created() {
     // this.data = window.myHotList || [];
     this.data = this.$t("hotlist");
-    
   },
   mounted() {},
   beforeCreate() {}, //生命周期 - 创建之前
@@ -111,7 +113,7 @@ export default {
         display: block;
         width: 100%;
         &:last-child {
-          margin-bottom: 60px;
+          margin-bottom: 10px;
           border-bottom: 1px solid #f0e2c0;
         }
         &:hover {

scene/src/views/gui/menu.vue

@@ -525,7 +525,7 @@ export default {
             : item.key === "pe"
             ? "Museu Memorial da Lei Básica de Macau"
             : "澳門基本法紀念館";
-        hotGroup.children.forEach((item) => {
+        hotGroup?.children.forEach((item) => {
           item.setTitleElem();
         });
       });