tremble 3 years ago
parent
commit
cf86307c1a

+ 5 - 4
public/static/js/lib/lunpan/hyglobal.min.css

@@ -4583,16 +4583,17 @@ video {
 }
 
 .hymenu1>span div{
-  width: 46px;
-  margin: 0px auto -2px;
-  height: 46px;
+  width: 5vh;
+  margin: 0px auto 2px;
+  height: 5vh;
   overflow: hidden;
   background-position: 0 0;
   background-size: auto 100%;
 }
 
+
 .hymenu1 .on div{
-  animation: boom-mclose-data 0.5s steps(25) forwards;
+  /* animation: boom-mclose-data 0.5s steps(25) forwards; */
 }
 
 @keyframes boom-mopen-data {

+ 2 - 2
public/static/js/manage.js

@@ -1,7 +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 = "//super.4dage.com/";
 // http://wangzhan.cctv.com/wlwm2022/test/data/1248
-// var g_Prefix = "https://wangzhan.cctv.com/wlwm2022/test/";
+var g_Prefix = "//wangzhan.cctv.com/wlwm2022/";
 
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 var s = window.location.href.split("/");

+ 17 - 2
src/clients/mobile.vue

@@ -10,7 +10,10 @@ import "@/assets/style/public.less";
 import "@/assets/theme/color.less";
 import wxShare from "@/utils/wxshare";
 
-// let tongjiurl = "https://shuangchuang-api.kczg.org.cn/Web/jt/";
+let gdBgm = new Audio();
+gdBgm.src = require("@/assets/audio/bgm.mp3");
+gdBgm.loop = true;
+
 
 export default {
   methods: {},
@@ -22,11 +25,23 @@ export default {
   },
   mounted() {
     if (!this.isMobile) {
+      // window.location.href = window.location.href.replace("mobile.html", "index.html");
       window.location.href = window.location.href.replace("mobile.html", "index.html");
     }
 
     this.$nextTick(() => {
-      document.addEventListener("WeixinJSBridgeReady", () => {}, false);
+
+
+      document.addEventListener("WeixinJSBridgeReady", ()=>{
+        gdBgm.play();
+        setTimeout(() => {
+          gdBgm.pause();
+        },);
+      }, false);
+
+      this.$bus.$on("toggleGdBgm", (data) => {
+        data == 'play' ? gdBgm.play() : gdBgm.pause();
+      });
       wxShare({
         title: `新时代中国网络文明建设成果展云展示`,
         desc: `弘扬时代新风 建设网络文明`,

+ 28 - 27
src/components/emoji/index.vue

@@ -1,20 +1,12 @@
 <template>
-  <div>
+  <div v-clickoutside="clickoutside">
     <div class="biaoqingContent" @click.stop>
-      <img
-        class="expression"
-        @click.stop="show = !show"
-        src="./expression.png"
-      />
+      <img class="expression" @click.stop="show = !show" src="./expression.png" />
       <!--      表情选择框-->
       <div class="box" v-if="show" @click.stop>
         <div class="left">
           <ul>
-            <li
-              v-for="(item, index) in biaoqingList"
-              :key="index"
-              :class="['cursor', biaoqingActive === index ? 'active' : '']"
-            >
+            <li v-for="(item, index) in biaoqingList" :key="index" :class="['cursor', biaoqingActive === index ? 'active' : '']">
               <div @click="bqNameChange(index, item.iconArr)">
                 {{ item.name }}
               </div>
@@ -22,13 +14,8 @@
           </ul>
         </div>
         <div class="right">
-          <button
-            v-for="(i, index) in rightList"
-            :key="index"
-            class="emoji"
-            @click.stop="insertHtmlAtCaret(i.icon)"
-          >
-          <span>{{i.icon}}</span>
+          <button v-for="(i, index) in rightList" :key="index" class="emoji" @click.stop="insertHtmlAtCaret(i.icon)">
+            <span>{{ i.icon }}</span>
           </button>
         </div>
       </div>
@@ -79,6 +66,10 @@ export default {
     },
   },
   methods: {
+    clickoutside() {
+      console.log("clickoutside", 111111);
+      this.show = false;
+    },
     valueChange() {
       if (!this.value) return;
       let str = this.value;
@@ -114,7 +105,7 @@ export default {
     },
     //表情插入文本框
     insertHtmlAtCaret(icon) {
-      this.$emit('select',icon)
+      this.$emit("select", icon);
     },
   },
 
@@ -126,6 +117,16 @@ export default {
   },
   mounted() {
     this.valueChange();
+
+    window.addEventListener("message", (res) => {
+      if (Object.prototype.toString.call(res.data) == "[object Object]") {
+        if (res.data.source === "clickScene") {
+          if (this.show) {
+            this.show = false;
+          }
+        }
+      }
+    });
   },
   components: {},
 };
@@ -154,7 +155,7 @@ export default {
 
   .box {
     border: 1px solid #73a8f9;
-    width:400px;
+    width: 400px;
     min-height: 400px;
     box-shadow: 0px 0px 16px rgba(0, 0, 0, 0.2);
     background: #fff;
@@ -241,13 +242,13 @@ export default {
 
 @media screen and (max-width: 600px) {
   .biaoqingContent {
-      .box {
-        width: 80vw;
-        right: -10vw;
-        max-height: 26vh;
-        min-height: unset;
-        overflow-y: auto;
-      }
+    .box {
+      width: 80vw;
+      right: -10vw;
+      max-height: 26vh;
+      min-height: unset;
+      overflow-y: auto;
+    }
   }
 }
 </style>

+ 23 - 6
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">
+        <div class="img-con" :class="{ bigImg: !(hotspot.imagesDesc[active]|| hotspot.contents[active]) }">
           <div class="imgmain">
             <img id="map" :src="g_fixUrl(hotspot.images[active])" alt="" />
           </div>
@@ -24,11 +24,11 @@
   <div v-else class="mbhotspot">
     <div class="mbhcon" :class="{ fullcon: !hotspot.content || !hotspot.contents[active] }">
       <div class="img-con">
-        <img class="aa" v-if="hotspot.images.length > 1" :src="require('@/assets/images/proj2022/mobile/prev.png')" alt="" @click="handlePage('prev')" />
+        <img class="aa" :class="{hengaa:g_isLandscape}" v-if="hotspot.images.length > 1" :src="require('@/assets/images/proj2022/mobile/prev.png')" alt="" @click="handlePage('prev')" />
         <div class="imgmain" >
           <img id="map" :src="g_fixUrl(hotspot.images[active])" alt="" />
         </div>
-        <img class="aa"  v-if="hotspot.images.length > 1" :src="require('@/assets/images/proj2022/mobile/next.png')" alt="" @click="handlePage('next')" />
+        <img class="aa" :class="{hengaa:g_isLandscape}" v-if="hotspot.images.length > 1" :src="require('@/assets/images/proj2022/mobile/next.png')" alt="" @click="handlePage('next')" />
       </div>
       <div class="desc" v-if="hotspot.imagesDesc[active] || hotspot.contents[active]">
         <div class="title" v-html="hotspot.title"></div>
@@ -63,7 +63,7 @@ export default {
       }
       this.to = setTimeout(() => {
         this.$hideLoading();
-      }, 1500);
+      }, 1000);
     },
   },
   methods: {
@@ -84,7 +84,9 @@ export default {
     },
     reset() {
       this.panzoom.pan(0, 0);
-      this.panzoom.zoom(this.isMobile ? 1 : !this.hotspot.content ? 0.8 : 1);
+      // this.panzoom.zoom(this.isMobile ? 1 : !this.hotspot.content ? 0.8 : 1);
+      this.panzoom.zoom(1);
+
       this.$hideLoading();
     },
   },
@@ -95,7 +97,7 @@ export default {
     const elem = document.getElementById("map");
     this.panzoom = Panzoom(elem, {
       maxScale: 10,
-      startScale: this.isMobile ? 1 : !this.hotspot.content ? 0.8 : 1,
+      startScale: 1
     });
     const parent = elem.parentElement
     // No function bind needed
@@ -169,6 +171,7 @@ export default {
         }
       }
        @pos: 10px;
+       @posh: 50px;
       .aa {
         position: absolute;
         width: 30px;
@@ -183,6 +186,20 @@ export default {
           left: unset;
         }
       }
+      .hengaa{
+        position: absolute;
+        width: 30px;
+        height: auto;
+        cursor: pointer;
+        top: 50%;
+        transform: translateY(-50%);
+        left: @posh;
+        z-index: 999;
+        &:last-of-type {
+          right: @posh;
+          left: unset;
+        }
+      }
     }
     .desc {
       overflow-y: auto;

+ 1 - 0
src/components/hotspot/index.vue

@@ -191,6 +191,7 @@ export default {
           bottom: 0px;
           left: 50%;
           transform: translate(-50%);
+          text-shadow: 0 0 2px #000;
         }
         .desc {
           width: 1136px;

+ 21 - 19
src/components/menu/index.vue

@@ -111,17 +111,22 @@ export default {
   watch: {
     currentTheme(newVal) {
       console.log(newVal, "currentTheme");
-      if (!this.noMode && newVal) {
-        window.noFlyToPano = true;
-        $(".hymenu a[data-gid=" + newVal.id + "]").click();
+      if (newVal) {
+        if (!this.noMode) {
+          window.noFlyToPano = true;
+          $(".hymenu a[data-gid=" + newVal.id + "]").click();
+        }
       }
     },
     currentZhanqu(newVal) {
-      console.log(newVal, "currentZhanqu");
       if (newVal) {
+        console.log(newVal);
         if (!this.noMode) {
           window.noFlyToPano = true;
           $(".hymenu_industry a[data-gid=" + newVal.id + "]").click();
+          if (newVal.id == "1_1") {
+            window.noFlyToPano = false;
+          }
         }
       }
     },
@@ -190,7 +195,7 @@ export default {
           // } else {
           //   this.$hideBirdView();
           // }
-      
+
           if (ttt.company[0].id == "1_1") {
             $(".hymenu_industry").addClass("height0");
             $(".hyrlbg_ind").addClass("height0");
@@ -214,13 +219,14 @@ export default {
 
             console.dir($(data2.currentTarget).parent());
 
+            console.log(!window.noFlyToPano, "dwdwdwd!window.noFlyToPano");
 
             // if ($(data2.currentTarget).parent().hasClass('on')) {
             //   return
             // }
             ctx2 && ctx2.areaClick(data2);
 
-            if (!window.noFlyToPano ) {
+            if (!window.noFlyToPano) {
               this.$showLoading();
               this.$bus.$emit("ifrMessage", {
                 events: "flyToPano",
@@ -229,17 +235,8 @@ export default {
             }
             // this.$hideLoading();
             // this.$showLoading();
-            
             window.noFlyToPano = false;
           });
-
-          // setTimeout(() => {
-          // console.log(this.currentZhanqu,'currentZhanqu');
-          // if (this.currentZhanqu) {
-
-          // }
-          // !window.noFlyToPano && $(".hymenu_industry a[data-gid=" + ttt.company[0].id + "]").click();
-          // }, 500);
         } else {
           $(".hymenu_industry").addClass("height0");
           $(".hyrlbg_ind").addClass("height0");
@@ -266,9 +263,7 @@ export default {
           (data) => {
             let currentid = $(data.currentTarget).attr("data-gid");
             let item = this.list.find((ii) => ii.id == currentid);
-            item.maidiancode &&
-              window.goldlog.record(`/spec.1.1`, "", `snsScene=${item.maidiancode}&product=mobh5&pagename=中国网络文明建设成果展云展示`, "");
-
+            item.maidiancode && window.goldlog.record(`/spec.1.1`, "", `snsScene=${item.maidiancode}&product=mobh5&pagename=中国网络文明建设成果展云展示`, "");
 
             if (item.id == "like") {
               this.dianzan();
@@ -567,6 +562,13 @@ export default {
   #hycontrolBtn {
     transform: translateY(16vh);
   }
+  .micon {
+  
+    > img {
+      width: 8vh;
+    }
+   
+  }
 }
 
 .tstion {
@@ -595,7 +597,7 @@ export default {
   left: 60%;
   display: flex;
   z-index: 999;
-  transform: translate(-50%, 0) rotate(10deg);
+  transform: translate(-72%, 0) rotate(15deg);
   .pic {
     width: 35px;
     > img {

+ 1 - 1
src/data/booth.js

@@ -6,7 +6,7 @@ let calcuSpread = (start, end, other=[], getRid=[] ) => {
       arr.push(String(start + i));
     }
   }
-  return arr.concat(other);
+  return arr.concat(other).map(ii=>String(ii));
 };
 
 

+ 15 - 15
src/data/raw.js

@@ -1,14 +1,14 @@
-import { Booth } from './booth'
+import {Booth} from './booth'
 
 //计算点位分布
-let calcuSpread = (start, end, other = [], getRid = []) => {
+let calcuSpread = (start, end, other=[], getRid=[] ) => {
   let arr = [];
   for (let i = 0; i <= end - start; i++) {
-    if (!(getRid.indexOf(start + i) > -1)) {
+    if (!(getRid.indexOf(start + i)>-1)) {
       arr.push(String(start + i));
     }
   }
-  return arr.concat(other);
+  return arr.concat(other).map(ii=>String(ii));
 };
 
 //展区
@@ -17,8 +17,8 @@ let region = [
     id: "1",
     name: "综合展区",
     theme: "rgba(179, 104, 216, 1)",
-    company: Booth.find(item => item.id == '1').company, //综合展区ID
-    spread: calcuSpread(0, 57, [344], []),
+    company: Booth.find(item=>item.id=='1').company, //综合展区ID
+    spread: calcuSpread(0, 57,[344],[]),
     firstView: {
       panoId: "0",
       panoQuaternion: {
@@ -33,13 +33,13 @@ let region = [
     id: "2",
     name: "地方展区",
     theme: "rgba(187, 39, 39, 1)", //主题颜色
-    company: Booth.find(item => item.id == '2').company,  //地方展区id
-    spread: calcuSpread(58, 282, [], [254, 257, 258]),
+    company: Booth.find(item=>item.id=='2').company,  //地方展区id
+    spread: calcuSpread(58, 282,[393,394,395],[254,257,258]),
     firstView: {
       panoId: "4",
       panoQuaternion: {
         x: -0.016484962519480128,
-        y: 0.7083437993857234,
+        y:0.7083437993857234,
         z: 0.016551859736091593,
         w: 0.7054809155529423
       },
@@ -49,15 +49,15 @@ let region = [
     id: "3",
     name: "互联网企业展区",
     theme: "rgba(113, 200, 82, 1)",
-    company: Booth.find(item => item.id == '3').company,  //互联网企业ID
-    spread: calcuSpread(283, 392, [254, 257, 258], [344]),
+    company: Booth.find(item=>item.id=='3').company,  //互联网企业ID
+    spread: calcuSpread(283, 392,[254,257,258,396,397,398],[344]),
     firstView: {
       panoId: "47",
       panoQuaternion: {
-        x: 0.0008521342062728275,
-        y: 0.7237583641229127,
-        z: -0.000893757162925398,
-        w: 0.6900523954291632
+        x:0.0008521342062728275,
+        y:0.7237583641229127,
+        z:-0.000893757162925398,
+        w:0.6900523954291632
       },
     },
   }

+ 2 - 2
src/mixins/index.js

@@ -18,8 +18,8 @@ import pagination from "@/components/pagination";
 import { region } from "@/data/raw";
 window.g_lock = false;
 
-let hotUrl = "https://super.4dage.com/";
-// let hotUrl = 'https://shuangchuangyunzhanlan.bj.bcebos.com/'
+// let hotUrl = "//super.4dage.com/";
+let hotUrl = '//wangzhan.cctv.com/wlwm2022/'
 
 Vue.mixin({
   data() {

+ 1 - 0
src/pages/Home.vue

@@ -43,6 +43,7 @@ export default {
     },
   },
   mounted() {
+    this.$hideLoading()
     this.$nextTick(() => {
       $("#mainhome")
         .off("click")

+ 3 - 2
src/pages/mobile.vue

@@ -48,6 +48,7 @@ export default {
     },
   },
   mounted() {
+    this.$hideLoading()
     this.$nextTick(() => {
       $("#mainhome")
         .off("touchstart")
@@ -84,7 +85,7 @@ export default {
     }
     .tunits {
       width: 70%;
-      margin: 40px auto;
+      margin: 30px auto;
     }
   
     > p {
@@ -113,7 +114,7 @@ export default {
       }
     }
     .h-btn {
-      margin: 40px auto;
+      margin: 30px auto;
       max-width: 168px;
       cursor: pointer;
     }

+ 1 - 1
src/pages/mobilescene/birdview/ViewOperationh.vue

@@ -26,7 +26,7 @@ export default {
       height: wh.height,
       tscale: 1,
       translate: {
-        x: (wh.width - window.innerWidth ) / 2,
+        x: (wh.width - window.innerWidth ) / 10,
         y: 0
       },
       isFireFox: browser.gecko,

+ 17 - 67
src/pages/mobilescene/birdview/hengping.vue

@@ -1,18 +1,18 @@
 <template>
-  <div class="birdview" :class="{hengbirdview:g_isLandscape}" :style="{ backgroundImage: `url(${require(`@/assets/images/proj2022/${g_isLandscape?'bg_hp_birdview':'birdviewbg'}.jpg`)})` }">
-    <ViewOperation>
-        <div class="modelcon">
-          <img :src="require(`@/assets/images/proj2022/model.png`)" alt="" />
-          <div class="tag" v-for="(item, i) in tags" :key="i" :style="{ top: item.top, left: item.left, width: item.width, height: item.height }">
-            <img @click="onClick(item)" :src="require(`@/assets/images/proj2022/bird_view/${item.eng}${currentId == item.id ? '_acitve' : ''}.svg`)" alt="" />
-          </div>
-        </div>
-    </ViewOperation>
+  <div class="birdview" :style="{ backgroundImage: `url(${require(`@/assets/images/proj2022/${g_isLandscape ? 'bg_hp_birdview' : 'birdviewbg'}.jpg`)})` }">
+    <!-- <ViewOperation> -->
+    <div class="modelcon">
+      <img :src="require(`@/assets/images/proj2022/model.png`)" alt="" />
+      <div class="tag" v-for="(item, i) in tags" :key="i" :style="{ top: item.top, left: item.left, width: item.width, height: item.height }">
+        <img @click="onClick(item)" :src="require(`@/assets/images/proj2022/bird_view/${item.eng}${currentId == item.id ? '_acitve' : ''}.svg`)" alt="" />
+      </div>
+    </div>
+    <!-- </ViewOperation> -->
   </div>
 </template>
 
 <script>
-import ViewOperation from "./ViewOperationh";
+// import ViewOperation from "./ViewOperationh";
 import { region } from "@/data/raw.js";
 import { Booth } from "@/data/booth.js";
 
@@ -31,7 +31,7 @@ export default {
     };
   },
   components: {
-    ViewOperation,
+    // ViewOperation,
   },
   methods: {
     onClick(data) {
@@ -39,14 +39,13 @@ export default {
       let player = window.player;
       if (!player) {
         this.$bus.$emit("resetCurrentTheme");
-        
-        this.$showLoading()
+
+        this.$showLoading();
         this.$bus.$emit("ifrMessage", {
           events: "flyToPano",
           data: data,
         });
 
-
         return;
       }
 
@@ -97,64 +96,15 @@ export default {
     z-index: 99;
   }
   .modelcon {
-    width: 100%;
-    margin: 0 auto;
-    text-align: center;
-    position: relative;
-    > img {
-      width: 100%;
-    }
-   .tag {
-      position: absolute;
-      cursor: pointer;
-      display: inline-block;
-      text-align: center;
-      top: 50%;
-      left: 50%;
-      // background: rgba(0, 0, 0, 0.5);
-      // width: 10%;
-      height: 15%;
-      &:hover {
-        > img {
-          display: inline-block;
-          width: 36vw;
-          position: absolute;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          top: 10%;
-        }
-      }
-
-      &:first-of-type {
-        top: 17%;
-        left: 6%;
-        width: 45%;
-        height: 49%;
-        clip-path: polygon(0 40%, 70% 0%, 100% 50%, 25% 100%);
-        &:hover {
-          > img {
-            top: 40%;
-          }
-        }
-      }
-
-      > img {
-        width: 100%;
-        display: none;
-      }
-    }
-  }
-}
-.hengbirdview{
-    .modelcon {
-    width: 100%;
+    height: 100%;
     margin: 0 auto;
     text-align: center;
     position: relative;
     > img {
-      width: 100%;
+      height: 100%;
+      width: auto;
     }
-   .tag {
+    .tag {
       position: absolute;
       cursor: pointer;
       display: inline-block;

+ 1 - 1
src/pages/mobilescene/birdview/index.vue

@@ -107,7 +107,7 @@ export default {
     text-align: center;
     position: relative;
     > img {
-      width: 100%;
+      width: 90%;
     }
    .tag {
       position: absolute;

+ 3 - 3
src/pages/mobilescene/components/content.vue

@@ -172,12 +172,12 @@ export default {
         }
       }
       >ul{
-        height: calc(100% - 180px);
+        height: calc(100% - 120px);
         width: 100%;
         overflow-x: hidden;
         overflow-y: auto;
-        margin: 20px auto 30px;
-        padding: 0 20px 20px;
+        margin: 20px auto 0;
+        padding: 0 20px 40px;
         >li{
           display: flex;
           justify-content: space-between;

+ 19 - 18
src/pages/mobilescene/index.vue

@@ -31,16 +31,18 @@
             <span>恢复</span>
           </div>
         </div>
-        <roundMenu
-          @resetCurrentTheme="currentTheme = ''"
-          @toggleBirdView="(data) => (showBirdview = data)"
-          :currentZhanqu="currentZhanqu"
-          :currentTheme="currentTheme"
-          :class="!showViewMode && !tourStatus && !isClear ? 'ronundShow' : 'ronundHide'"
-          @showSearch="showSearch = true"
-          @play="startTour"
-        />
       </template>
+
+      <roundMenu
+        v-show="!g_isLandscape"
+        @resetCurrentTheme="currentTheme = ''"
+        @toggleBirdView="(data) => (showBirdview = data)"
+        :currentZhanqu="currentZhanqu"
+        :currentTheme="currentTheme"
+        :class="!showViewMode && !tourStatus && !isClear ? 'ronundShow' : 'ronundHide'"
+        @showSearch="showSearch = true"
+        @play="startTour"
+      />
     </div>
 
     <birdview :key="rnd" @close="showBirdview = false" v-if="showBirdview && !g_isLandscape" />
@@ -81,9 +83,6 @@ 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: {
@@ -140,9 +139,10 @@ export default {
         window.goldlog.record("/spec.1.1", "", `snsScene=m_area${this.currentZhanqu.id}&product=mobh5&pagename=中国网络文明建设成果展云展示`, "");
 
         if (newVal.id == "2_15") {
-          gdBgm.play();
+          this.$bus.$emit("toggleGdBgm",'play')
+
         } else {
-          gdBgm.pause();
+          this.$bus.$emit("toggleGdBgm",'pause')
         }
       }
     },
@@ -162,6 +162,7 @@ export default {
         if (this.showBirdview) {
           this.showBirdview = false;
           setTimeout(() => {
+            this.currentTheme = "";
             this.showBirdview = true;
           }, 0);
         }
@@ -191,16 +192,18 @@ export default {
   mounted() {
     this.$showLoading();
     this.$nextTick(() => {
+      
+    
       this.$bus.$on("resetCurrentTheme", () => {
         this.currentTheme = "";
       });
       this.$bus.$on("toggleBGM", (data) => {
         if (data) {
           if (this.currentZhanqu.id == "2_15") {
-            gdBgm.play();
+            this.$bus.$emit("toggleGdBgm",'play')
           }
         } else {
-          gdBgm.pause();
+            this.$bus.$emit("toggleGdBgm",'pause')
         }
       });
       $("#scenebody")
@@ -304,8 +307,6 @@ export default {
               }
             });
 
-        
-
             if (this.firstin) {
               this.firstin = false;
               return;

+ 3 - 3
src/pages/mobilescene/search/index.vue

@@ -15,13 +15,13 @@
           <p v-if="item.company.length > 0">{{ item.name }} <span v-html="item.desc"></span></p>
           <ul>
             <li
-              @click="handleItem(sub)"
               class="textActive"
               :class="{ active: currentPano.id == sub.id }"
               v-for="(sub, idx) in item.company"
               :key="idx"
-              v-html="sub.name"
-            ></li>
+            >
+            <span @click="handleItem(sub)" v-html="sub.name"></span>
+            </li>
           </ul>
         </li>
       </ul>

+ 23 - 6
src/pages/scene/components/content.vue

@@ -5,7 +5,7 @@
         留言板
       </div>
       <div class="cbody">
-        <ul>
+        <ul ref="liuyanref">
           <li v-for="(item, i) in list" :key="i">
             <img :src="item.avatar || require(`@/assets/images/project/icon/usericon.png`)" alt="" />
             <div>
@@ -91,8 +91,8 @@ export default {
       if (!this.msg.trim()) {
         this.$showTips({ content: "请输入留言内容" });
       } else {
-        postcontent({ message: this.msg}, () => {
-          this.$showTips({ content: '留言成功!' });
+        postcontent({ message: this.msg }, () => {
+          this.$showTips({ content: "留言成功!" });
           this.msg = "";
           this.getcontentList();
         });
@@ -121,6 +121,7 @@ export default {
           });
 
           this.paging.total = res.data.total;
+          this.$refs.liuyanref.scrollTop = 0;
         }
       );
     },
@@ -130,11 +131,13 @@ export default {
 
 <style lang="less" scoped>
 @w: 1236px;
+@hee: 740px;
 @fixw: 8px;
+
 .vcontent {
   width: @w;
   position: relative;
-  height: 740px;
+  height: @hee;
   pointer-events: none;
 
   .vcontentcon {
@@ -156,8 +159,8 @@ export default {
       font-size: 30px;
       font-weight: bold;
       position: relative;
-      &::after{
-        content: '';
+      &::after {
+        content: "";
         display: inline-block;
         position: absolute;
         left: 251px;
@@ -289,4 +292,18 @@ export default {
     border-radius: 6px;
   }
 }
+
+@media screen and (max-width: 1400px) {
+  .vcontent {
+    width: calc(@w * 0.85);
+    height: calc(@hee * 0.85);
+    .vcontentcon {
+      .cbody {
+        >ul{
+          height: 220px;
+        }
+      }
+    }
+  }
+}
 </style>

+ 10 - 1
src/pages/scenePage/index.vue

@@ -283,13 +283,19 @@ export default {
         $("#player")
           .off("touchstart")
           .on("touchstart", () => {
-            console.log(11111);
             window.goldlog.record("/spec.1.1", "", "snsScene=m_page3&product=mobh5&pagename=中国网络文明建设成果展云展示", "");
           });
       } else {
         $("#player")
           .off("click")
           .on("click", () => {
+            window.parent.postMessage(
+            {
+              source: "clickScene",
+              data: true,
+            },
+            "*"
+          );
             window.goldlog.record("/spec.1.1", "", "snsScene=p_page3&product=pcweb&pagename=中国网络文明建设成果展云展示", "");
           });
       }
@@ -303,6 +309,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+html{
+  overflow: hidden;
+}
 .parent-body {
   width: 100%;
   height: 100%;

+ 5 - 13
src/utils/wxshare.js

@@ -209,25 +209,17 @@ function jsonToStr(data) {
 function setup({ title, link, imgUrl, desc }) {
     let defaultFn = () => { }
     let defaultChar = ''
-    let search = link.substr(link.indexOf('?'))
-    let path = link.substr(0, link.indexOf('?'))
-    let data = strToJSON(search)
     wx.ready(function () {
         // 微信朋友圈
-        data.open = 'wx_friends'
-        wx.onMenuShareTimeline({ title, link: path + jsonToStr(data), imgUrl, desc })
+        wx.onMenuShareTimeline({ title, link: link, imgUrl, desc })
         // 微信好友
-        data.open = 'wx_friend'
-        wx.onMenuShareAppMessage({ title, desc, link: path + jsonToStr(data), imgUrl, type: defaultChar, dataUrl: defaultChar })
+        wx.onMenuShareAppMessage({ title, desc, link: link, imgUrl, type: defaultChar, dataUrl: defaultChar })
         // 微博
-        data.open = 'weibo'
-        wx.onMenuShareWeibo({ title, desc, link: path + jsonToStr(data), imgUrl, success: defaultFn, cancel: defaultFn })
+        wx.onMenuShareWeibo({ title, desc, link: link, imgUrl, success: defaultFn, cancel: defaultFn })
         // 空间
-        data.open = 'qq_zone'
-        wx.onMenuShareQZone({ title, desc, link: path + jsonToStr(data), imgUrl, success: defaultFn, cancel: defaultFn })
+        wx.onMenuShareQZone({ title, desc, link: link, imgUrl, success: defaultFn, cancel: defaultFn })
         // QQ好友
-        data.open = 'qq'
-        wx.onMenuShareQQ({ title, desc, link: path + jsonToStr(data), imgUrl, success: defaultFn, cancel: defaultFn })
+        wx.onMenuShareQQ({ title, desc, link: link, imgUrl, success: defaultFn, cancel: defaultFn })
 
         wx.hideMenuItems({
             menuList: [