aamin 1 year ago
parent
commit
25677cd50a
2 changed files with 103 additions and 168 deletions
  1. 9 10
      hot - 离线版/src/views/Home.vue
  2. 94 158
      scene/src/views/gui/menu.vue

+ 9 - 10
hot - 离线版/src/views/Home.vue

@@ -116,7 +116,7 @@
                   }
                 "
                 :controls="screenWidth > 1000 ? isControal : 'true'"
-                :src="urlToFitFu(item.url)"
+                :src="urlToFitFu(`..${item.url}`)"
                 v-if="index === myInd"
                 :autoplay="screenWidth > 1000 ? 'true' : 'false'"
               ></video>
@@ -235,13 +235,12 @@ export default {
   methods: {
     // 本地化 url 适配
     urlToFitFu(url) {
-      return url;
-      // const resUrl = url;
-      // if (url.includes("https://super.4dage.com")) {
-      //   return url.replace("https://super.4dage.com", "");
-      // } else if (url.includes("http://super.4dage.com")) {
-      //   return url.replace("http://super.4dage.com", "");
-      // } else return resUrl;
+      const resUrl = url;
+      if (url.includes("https://super.4dage.com")) {
+        return url.replace("https://super.4dage.com", "");
+      } else if (url.includes("http://super.4dage.com")) {
+        return url.replace("http://super.4dage.com", "");
+      } else return resUrl;
     },
 
     // 点击左右箭头
@@ -265,10 +264,10 @@ export default {
     async getData() {
       // https://www.4dmodel.com/
 
-      let url = `https://super.4dage.com/data/${
+      // let url = `https://super.4dage.com/data/${
         // 线上数据
 
-        // let url = `/data/${
+        let url = `../data/${
         //本地化部署
         this.id
       }/hot/js/data.js?time=${Math.random()}`;

+ 94 - 158
scene/src/views/gui/menu.vue

@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="pinBottom-container"
-    @touchstart.stop
-    @keydown.stop
-    :style="{ bottom: isGuide ? '40px' : '' }"
-  >
+  <div class="pinBottom-container" @touchstart.stop @keydown.stop :style="{ bottom: isGuide ? '40px' : '' }">
     <!-- 左边图画 -->
     <div class="pinBottom leftPic">
       <img src="../../assets/images/leftPic.png" alt="" style="width: 90px" />
@@ -18,142 +13,64 @@
     <div class="pinBottom left">
       <div>
         <div class="viewContainer">
-          <div
-            id="previous"
-            class="previous desktop-only ui-icon"
-            style="display: none"
-          >
+          <div id="previous" class="previous desktop-only ui-icon" style="display: none">
             <a>
-              <img
-                rel="tooltip"
-                title=""
-                :src="require('@/assets/images/play.png')"
-                width="24"
-                height="24"
-                data-original-title="播放"
-              />
+              <img rel="tooltip" title="" :src="require('@/assets/images/play.png')" width="24" height="24"
+                data-original-title="播放" />
             </a>
           </div>
-          <div
-            id="play"
-            class="ui-icon"
-            rel="tooltip"
-            data-original-title="播放"
-          >
+          <div id="play" class="ui-icon" rel="tooltip" data-original-title="播放">
             <!-- 鼠标移入的显示 -->
             <!-- <div class="hoverTit">自动漫游</div> -->
             <a>
-              <img
-                :src="require('@/assets/images/icon/play.png')"
-                width="24"
-                height="24"
-              />
+              <img :src="require('@/assets/images/icon/play.png')" width="24" height="24" />
             </a>
             <div class="btmText">自动漫游</div>
           </div>
           <div id="pause" class="ui-icon" style="display: none">
             <a>
-              <img
-                rel="tooltip"
-                title=""
-                :src="require('@/assets/images/icon/pause.png')"
-                width="24"
-                height="24"
-                data-original-title="暂停"
-              />
+              <img rel="tooltip" title="" :src="require('@/assets/images/icon/pause.png')" width="24" height="24"
+                data-original-title="暂停" />
               <div class="btmText" style="margin-left: -10px">自动漫游</div>
             </a>
           </div>
-          <div
-            id="next"
-            class="next desktop-only ui-icon wide"
-            style="display: none"
-          >
+          <div id="next" class="next desktop-only ui-icon wide" style="display: none">
             <a>
-              <i
-                rel="tooltip"
-                title=""
-                class="icon icon-dpad-right"
-                data-original-title="下一个"
-              ></i>
+              <i rel="tooltip" title="" class="icon icon-dpad-right" data-original-title="下一个"></i>
             </a>
           </div>
           <div id="gui-modes-map" class="ui-icon double active">
-            <div
-              data-original-title="导览"
-              @click="isGuide = !isGuide"
-              id="pullTab"
-              rel="tooltip"
-              title="场景导览"
-            >
+            <div data-original-title="导览" @click="isGuide = !isGuide" id="pullTab" rel="tooltip" title="场景导览">
               <!-- 鼠标移入的显示 -->
               <!-- <div class="hoverTit">导览列表</div> -->
 
-              <img
-                title=""
-                class="icon icon-inside"
-                :src="
-                  require(`@/assets/images/icon/auto${
-                    !isGuide ? '_active' : ''
-                  }.png`)
-                "
-              />
+              <img title="" class="icon icon-inside" :src="require(`@/assets/images/icon/auto${!isGuide ? '_active' : ''
+                }.png`)
+                " />
               <div class="btmText">导览列表</div>
             </div>
 
-            <div
-              data-original-title="全景漫游"
-              id="gui-modes-inside"
-              rel="tooltip"
-            >
+            <div data-original-title="全景漫游" id="gui-modes-inside" rel="tooltip">
               <!-- 鼠标移入的显示 -->
               <!-- <div class="hoverTit">全景漫游</div> -->
 
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/icon/inside.png')"
-              />
-              <img
-                class="icon icon-inside active"
-                :src="require('@/assets/images/icon/inside_active.png')"
-              />
+              <img class="icon icon-inside" :src="require('@/assets/images/icon/inside.png')" />
+              <img class="icon icon-inside active" :src="require('@/assets/images/icon/inside_active.png')" />
 
               <div class="btmText">全景漫游</div>
             </div>
-            <div
-              title="迷你漫游"
-              data-original-title="迷你模型"
-              id="gui-modes-dollhouse"
-              rel="tooltip"
-            >
+            <div title="迷你漫游" data-original-title="迷你模型" id="gui-modes-dollhouse" rel="tooltip">
               <!-- 鼠标移入的显示 -->
               <!-- <div class="hoverTit">迷你模型</div> -->
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/icon/dollhouse.png')"
-              />
-              <img
-                class="icon icon-inside active"
-                :src="require('@/assets/images/icon/dollhouse_active.png')"
-              />
+              <img class="icon icon-inside" :src="require('@/assets/images/icon/dollhouse.png')" />
+              <img class="icon icon-inside active" :src="require('@/assets/images/icon/dollhouse_active.png')" />
               <div class="btmText">迷你模型</div>
             </div>
-            <div
-              data-original-title="俯视图"
-              id="gui-modes-floorplan"
-              rel="tooltip"
-              title="顶部俯视"
-            >
+            <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="顶部俯视">
               <!-- 鼠标移入的显示 -->
               <!-- <div class="hoverTit">顶部俯视</div> -->
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/icon/floor.png')"
-              />
-              <img
-                class="active icon icon-inside active"
-                :src="require('@/assets/images/icon/floor_active.png')"
-              />
+              <img class="icon icon-inside" :src="require('@/assets/images/icon/floor.png')" />
+              <img class="active icon icon-inside active" :src="require('@/assets/images/icon/floor_active.png')" />
               <div class="btmText">顶部俯视</div>
             </div>
 
@@ -205,20 +122,12 @@
 
         <div id="vr" class="ui-icon wide hidden" style="display: none">
           <a>
-            <i
-              rel="tooltip"
-              title="{[{ VIEW_IN_VR }]}"
-              class="icon icon-webvr"
-            ></i>
+            <i rel="tooltip" title="{[{ VIEW_IN_VR }]}" class="icon icon-webvr"></i>
           </a>
         </div>
         <div id="sharing" class="ui-icon wide hidden" style="display: none">
           <a>
-            <i
-              rel="tooltip"
-              title="{[{ SOCIAL_SHARING }]}"
-              class="icon icon-share"
-            ></i>
+            <i rel="tooltip" title="{[{ SOCIAL_SHARING }]}" class="icon icon-share"></i>
           </a>
         </div>
         <div class="pull-right terms terms2">
@@ -227,20 +136,10 @@
 
         <!-- 音乐 -->
         <div id="volume" class="toHomeBox" style="margin-right: '10px'">
-          <img
-            id="openMusic"
-            style="display: block; margin-bottom: -1%"
-            @click="switchBGM(true)"
-            src="../../assets/img/musicAc.png"
-            alt=""
-          />
-          <img
-            id="closeMusic"
-            style="display: none; margin-bottom: -1%"
-            @click="switchBGM(false)"
-            src="../../assets/img/music.png"
-            alt=""
-          />
+          <img id="openMusic" style="display: block; margin-bottom: -1%" @click="switchBGM(true)"
+            src="../../assets/img/musicAc.png" alt="" />
+          <img id="closeMusic" style="display: none; margin-bottom: -1%" @click="switchBGM(false)"
+            src="../../assets/img/music.png" alt="" />
           <div class="btmText">声音</div>
         </div>
 
@@ -275,19 +174,9 @@
           <!-- 鼠标移入的显示 -->
           <!-- <div class="hoverTit">全屏</div> -->
           <!-- 打开全屏 -->
-          <img
-            @click="fullClick"
-            v-show="!isFull"
-            src="../../assets/img/fullscreen.png"
-            alt=""
-          />
+          <img @click="fullClick" v-show="!isFull" src="../../assets/img/fullscreen.png" alt="" />
           <!-- 退出全屏 -->
-          <img
-            @click="exitfull"
-            v-show="isFull"
-            src="../../assets/img/fullscree_active.png"
-            alt=""
-          />
+          <img @click="exitfull" v-show="isFull" src="../../assets/img/fullscree_active.png" alt="" />
           <div class="btmText">全屏</div>
         </div>
       </div>
@@ -342,13 +231,13 @@ export default {
     //请求点赞计数
     async getVisit() {
       axios
-        .get("https://count.4dage.com/api/count/detail/KJ-vAo7DRnQVeK")
+        .get("https://sit-likecount.4dage.com/api/show/share/detail/KJ-vAo7DRnQVeK")
         .then((res) => {
           console.log("接口", res);
 
           if (res.data.code != -200) {
-            this.rightList[0].name = res.data.data.starSum;
-            this.rightList[1].name = res.data.data.visitSum;
+            this.rightList[0].name = res.data.data.pcsStar;
+            this.rightList[1].name = res.data.data.pcsVisit;
           }
         });
     },
@@ -356,10 +245,13 @@ export default {
     async onLike() {
       if (!this.isLike) {
         axios
-          .get("https://count.4dage.com/api/count/saveStar/KJ-vAo7DRnQVeK")
+          .post("https://sit-likecount.4dage.com/api/show/addVisit", {
+            sceneCode: "KJ-vAo7DRnQVeK",
+            type: "star"
+          })
           .then((res) => {
             if (res.data.code != -200) {
-              this.rightList[0].name = res.data.data.starSum;
+              this.getVisit()
             }
           });
         this.isLike = true;
@@ -368,8 +260,11 @@ export default {
     // 浏览计数
     onVisit() {
       axios
-        .get("https://count.4dage.com/api/count/saveVisit/KJ-vAo7DRnQVeK")
-        .then(() => {});
+        .post("https://sit-likecount.4dage.com/api/show/addVisit", {
+          sceneCode: "KJ-vAo7DRnQVeK",
+          type: "visit"
+        })
+        .then(() => { });
     },
     switchBGM(flag) {
       this.musicState = flag;
@@ -440,8 +335,10 @@ export default {
 
 <style lang="less" scoped>
 ::-webkit-scrollbar {
-  width: 5px; /*高宽分别对应横竖滚动条的尺寸*/
+  width: 5px;
+  /*高宽分别对应横竖滚动条的尺寸*/
 }
+
 ::-webkit-scrollbar-thumb {
   // box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
   background: #edd3b0;
@@ -449,16 +346,20 @@ export default {
   color: #edd3b0;
   outline: none;
 }
+
 // 鼠标移入显示的文字和图片
 #gui-modes-inside {
   position: relative;
 }
+
 #gui-modes-dollhouse {
   position: relative;
 }
+
 #gui-modes-floorplan {
   position: relative;
 }
+
 .hoverTit {
   pointer-events: none;
   transition: all 0.5s;
@@ -476,31 +377,38 @@ export default {
   font-size: 14px;
   color: #fff;
 }
+
 #play:hover {
   .hoverTit {
     opacity: 1;
   }
 }
+
 #pause:hover {
   .hoverTit {
     opacity: 1;
   }
 }
-#gui-modes-map > div:hover {
+
+#gui-modes-map>div:hover {
   .hoverTit {
     opacity: 1;
   }
 }
+
 #volume {
   // margin-right: 16px;
 }
+
 #volume,
 #gui-fullscreen,
 #gui-fullscreen-exit {
   position: relative;
+
   .hoverTit {
     width: 70px;
   }
+
   &:hover {
     .hoverTit {
       opacity: 1;
@@ -522,34 +430,42 @@ export default {
 // 右侧菜单栏
 @wh: 50px;
 @margin: 0px;
+
 #play,
 #pause {
   margin-right: @margin;
+
   img {
     width: @wh;
     height: @wh;
   }
 }
+
 .rightViewContainer {
   display: flex !important;
   align-items: center !important;
 }
+
 #gui-modes-map {
-  > div {
+  >div {
     margin-right: @margin;
-    > img {
+
+    >img {
       width: @wh;
       height: @wh;
       display: block !important;
     }
+
     .active {
       display: none !important;
     }
   }
+
   .active {
-    > img {
+    >img {
       display: none !important;
     }
+
     .active {
       display: block !important;
     }
@@ -563,6 +479,7 @@ export default {
 #gui-fullscreen img {
   width: 44px;
 }
+
 #volume {
   // width: 44px;
 }
@@ -570,12 +487,15 @@ export default {
 #gui-fullscreen-exit img {
   width: 44px !important;
 }
+
 .bgandshare {
   background: none !important;
+
   // margin-right: 20px!important;
-  > div {
+  >div {
     width: 100%;
     cursor: pointer;
+
     img {
       width: 50px;
     }
@@ -595,6 +515,7 @@ export default {
     width: 50px;
     margin-bottom: -2%;
   }
+
   &:hover {
     .hoverTit {
       opacity: 1;
@@ -612,6 +533,7 @@ export default {
     align-items: center;
     cursor: pointer;
   }
+
   .openBox {
     opacity: 0;
     pointer-events: none;
@@ -625,6 +547,7 @@ export default {
     // background-color: rgba(255, 255, 255, 0.6);
     backdrop-filter: blur(10px);
   }
+
   .openBoxAc {
     opacity: 1;
     pointer-events: auto;
@@ -636,17 +559,20 @@ export default {
   .hoverTit {
     opacity: 0 !important;
   }
+
   .viewContainer {
-    & > div {
+    &>div {
       img {
         width: 40px !important;
         height: 40px !important;
       }
     }
   }
+
   .pinBottom-container #myHotList {
     width: 60px;
     margin-bottom: 15px;
+
     img {
       margin-bottom: 10px;
     }
@@ -657,33 +583,41 @@ export default {
     justify-content: left;
     margin-left: 10px;
     bottom: 130px;
+
     .leftPic {
       display: none;
     }
+
     .rightPic {
       display: none;
     }
+
     .pinBottom.right {
       height: auto;
     }
+
     .pinBottom.right.hideTarget {
       position: fixed;
       bottom: 40px;
       right: 10px;
       height: auto !important;
+
       .rightViewContainer {
         flex-direction: column;
+
         // margin-top: 30px;
-        & > div,
+        &>div,
         #volume {
           width: 50px;
           text-align: right;
           margin-right: 0;
           margin-bottom: 20px;
-          & > div {
+
+          &>div {
             display: flex;
             justify-content: center;
           }
+
           img {
             width: 40px;
             height: 40px;
@@ -693,6 +627,7 @@ export default {
       }
     }
   }
+
   .btmText {
     font-size: 12px;
     width: 60px;
@@ -701,6 +636,7 @@ export default {
     height: 19px;
     line-height: 19px;
   }
+
   .quanping {
     display: none;
   }