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

src/components/hotspot/image.vue

@@ -4,7 +4,7 @@
     <div class="vhotspotcon">
       <div class="vtitle" v-if="hotspot.title" v-html="hotspot.title"></div>
       <div class="hotspotcon" :class="{hotconfull:!hotspot.title&&!(hotspot.title||hotspot.imagesDesc[active])}">
-        <div class="img-con"  :class="{ bigImg: !hotspot.imagesDesc[active] || !hotspot.contents[active] }">
+        <div class="img-con">
           <div class="imgmain">
             <img id="map" :src="g_fixUrl(hotspot.images[active])" alt="" />
           </div>

src/components/hotspot/model.vue

@@ -41,7 +41,7 @@
           alt=""
           @click="handlePage('prev')"
         />
-        <div class="imgmain" :class="{ bigImg: !hotspot.content }">
+        <div class="imgmain" >
           <iframe
             :key="active"
             allowfullscreen

src/components/popupLayout/Alert.vue

@@ -2,11 +2,9 @@
   <popup ref="Message" :show="show">
     <div class="ui-message">
       <div class="ui-message-header">
-        <img @click="onClose" :src="`${$cdn}images/img_guestbook_close@2x.png`" alt="" />
         <p>{{title}}</p>
       </div>
       <div class="ui-message-main">
-        <!-- <img :src="`${$cdn}images/img_guestbook_${icon}@2x.png`" alt="" /> -->
         <span>{{tips}}</span>
       </div>
     </div>
