shaogen1995 hai 8 meses
pai
achega
a9a4adfeff
Modificáronse 3 ficheiros con 2391 adicións e 1851 borrados
  1. 1 2
      SWKK/src/components/Hot.vue
  2. 2295 1806
      SWKK/src/components/data.js
  3. 95 43
      SWKK/src/views/HotPage.vue

+ 1 - 2
SWKK/src/components/Hot.vue

@@ -299,7 +299,6 @@ export default {
     info: {
       handler(val) {
         // 通过id获取配置化信息
-        // console.log("------------------------", this.hotIdOrName,val);
         const myinfo = hotDataRes.find((v) => v.hotId === this.hotIdOrName.id);
         this.info = val;
         let obj = {
@@ -356,7 +355,7 @@ export default {
     setTimeout(() => {
       this.show = true;
 
-      // console.log('-------',this.info,this.hotIdOrName);
+      // console.log('-------',this.info);
       
 
     }, 300);

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2295 - 1806
SWKK/src/components/data.js


+ 95 - 43
SWKK/src/views/HotPage.vue

@@ -5,7 +5,7 @@
       :info="sonInfo"
       :hotIdOrName="hotIdOrName"
       :isOne="true"
-      @hotClose="()=>{}"
+      @hotClose="() => {}"
     />
   </div>
 </template>
@@ -13,7 +13,7 @@
 <script>
 import Hot from "../components/Hot.vue";
 export default {
-  components: {Hot},
+  components: { Hot },
   data() {
     return {
       sonInfo: null,
@@ -26,65 +26,115 @@ export default {
     // 热点数据处理得到单个数据
     hotListFu(data) {
       // console.log(123,data.length);
-      
+
       // data.forEach(v=>{
-        
+
       //   console.log(`sid:${v.sid},title:${v.title}`);
       // })
-      
-     let info =data.find(v=>v.sid===this.$route.params.id)
-     this.openHotFu(info,data)
+
+      let info = data.find((v) => v.sid === this.$route.params.id);
+      this.openHotFu(info, data);
     },
 
     // 封装点击热点的函数
-    openHotFu(data,arr) {
+    openHotFu(data, arr) {
       let temp = [];
 
-      // 如果是多个热点合并
-      if (data.title.split("&")[1]) {
-        arr.forEach((v) => {
-          if (v.title.split("&")[1] === data.title.split("&")[1]) {
-            temp.push(v);
-            if (v.media && v.media.image && v.media.image.length > 1) {
-              v.media.image.forEach((p, pI) => {
-                if (pI !== 0) temp.push({ ...v, media: { image: [p] } });
-              });
-            }
+      // 额外多出来的 不在场景热点列表中的热点
+      const waiArr = [
+        {
+          name: "赵良璋",
+          id: "ZLZ",
+          info:{
+            audio:[],
+            image:[],
+            link:[
+              {
+                content:'<p>民国时期赵良璋烈士穿过的皮夹克</p>',
+                media:{
+                  link:[{src:'http://yhtjyk.travel-yuhuatai.com:9888/YHTLSJNG/Model2.html?m=yht50'}]
+                }
+              }
+            ],
+            video:[]
           }
-        });
-        let obj = {
-          image: [],
-          audio: [],
-          link: [],
-          video: [],
-        };
-        temp.forEach((v) => {
-          if (obj[v.type]) obj[v.type].push(v);
-        });
-        for (const k in obj) {
-          if (k === "audio") {
-            obj[k].reverse();
+        },
+        {
+          name: "谢士炎",
+          id: "XSY",
+          info:{
+            audio:[],
+            image:[],
+            link:[],
+            video:[]
           }
-        }
+        },
+        {
+          name: "周镐",
+          id: "ZG",
+          info:{
+            audio:[],
+            image:[],
+            link:[],
+            video:[]
+          }
+        },
+      ];
+      let waiObj = waiArr.find((v) => v.id === this.$route.params.id);
 
+      if (waiObj) {
         this.hotIdOrName = {
-          id: data.sid,
-          name: data.title.split("&")[0],
+          id: waiObj.id,
+          name: waiObj.name,
         };
-        this.sonInfo = obj;
+        this.sonInfo = waiObj.info
       } else {
-        this.hotIdOrName = {
-          id: data.sid,
-          name: data.title,
-        };
-        // 单个热点
-        this.sonInfo = { [data.type]: [data] };
+        // 如果是多个热点合并
+        if (data.title.split("&")[1]) {
+          arr.forEach((v) => {
+            if (v.title.split("&")[1] === data.title.split("&")[1]) {
+              temp.push(v);
+              if (v.media && v.media.image && v.media.image.length > 1) {
+                v.media.image.forEach((p, pI) => {
+                  if (pI !== 0) temp.push({ ...v, media: { image: [p] } });
+                });
+              }
+            }
+          });
+          let obj = {
+            image: [],
+            audio: [],
+            link: [],
+            video: [],
+          };
+          temp.forEach((v) => {
+            if (obj[v.type]) obj[v.type].push(v);
+          });
+          for (const k in obj) {
+            if (k === "audio") {
+              obj[k].reverse();
+            }
+          }
+
+          this.hotIdOrName = {
+            id: data.sid,
+            name: data.title.split("&")[0],
+          };
+          this.sonInfo = obj;
+        } else {
+          this.hotIdOrName = {
+            id: data.sid,
+            name: data.title,
+          };
+          // 单个热点
+          this.sonInfo = { [data.type]: [data] };
+        }
       }
     },
   },
   created() {
     let lId = this.$route.params.key;
-    window.KKNum = lId==='1'?'KJ-aigSkgvRWR':'KJ-ufjLwlSXba';
+    window.KKNum = lId === "1" ? "KJ-aigSkgvRWR" : "KJ-ufjLwlSXba";
     const url = `http://yhtjyk.travel-yuhuatai.com:9888/YHT/Swkk/scene_view_data/${
       lId === "1" ? "KJ-aigSkgvRWR" : "KJ-ufjLwlSXba"
     }/user/hot.json`;
@@ -103,8 +153,10 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.HotPage{
+.HotPage {
   width: 100%;
   height: 100%;
+  overflow: hidden;
+  position: relative;
 }
 </style>