Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/shuangchuangzhou_2022

public/static/js/manage.js

@@ -1,5 +1,7 @@
 var g_ProjectName = window.location.pathname.substring(window.location.pathname.indexOf("/") + 1, window.location.pathname.lastIndexOf("/"));
-var g_Prefix = "https://super.4dage.com/";
+// var g_Prefix = "https://super.4dage.com/";
+var g_Prefix = "https://culture.4dage.com/";
+
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 var s = window.location.href.split("/");
 s.pop();

src/assets/theme/color.less

@@ -17,7 +17,7 @@
 }
 
 .themethree{
-  .theme(#F9942F,#F9942F)
+  .theme(#f9942f,#f9942f)
 }
 
 .themefour{

src/assets/theme/theme.less

@@ -144,7 +144,7 @@
 
     &:hover,
     &.active {
-      color: @backcolor * 2 !important;
+      color: @backcolor !important;
     }
   }
 

src/pages/mobilescene/components/qrcode.vue

@@ -277,6 +277,11 @@ export default {
       text-align: left;
       > span {
         font-size: 12px;
+        &:first-of-type{
+          font-size: 16px;
+          font-weight: bold;
+          letter-spacing: 2px;
+        }
       }
     }
     .ul {

src/pages/mobilescene/index.vue

@@ -44,6 +44,10 @@
       </div>
     </vpopup>
 
+    <div v-if="isShowTips" @click.stop="isShowTips=false" class="btn-tips">
+      <img :src="require(`@/assets/images/proj2022/tip.png`)"  alt="">
+    </div>
+
     <div class="logincon" v-if="loginUrl">
       <iframe :src="loginUrl" frameborder="0"></iframe>
       <img class="close" @click="loginUrl = ''" :src="require('@/assets/images/mobile/icon/close_b.png')" alt="" />
@@ -108,6 +112,7 @@ export default {
     return {
       menuType: "func",
       isShowfunc: false,
+      isShowTips: false,
       showpopup: false,
       showAside: false,
       showSearch: false,
@@ -175,6 +180,7 @@ export default {
           let data = res.data.data;
           if (res.data.source === "showAll") {
             setTimeout(() => {
+              this.isShowTips = true
               this.$hideLoading();
             });
           }
@@ -385,5 +391,21 @@ export default {
       width: 16px;
     }
   }
+  .btn-tips{
+    position: fixed;
+    z-index: 999999;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    >img{
+      position: absolute;
+      width: 34%;
+      bottom: 175px;
+      right: 40px;
+      max-width: 120px;
+    }
+  }
 }
 </style>

src/pages/mobilescene/map.vue

@@ -72,6 +72,9 @@ export default {
   .mapthumb {
     width: 44px;
     height: 44px;
+    .cad{
+      visibility: hidden;
+    }
     > img {
       width: 100%;
       height: 100%;

src/pages/mobilescene/menu/func.vue

@@ -124,7 +124,7 @@ export default {
     },
     tourStatus(newVal) {
       if (newVal) {
-        this.isBgm = true;
+        this.isBgm = false;
       } else {
         let status = localStorage.getItem("g_bgmstatus");
         if (status === "open") {

src/pages/mobilescene/scene.vue

@@ -34,9 +34,8 @@ export default {
         for (let index = 0; index < Booth.length; index++) {
           const item = Booth[index];
           tt = item.company.filter(sub=>sub.panoId==this.boothId)
-          console.log(tt);
-          if (tt) {
-            cutt = tt
+          if (tt.length>0) {
+            cutt = tt[0]
             break
           }
         }

src/pages/scene/index.vue

@@ -6,7 +6,7 @@
     </div>
 
     <div class="scene-con" :class="{ showscene: showAll }">
-      <template v-if="!showViewMode && !tourStatus">
+      <div v-show="!showViewMode && !tourStatus">
         <vside
           v-show="!tourStatus && !isClear"
           :currentPanoid="currentPanoid"
@@ -15,7 +15,7 @@
         <zhanxiang :currentPanoid="currentPanoid" v-show="!tourStatus && !isClear" :zxdata="zhanxiangData" :class="{ zxshow: isShowZX }" />
 
         <img v-if="isClear" @click.stop="clicktoClear" class="isClear" :src="require('@/assets/images/proj2022/pc/reset@2x.png')" alt="" />
-      </template>
+      </div>
 
       <scene v-if="showScene" />
     </div>
@@ -151,6 +151,7 @@ export default {
       });
 
       this.$bus.$on("toggleShowZX", (data) => {
+        console.log(data,55555555555);
         this.isShowZX = data;
       });
 
@@ -332,8 +333,8 @@ export default {
       }
     }
     .zxshow {
-      left: 0;
-      opacity: 1;
+      left: 0!important;
+      opacity: 1!important;
     }
   }
   .popcon {

src/pages/scene/menu.vue

@@ -202,6 +202,7 @@ export default {
   },
   mounted() {
     this.$bus.$on("toggleShowZX", (data) => {
+      console.log(1111,data,1111);
       this.isShowZX = data;
     });
 

src/pages/scene/raside/rmenu.vue

@@ -55,7 +55,7 @@ export default {
     },
     tourStatus(newVal) {
       if (newVal) {
-        this.isBgm = true;
+        this.isBgm = false;
       } else {
         let status = localStorage.getItem("g_bgmstatus");
         if (status === "open") {

src/pages/scene/scene.vue

@@ -33,20 +33,20 @@ export default {
         for (let index = 0; index < Booth.length; index++) {
           const item = Booth[index];
           tt = item.company.filter(sub=>sub.panoId==this.boothId)
-          console.log(tt);
-          if (tt) {
-            cutt = tt
+          if (tt.length>0) {
+            cutt = tt[0]
             break
           }
         }
 
+
+
         if (tt.length>1&&this.boothRepeat) {
           cutt = tt[this.boothRepeat.split('_')[1]]
         }
 
-        console.log(cutt);
 
-        let panoQuat = cutt.firstView.split("qua:")[1];
+        let panoQuat = cutt && cutt.firstView.split("qua:")[1];
         let [x, y, z, w] = panoQuat.split(",");
         tmp = `&firstView=pano:${cutt.panoId},qua:${x + ", " + y + ", " + z + ", " + w}`;
       }

src/pages/scenePage/index.vue

@@ -15,7 +15,7 @@
       <div id="gui">
         <!-- 退出VR模式按钮 -->
         <div id="vrOff" class="disable">
-          <img id="vrOffImg" src="images/vrOffImg.png" alt="" />
+          <img id="vrOffImg" src="static/images/vrOffImg.png" alt="" />
         </div>
 
         <!-- 热点列表 -->
@@ -288,17 +288,17 @@ export default {
         }
       });
 
-      $(document)
-        .off("click touchstart")
-        .on("click touchstart", () => {
-          this.tongji("click");
-        });
-
-      $(document)
-        .off("keydown")
-        .on("keydown", () => {
-          this.tongji("keydown");
-        });
+      // $(document)
+      //   .off("click touchstart")
+      //   .on("click touchstart", () => {
+      //     this.tongji("click");
+      //   });
+
+      // $(document)
+      //   .off("keydown")
+      //   .on("keydown", () => {
+      //     this.tongji("keydown");
+      //   });
     });
   },
   beforeDestroy() {

src/pages/scenePage/views/gui/guide.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="drawer-container" :class="{hiddenzhangxiang:!isZhankai&&isTour}" @touchstart.stop @click.stop>
+  <div id="drawer-container" :class="{hiddenzhangxiang:!isZhankai&&isTour,heping: g_isLandscape}" @touchstart.stop @click.stop>
     <div title="暂停" class="stoptour strmactive">
       <template v-if="!isMobile">
         <div  @click.stop="stop()">
@@ -147,7 +147,7 @@ export default {
 }
 
 
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 1000px) {
   #drawer-container {
     height: auto !important;
     overflow: inherit !important;
@@ -244,5 +244,17 @@ export default {
       }
     }
   }
+
+  #drawer-container.heping{
+    #drawer {
+
+      .frame-container {
+        background-image: url("~@/assets/images/proj2022/mobile/daolan_heng@2x.png") !important;
+         .frame {
+          transform: translateX(10vw);
+          }
+      }
+      }
+  }
 }
 </style>

src/pages/scenePage/views/gui/hotspotlist.vue

@@ -3,7 +3,7 @@
       <div id="hotListTitle">
           <div>
               <span id="hotListText">热点列表</span>
-              <img id="hotListIcon" src="images/hotlist.png" alt="">
+              <img id="hotListIcon" src="static/images/hotlist.png" alt="">
           </div>
       </div>
       <div id="hotListContent">
@@ -11,7 +11,7 @@
           </ul>
       </div>
       <div id="hotListBottom">
-          <img id="hotListClose" src="images/hotListClose.png" alt="">
+          <img id="hotListClose" src="static/images/hotListClose.png" alt="">
       </div>
   </div>
 </template>