@@ -111,7 +109,6 @@ textarea::placeholder {
       height: 38px;
       line-height: 38px;
       border: none;
-      background: url("@{cdn}img_guestbook_btnbg_normal@2x.png") no-repeat
         center center;
       background-size: 100% 100%;
       color: #382e2c;
@@ -120,7 +117,6 @@ textarea::placeholder {
       }
     }
     .submit {
-      background: url("@{cdn}img_guestbook_btnbg_first@2x.png") no-repeat center
         center;
       background-size: 100% 100%;
       color: #f5ede2;

src/components/popupLayout/Message.vue

@@ -161,7 +161,6 @@ textarea::placeholder {
       height: 38px;
       line-height: 38px;
       border: none;
-      background: url("@{cdn}img_guestbook_btnbg_normal@2x.png") no-repeat
         center center;
       background-size: 100% 100%;
       color: #382e2c;
@@ -170,7 +169,6 @@ textarea::placeholder {
       }
     }
     .submit {
-      background: url("@{cdn}img_guestbook_btnbg_first@2x.png") no-repeat center
         center;
       background-size: 100% 100%;
       color: #f5ede2;

src/pages/mobile.vue

@@ -2,15 +2,16 @@
   <div
     id="mainhome"
     class="home"
+    :class="{hengpinghome:g_isLandscape}"
     :style="{
-      backgroundImage: `url(${require('@/assets/images/proj2022/mob_bg.jpg')})`,
+      backgroundImage: `url(${require(`@/assets/images/proj2022/${g_isLandscape?'hengping_bg':'mob_bg'}.jpg`)})`,
     }"
   >
-    <div class="h-con">
+    <div class="h-con" >
       <div class="h-title">
-        <img :src="require('@/assets/images/proj2022/mobile_title.png')" alt="" />
+        <img :src="require(`@/assets/images/proj2022/${g_isLandscape?'hengping_title':'mobile_title'}.png`)" alt="" />
       </div>
-      <img class="tunits" :src="require('@/assets/images/proj2022/mob_text.png')" alt="" />
+      <img class="tunits" :src="require(`@/assets/images/proj2022/${g_isLandscape?'zhuban':'mob_text'}.png`)" alt="" />
       <p><span>中国 · 天津</span>2022年8月</p>
       <img @click="gotoScene" class="h-btn" :src="require('@/assets/images/project/btn.png')" alt="" />
     </div>
@@ -24,7 +25,7 @@ export default {
     g_isLandscape: {
       immediate: true,
       handler: function(newVal) {
-        newVal ? this.$showOrientationtip({ isLandscape: false }) : this.$hideOrientationtip();
+        // newVal ? this.$showOrientationtip({ isLandscape: false }) : this.$hideOrientationtip();
       },
     },
   },
@@ -85,6 +86,7 @@ export default {
       width: 70%;
       margin: 40px auto;
     }
+  
     > p {
       font-size: 16px;
       > span {
@@ -118,6 +120,57 @@ export default {
   }
 }
 
+.hengpinghome{
+.h-con {
+    width: 73%;
+    margin: 0 auto;
+    padding-top: 10px;
+    color: #fff;
+    text-align: center;
+    .h-title {
+      width: 100%;
+      > img {
+        width: 100%;
+      }
+    }
+    .tunits {
+      width: 70%;
+      margin: 0 auto;
+    }
+  
+    > p {
+      font-size: 16px;
+      > span {
+        display: inline-block;
+        margin-right: 10vw;
+      }
+    }
+    > ul {
+      width: 100%;
+      margin: 30px auto 0;
+      text-align: left;
+      > li {
+        display: flex;
+        margin: 4px 0;
+        > span {
+          line-height: 1.4;
+          font-size: 12px;
+          &:first-of-type {
+            text-align: justify;
+            min-width: 74px;
+            flex-shrink: 0;
+          }
+        }
+      }
+    }
+    .h-btn {
+      margin: 20px auto;
+      max-width: 168px;
+      cursor: pointer;
+    }
+  }
+}
+
 @media screen and (max-width: 340px) {
   .home {
     .h-con {

src/pages/mobilescene/birdview/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="birdview">
+  <div class="birdview" :class="{hengbirdview:g_isLandscape}">
     <ViewOperation>
-      <div class="birdview" :style="{ backgroundImage: `url(${require(`@/assets/images/proj2022/birdviewbg.jpg`)})` }">
+      <div class="birdview" :style="{ backgroundImage: `url(${require(`@/assets/images/proj2022/${g_isLandscape?'bg_hp_birdview':'birdviewbg'}.jpg`)})` }">
         <!-- <img v-if="!hideClose" class="close" @click="close" :src="require('@/assets/images/proj2022/pc/cancel.png')" alt="" /> -->
 
         <div class="modelcon">
@@ -123,6 +123,7 @@ export default {
         > img {
           display: inline-block;
           width: 36vw;
+          max-width: 50%;
           position: absolute;
           left: 50%;
           transform: translate(-50%, -50%);
@@ -150,4 +151,7 @@ export default {
     }
   }
 }
+.hengbirdview{
+  
+}
 </style>

src/pages/mobilescene/components/daka.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="daka" :class="{heping:g_isLandscape}" :style="{backgroundImage:`url(${require(`@/assets/images/proj2022/mobile/tab_shu@2x.png`)})`}">
+  <div class="daka" :class="{heping:g_isLandscape}" :style="{backgroundImage:`url(${require(`@/assets/images/proj2022/mobile/tab_shu.png`)})`}">
     <!-- <svg height="100%" width="100%">
       <defs>
         <clipPath id="svgPathdaka">

src/pages/mobilescene/index.vue

@@ -79,6 +79,11 @@ Booth.forEach((item) => {
   all_booth = all_booth.concat(item.company);
 });
 
+let gdBgm = new Audio()
+gdBgm.src = require('@/assets/audio/bgm.mp3')
+gdBgm.loop = true
+
+
 export default {
   components: {
     scene,
@@ -126,6 +131,16 @@ export default {
   },
 
   watch: {
+    currentZhanqu(newVal){
+      if (newVal) {
+        if (newVal.id =='2_15') {
+          gdBgm.play()
+        }
+        else{
+          gdBgm.pause()
+        }
+      }
+    },
     showBirdview: {
       deep: true,
       immediate: true,
@@ -469,6 +484,7 @@ export default {
 .ronundHide {
   transition: ease all 0.5s;
   opacity: 0;
+  transform: translateY(100%);
   pointer-events: none !important;
 }
 </style>

src/pages/mobilescene/menu/exhibition.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="ebtm-menu">
-    <img @click.stop="$bus.$emit('changeMenu', 'func')" :src="require(`@/assets/images/proj2022/mobile/menu_active@2x.png`)" alt="" />
+    <img @click.stop="$bus.$emit('changeMenu', 'func')" :src="require(`@/assets/images/proj2022/mobile/menu_active.png`)" alt="" />
     <ul>
       <li v-for="(item, i) in list" :key="i">
         <div :class="{ active: item.id == $route.params.type }" @click="onClick(item)">
-          <img :src="require(`@/assets/images/proj2022/mobile/zhanxiang/${item.id}@2x.png`)" alt="" />
+          <img :src="require(`@/assets/images/proj2022/mobile/zhanxiang/${item.id}.png`)" alt="" />
         </div>
       </li>
     </ul>
@@ -92,7 +92,7 @@ export default {
     z-index: 999;
     width: 100%;
     height: 103px;
-    background-image: url("~@/assets/images/proj2022/mobile/shuping_left@2x.png");
+    background-image: url("~@/assets/images/proj2022/mobile/shuping_left.png");
     background-size: 100% auto;
     background-repeat: no-repeat;
     background-position: bottom left;
@@ -180,7 +180,7 @@ export default {
       z-index: 999;
       width: 100%;
       height: 110px !important;
-      background-image: url("~@/assets/images/proj2022/mobile/hengping@2x.png") !important;
+      background-image: url("~@/assets/images/proj2022/mobile/hengping.png") !important;
       background-size: 100% auto;
       background-repeat: no-repeat;
       background-position: bottom left;

src/pages/mobilescene/menu/func.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="btm-menu">
-    <img @click.stop="$bus.$emit('changeMenu', 'exhibition')" :src="require(`@/assets/images/proj2022/mobile/menu@2x.png`)" alt="" />
+    <img @click.stop="$bus.$emit('changeMenu', 'exhibition')" :src="require(`@/assets/images/proj2022/mobile/menu.png`)" alt="" />
     <ul>
       <li v-for="(item, i) in fixMenu" :key="i">
         <div :class="{ active: (i == 3 && isShowHuDong) || (item.id == 'bgm' && isBgm) }" @click="onClick(item)">
@@ -263,7 +263,7 @@ export default {
     z-index: 999;
     width: 100%;
     height: 103px;
-    background-image: url("~@/assets/images/proj2022/mobile/tab@2x.png");
+    background-image: url("~@/assets/images/proj2022/mobile/tab.png");
     background-size: 100% auto;
     background-repeat: no-repeat;
     background-position: bottom left;
@@ -423,7 +423,7 @@ export default {
       z-index: 999;
       width: 100%;
       height: 110px !important;
-      background-image: url("~@/assets/images/proj2022/mobile/hengping@2x.png") !important;
+      background-image: url("~@/assets/images/proj2022/mobile/hengping.png") !important;
       background-size: 100% auto;
       background-repeat: no-repeat;
       background-position: bottom left;

src/pages/mobilescene/raside/menu.vue

@@ -8,8 +8,8 @@
       </li>
     </ul>
     <div class="control">
-      <img @click.stop="onClickNavigate('up')" :src="require(`@/assets/images/proj2022/mobile/up@2x.png`)" alt="" />
-      <img @click.stop="onClickNavigate('down')" :src="require(`@/assets/images/proj2022/mobile/down@2x.png`)" alt="" />
+      <img @click.stop="onClickNavigate('up')" :src="require(`@/assets/images/proj2022/mobile/up.png`)" alt="" />
+      <img @click.stop="onClickNavigate('down')" :src="require(`@/assets/images/proj2022/mobile/down.png`)" alt="" />
     </div>
   </div>
 </template>

src/pages/mobilescene/zhanxiang/index.vue

@@ -1,9 +1,9 @@
 <!-- <template>
   <div class="zhanxiang">
     <div class="z-bar">
-      <img @click.stop="$emit('close')" :src="require('@/assets/images/proj2022/mobile/left@2x.png')" alt="" />
+      <img @click.stop="$emit('close')" :src="require('@/assets/images/proj2022/mobile/left.png')" alt="" />
       <span @click.stop="search">请输入关键字...</span>
-      <img @click.stop="search" :src="require('@/assets/images/proj2022/mobile/search@2x.png')" alt="" />
+      <img @click.stop="search" :src="require('@/assets/images/proj2022/mobile/search.png')" alt="" />
     </div>
 
     <div class="zhan-con" ref="bgsw" v-swiper:mySwiper="swiperOptions">

src/pages/scene/index.vue

@@ -79,6 +79,10 @@ let requestFullscreen = function(e) {
     : e.msRequestFullscreen && e.msRequestFullscreen();
 };
 
+let gdBgm = new Audio()
+gdBgm.src = require('@/assets/audio/bgm.mp3')
+gdBgm.loop = true
+
 export default {
   components: {
     zhanxiang,
@@ -109,6 +113,7 @@ export default {
       currentZhanqu: "",
       isShowZX: true,
       showViewMode: false,
+      gdBgm
     };
   },
   computed: {
@@ -124,6 +129,16 @@ export default {
   },
 
   watch: {
+    currentZhanqu(newVal){
+      if (newVal) {
+        if (newVal.id =='2_15') {
+          gdBgm.play()
+        }
+        else{
+          gdBgm.pause()
+        }
+      }
+    },
     currentTheme(newVal) {
       if (newVal) {
         let tt = this.currentPanoid;