Merge branch 'master' of http://face3d.4dage.com:7005/chenzimin2/ZGZQBWG

scene/public/static/js/Hot.js

@@ -1269,9 +1269,9 @@ window.initHot = function(model){
             var popup = document.getElementById("popup");
             
             if (openHot) {
-                if(window.parent.sceneBackIconStatus) {
-                    // 关闭返回按钮
-                    window.parent.sceneBackIconStatus(false)
+                // 热点打开关闭显示机器人
+                if(window.parent && window.parent.handleShowFigure) {
+                    window.parent.handleShowFigure(false)
                 }
                 g_currentHot = this,
                 popup.style.display = "block",
@@ -1742,9 +1742,9 @@ window.initHot = function(model){
     
     Hot.closePopup = ()=>{// 关闭热点页面
         if(!g_currentHot) return;
-        // 关闭热点，显示返回按钮
-        if(window.parent&&window.parent.sceneBackIconStatus){
-            window.parent.sceneBackIconStatus(true)
+        // 关闭热点，显示机器人
+        if(window.parent&&window.parent.handleShowFigure){
+            window.parent.handleShowFigure(true)
         }
         g_currentHot = null;
         var hotPop = document.getElementById('popup'); 

scene/src/views/gui/menu.vue

@@ -161,21 +161,17 @@
           <div class="btmText">点赞</div>
         </div> -->
         <!-- 分享 -->
-        <div class="toHomeBox" @click="share">
+        <!-- <div class="toHomeBox" @click="share">
           <img src="../../assets/img/share.png" alt="" />
           <div class="btmText">分享</div>
-        </div>
+        </div> -->
 
         <!-- 全屏 -->
-        <div class="toHomeBox quanping">
-          <!-- 鼠标移入的显示 -->
-          <!-- <div class="hoverTit">全屏</div> -->
-          <!-- 打开全屏 -->
+        <!-- <div class="toHomeBox quanping">
           <img @click="fullClick" v-show="!isFull" src="../../assets/images/icon/fullscreen.png" alt="" />
-          <!-- 退出全屏 -->
           <img @click="exitfull" v-show="isFull" src="../../assets/images/icon/fullscree_active.png" alt="" />
           <div class="btmText">全屏</div>
-        </div>
+        </div> -->
       </div>
     </div>
 
@@ -423,13 +419,13 @@ export default {
 .btmText {
   font-size: 14px;
   position: absolute;
-  bottom: -30%;
-  color: #e3d9bf;
+  bottom: -35%;
+  color: #ffffff;
   text-shadow: 0 0 5px rgba(0, 0, 0, 0.9);
 }
 
 // 右侧菜单栏
-@wh: 44px;
+@wh: 32px;
 @margin: 15px;
 
 #play,
@@ -515,7 +511,7 @@ export default {
   justify-content: center;
 
   img {
-    width: 44px;
+    width: @wh;
     margin-bottom: 5px;
   }
 

zhengquan/src/views/Home/components/unitList.vue

@@ -55,23 +55,25 @@ var timer = null as any
 watch(hoverIndex, (newVal: any) => {
   const infoBoxPcDom = document.getElementById('infoBoxPc')
   console.log('余数', newVal % 7)
-  clearTimeout(timer)
-  timer = setTimeout(() => {
-    if (newVal % 7 <= 4 && newVal % 7 > 0) {
-      infoBoxPcDom!.style.right = 'auto'
-      infoBoxPcDom!.style.left = hoverDomRightX.value + 'px'
-    } else {
-      infoBoxPcDom!.style.left = 'auto'
-      infoBoxPcDom!.style.right = window.innerWidth - hoverDomLeftX.value + 'px'
-    }
-    if (newVal <= 7) {
-      infoBoxPcDom!.style.bottom = window.innerHeight - hoverDomBottomY.value - hoverDomBottomY.value / 4 + 'px'
+  if (infoBoxPcDom) {
+    clearTimeout(timer)
+    timer = setTimeout(() => {
+      if (newVal % 7 <= 4 && newVal % 7 > 0) {
+        infoBoxPcDom.style.right = 'auto'
+        infoBoxPcDom.style.left = hoverDomRightX.value + 'px'
+      } else {
+        infoBoxPcDom.style.left = 'auto'
+        infoBoxPcDom.style.right = window.innerWidth - hoverDomLeftX.value + 'px'
+      }
+      if (newVal <= 7) {
+        infoBoxPcDom!.style.bottom = window.innerHeight - hoverDomBottomY.value - hoverDomBottomY.value / 4 + 'px'
 
-    } else {
-      infoBoxPcDom!.style.bottom = window.innerHeight - hoverDomBottomY.value - 40 + 'px'
-    }
-    isShowInfoBox.value = true
-  }, 100)
+      } else {
+        infoBoxPcDom!.style.bottom = window.innerHeight - hoverDomBottomY.value - 40 + 'px'
+      }
+      isShowInfoBox.value = true
+    }, 100)
+  }
 
 }, { immediate: true })
 
@@ -85,9 +87,10 @@ watch(hoverIndex, (newVal: any) => {
 //   immediate: true
 // })
 
-
+// @ts-ignore
 let swiper2 = null as any
 const swiper2Index = ref(0)
+// @ts-ignore
 let swiper = null as any
 onMounted(() => {
   swiper = new Swiper(".mySwiper", {
@@ -121,22 +124,21 @@ onMounted(() => {
   });
 
   curUnit.value = store.dataAll.welfareList[0]
-  console.log(curUnit.value)
 })
 
-const swiper2Prev = () => {
-  swiper2.slidePrev()
-}
-const swiper2Next = () => {
-  swiper2.slideNext()
-}
+// const swiper2Prev = () => {
+//   swiper2.slidePrev()
+// }
+// const swiper2Next = () => {
+//   swiper2.slideNext()
+// }
 
-const swiperPrev = () => {
-  swiper.slidePrev()
-}
-const swiperNext = () => {
-  swiper.slideNext()
-}
+// const swiperPrev = () => {
+//   swiper.slidePrev()
+// }
+// const swiperNext = () => {
+//   swiper.slideNext()
+// }
 
 
 
@@ -148,18 +150,16 @@ const swiperNext = () => {
   <div class='scene-list-box'>
     <!-- 信息展示 -->
     <div id="infoBoxPc" class="info-box" v-show="isShowInfoBox && !browser.mobile" @mousemove="isShowInfoBox = true">
-      <!-- <div id="infoBoxPc" class="info-box" v-show="true"> -->
       <img class="close-icon" @click="isShowInfoBox = false" src="@/assets/images/close-icon.png" alt="">
       <div class="info-box-top"></div>
       <div class="info-box-bottom">
         <div class="bottom-left">
-          <h1>{{ hoverIndex }}</h1>
-          <h4>{{ curUnit.title ? curUnit.title : '' }}</h4>
-          <div class="left-disc">{{ curUnit.disc ? curUnit.disc : '' }}</div>
+          <h4>{{ curUnit ? curUnit.title : '' }}</h4>
+          <div class="left-disc">{{ curUnit ? curUnit.disc : '' }}</div>
           <!-- <h4>{{ store.dataAll.welfareList[0].title ? store.dataAll.welfareList[0].title : '' }}</h4>
           <p>{{ store.dataAll.welfareList[0].disc ? store.dataAll.welfareList[0].disc : '' }}</p> -->
         </div>
-        <div class="bottom-right">
+        <!-- <div class="bottom-right">
           <div class="swiper mySwiper">
             <div class="swiper-wrapper">
               <div class="swiper-slide" v-for="(item, index) in curUnit.images" :key="index"><img
@@ -169,13 +169,13 @@ const swiperNext = () => {
             <div class="swiper-button-next" @click="swiperNext"></div>
             <div class="swiper-pagination"></div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
     <!-- 信息展示移动端 -->
     <div class="info-box-mo" v-show="isShowInfoBox && browser.mobile">
       <!-- Swiper -->
-      <div class="swiper mySwiper2">
+      <!-- <div class="swiper mySwiper2">
         <div class="swiper-wrapper">
           <div class="swiper-slide" v-for="(item, index) in curUnit.images" :key="index"><img
               :src="`${baseUrl}/welfareImage/${curUnit.id + 1}/${item}`" alt=""></div>
@@ -188,10 +188,10 @@ const swiperNext = () => {
             @click="swiper2.slideTo(index)" :class="{ 'active': swiper2Index == index }">
           </div>
         </div>
-      </div>
+      </div> -->
       <div class="content-info">
-        <h4>{{ curUnit.title }}</h4>
-        <div>{{ curUnit.disc }}</div>
+        <h4>{{ curUnit ? curUnit.title : '' }}</h4>
+        <div>{{ curUnit ? curUnit.disc : '' }}</div>
       </div>
     </div>
     <div class="content" v-if="!browser.mobile">
@@ -284,7 +284,7 @@ const swiperNext = () => {
       justify-content: space-around;
 
       .bottom-left {
-        width: 35%;
+        width: 90%;
 
         .left-disc {
           font-size: 14px;
@@ -539,7 +539,7 @@ const swiperNext = () => {
       position: relative;
       overflow: inherit;
 
-      .icon-down{
+      .icon-down {
         position: absolute;
         top: 0;
         transform: translateY(-100%);

zhengquan/src/views/Scene/ScenePage.vue

@@ -11,6 +11,7 @@ declare global {
     hotListShowChangeFu: (v: boolean) => void,
     handleRobot: (state: string) => void,
     handleTopRobot: (state: string) => void,
+    handleShowFigure: (v: boolean) => void,
   }
 }
 
@@ -62,6 +63,7 @@ const goHotCamarer = (hot: any) => {
 // 形象状态 greeting-招呼 idle-静默 talk-说话
 const animalStat = ref('greeting')
 const xingxiangListShow = ref(false)
+const isShowFigure = ref(true)
 
 onMounted(() => {
   getAllHotspot()
@@ -84,6 +86,11 @@ onMounted(() => {
     const xuliezhenDom = document.getElementById('xuliezhenid')
     state == 'top' ? !browser.mobile ? xuliezhenDom!.style.bottom = '200px' : xuliezhenDom!.style.bottom = '120px' : !browser.mobile ? xuliezhenDom!.style.bottom = '100px' : xuliezhenDom!.style.bottom = '10px'
   }
+
+  // 机器人隐藏与显示（热点打开时隐藏）
+  window.handleShowFigure = (state: boolean) => {
+    isShowFigure.value = state
+  }
 })
 </script>
 
@@ -111,7 +118,7 @@ onMounted(() => {
         </div>
       </div>
     </div>
-    <div class="xingxiangBox">
+    <div class="xingxiangBox" v-show="isShowFigure">
       <!-- 形象人 -->
       <div id="xuliezhenid" class="xuliezhen" v-if="isReady" @click="xingxiangListShow = true"
         :style="{ backgroundImage: `url(${baseUrl}/animation/${currentUnit.id + 1}/${animalStat}.png)`, backgroundSize: 'cover' }">