upp

web/src/assets/style/reset.less

@@ -340,6 +340,10 @@ img {
 #ele1 path{
   fill: #165491;
 }
+// // 地图的线
+// #cad path {
+//   stroke-width: 0.5;
+// }
 
 .viewer-title{
   display: none !important;

web/src/components/exhibition/index.vue

@@ -55,15 +55,18 @@ export default {
     };
   },
   methods: {
-    isShowHide(){
-      this.isShow=false
+    isShowHide() {
+      this.isShow = false;
     },
     // 封装一个隐藏地图的方法，让父组件调用 ↑
     handleItem(val) {
       // 中文版
       if (this.Mylangue) {
-        window.location.href = window.location.origin +window.location.pathname+ `#/?m=${val}`;
-      } else window.location.href = window.location.origin +window.location.pathname+ `#/?m=${val}_1`;
+        window.location.href =
+          window.location.origin + window.location.pathname + `#/?m=${val}`;
+      } else
+        window.location.href =
+          window.location.origin + window.location.pathname + `#/?m=${val}_1`;
       location.reload(true);
     },
   },
@@ -71,14 +74,22 @@ export default {
     isShow(newVal) {
       let css = newVal ? "0px" : "-310px";
       $(".cad").css({ right: css });
+
       // 展开地图的时候隐藏移动端的菜单
-      if(newVal) this.$emit('meanMHide')
+      if (newVal) this.$emit("meanMHide");
     },
   },
   mounted() {
     this.list.forEach((v) => {
       if (window.location.href.includes(v.Logo)) {
         this.current = v;
+        this.$nextTick(() => {
+          const mapDom = document.querySelector("#cad");
+          console.log("pppppp", mapDom);
+          // if (v.id === 3) mapDom.style.strokeWidth = 0.2;
+          // // 二楼的线粗细
+          // else mapDom.style.strokeWidth = 0.5; // 负一楼和一楼的地图线 粗细
+        });
       }
     });
   },

web/src/components/welcome/index.vue

@@ -9,7 +9,12 @@
     ></video>
     <div class="mobileBox" v-else>
       <div class="videoPlay" v-if="videoPlay">
-        <video src="../../assets/img/strat.mp4" autoplay controls></video>
+        <video
+          id="modelVid"
+          src="../../assets/img/strat.mp4"
+          autoplay
+          controls
+        ></video>
         <i class="el-icon-close" @click="videoPlay = false"></i>
       </div>
       <img class="mobileBoxBg" src="../../assets/imgM/bgWe.png" alt="" />
@@ -20,7 +25,7 @@
         src="../../assets/imgM/play_active.png"
         alt=""
       />
-      <div class="mobileBoxBtn" @click="languagShow = true">进入展馆</div>
+      <div class="mobileBoxBtn" @click="languagShow = true" v-if="!languagShow">进入展馆</div>
     </div>
     <div class="SeLanguage" :class="{ active: languagShow }">
       <div class="box">
@@ -58,6 +63,28 @@ export default {
       playImgOpa: 1,
     };
   },
+  watch: {
+    videoPlay(val) {
+      if (val) {
+        // 移动端监听视频播放完毕
+        this.$nextTick(() => {
+          setTimeout(() => {
+            let dom = document.querySelector("#modelVid");
+            if (dom) {
+              dom.addEventListener(
+                "ended",
+                () => {
+                  this.videoPlay = false;
+                  this.languagShow = true;
+                },
+                false
+              );
+            }
+          }, 100);
+        });
+      }
+    },
+  },
   methods: {
     skip(val) {
       window.location.href =
@@ -77,7 +104,7 @@ export default {
         }, 1500);
       }
     }
-    // 监听视频播放完毕
+    // pc监听视频播放完毕
     this.$nextTick(() => {
       setTimeout(() => {
         let dom = document.querySelector(".myVideo");

web/src/views/gui/component/game.vue

@@ -12,7 +12,7 @@
         {{ Mylangue ? "开心消消乐" : "Anipop" }}
       </div>
     </div>
-    <component :is="change" @close="change = ''"></component>
+    <component :is="change" @close="close"></component>
   </div>
 </template>
 
@@ -32,9 +32,15 @@ export default {
   computed: {},
   methods: {
     // 封装一个方法，让父组件调用，打开对应的游戏
-    gameOpenFu(val){
-      this.change=val
-    }
+    gameOpenFu(val) {
+      this.change = val;
+    },
+    close() {
+      this.change = "";
+      if (window.gameFlag) {
+        this.$emit("close");
+      }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},

web/src/views/gui/component/issue.vue

@@ -128,12 +128,13 @@
             alt=""
             v-else
           />
+          <!-- :href="`share/${Mylangue ? 'shareM' : 'shareMEn'}.png`"-->
           <a
             class="btnn"
-            :href="`share/${Mylangue ? 'shareM' : 'shareMEn'}.png`"
+            href="JavaScript:;"
             download
             v-if="isMobile"
-            >{{ Mylangue ? "保存海报" : "Save the poster" }}</a
+            >{{ Mylangue ? "长按图片保存" : "Long press save" }}</a
           >
           <a
             class="btnn"
@@ -702,7 +703,7 @@ export default {
             width: 140px;
             height: 42px;
             margin: 10px auto 0;
-            font-size: 16px;
+            font-size: 14px;
           }
         }
       }

web/src/views/gui/menu.vue

@@ -311,7 +311,7 @@
 
         <!-- 游戏分享和切换语言 -->
         <ul class="btn-list">
-          <li :title="Mylangue ? '游戏' : 'Games'" @click="isIssue = true">
+          <li :title="Mylangue ? '游戏' : 'Games'" @click="isIssueShowFu">
             <img
               :src="
                 require(`@/assets/img/${isGame ? 'game_active' : 'game'}.png`)
@@ -463,7 +463,14 @@ export default {
     this.getlikeCon("detail/");
   },
   methods: {
+    isIssueShowFu() {
+      window.gameFlag = false;
+      this.isIssue = true;
+    },
     gameShowFu(val) {
+      // 判断是热点打开游戏还是点击inco打开游戏
+      window.gameFlag = true;
+
       this.isIssue = true;
       this.$nextTick(() => {
         setTimeout(() => {