shaogen1995 3 năm trước cách đây
mục cha
commit
812ef3cff9

+ 1 - 1
web/public/static/js/Hot.js

@@ -42,7 +42,7 @@ window.initHot = function(model){
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o 
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o 
             
             
         // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/', '/hot/') //线下调试
         // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/', '/hot/') //线下调试
-        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/', '/erhai//hot/')  //打包
+        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/', '/erhai/hot/')  //打包
     }
     }
     var removeSrcPostMark = function(url){//去除texture.load时自动加上的'?'
     var removeSrcPostMark = function(url){//去除texture.load时自动加上的'?'
         var index = url.indexOf('?')
         var index = url.indexOf('?')

BIN
web/src/assets/img/issue.png


+ 6 - 0
web/src/components/exhibition/index.vue

@@ -55,6 +55,10 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
+    isShowHide(){
+      this.isShow=false
+    },
+    // 封装一个隐藏地图的方法,让父组件调用 ↑
     handleItem(val) {
     handleItem(val) {
       // 中文版
       // 中文版
       if (this.Mylangue) {
       if (this.Mylangue) {
@@ -67,6 +71,8 @@ export default {
     isShow(newVal) {
     isShow(newVal) {
       let css = newVal ? "0px" : "-310px";
       let css = newVal ? "0px" : "-310px";
       $(".cad").css({ right: css });
       $(".cad").css({ right: css });
+      // 展开地图的时候隐藏移动端的菜单
+      if(newVal) this.$emit('meanMHide')
     },
     },
   },
   },
   mounted() {
   mounted() {

+ 2 - 0
web/src/components/welcome/index.vue

@@ -70,6 +70,7 @@ export default {
     min-height: 100vh;
     min-height: 100vh;
   }
   }
   .SeLanguage {
   .SeLanguage {
+    pointer-events: none;
     opacity: 0;
     opacity: 0;
     transition: all 1.5s;
     transition: all 1.5s;
     position: absolute;
     position: absolute;
@@ -163,6 +164,7 @@ export default {
   }
   }
   .active{
   .active{
     opacity: 1;
     opacity: 1;
+    pointer-events:initial
   }
   }
 }
 }
 
 

+ 9 - 2
web/src/pages/Home.vue

@@ -26,7 +26,7 @@
         <v-title />
         <v-title />
 
 
         <!-- 底部菜单 -->
         <!-- 底部菜单 -->
-        <v-menu />
+        <v-menu @mapHide='mapHide' ref="vMenuRef"/>
 
 
         <!-- 导览 -->
         <!-- 导览 -->
         <v-guide />
         <v-guide />
@@ -74,7 +74,7 @@
       </div>
       </div>
     </div>
     </div>
     <!-- 小地图 -->
     <!-- 小地图 -->
-    <exhibition class="exhibition" />
+    <exhibition class="exhibition" ref="exhibitionRef" @meanMHide="meanMHide"/>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -120,6 +120,13 @@ export default {
   },
   },
 
 
   methods: {
   methods: {
+    meanMHide(){
+      this.$refs.vMenuRef.mobilShowHide()
+    },
+    mapHide(){
+     this.$refs.exhibitionRef.isShowHide()
+    },
+    // 移动端点击菜单隐藏小地图 ↑
     hideWelcome() {
     hideWelcome() {
       this.showWelcome = false;
       this.showWelcome = false;
       window.manage.switchBgmState(true);
       window.manage.switchBgmState(true);

+ 39 - 17
web/src/views/gui/component/issue.vue

@@ -19,7 +19,7 @@
         <div class="begin_right">
         <div class="begin_right">
           <template v-if="Mylangue">
           <template v-if="Mylangue">
             <p>欢迎来到</p>
             <p>欢迎来到</p>
-            <p>大理洱海科普教育中心趣味问答小游戏,</p>
+            <p>大理洱海科普教育中心趣味课题小游戏,</p>
             <p>您将随机抽取二十道题进行作答,</p>
             <p>您将随机抽取二十道题进行作答,</p>
             <p>答对十二题及以上为闯关成功!</p>
             <p>答对十二题及以上为闯关成功!</p>
           </template>
           </template>
@@ -118,16 +118,30 @@
                 : "Share this poster to spread the word about Erhai's rich culture."
                 : "Share this poster to spread the word about Erhai's rich culture."
             }}
             }}
           </p>
           </p>
-          <img :src="`share/${Mylangue?'shareM':'shareMEn'}.png`" alt="" v-if="isMobile" />
-          <img :src="`share/${Mylangue?'share':'shareEn'}.png`" alt="" v-else />
-          <a class="btnn" :href="`share/${Mylangue?'shareM':'shareMEn'}.png`" download v-if="isMobile"
-            >{{
-            Mylangue ? "保存海报" : "Save the poster"
-          }}</a
+          <img
+            :src="`share/${Mylangue ? 'shareM' : 'shareMEn'}.png`"
+            alt=""
+            v-if="isMobile"
+          />
+          <img
+            :src="`share/${Mylangue ? 'share' : 'shareEn'}.png`"
+            alt=""
+            v-else
+          />
+          <a
+            class="btnn"
+            :href="`share/${Mylangue ? 'shareM' : 'shareMEn'}.png`"
+            download
+            v-if="isMobile"
+            >{{ Mylangue ? "保存海报" : "Save the poster" }}</a
+          >
+          <a
+            class="btnn"
+            :href="`share/${Mylangue ? 'share' : 'shareEn'}.png`"
+            download
+            v-else
+            >{{ Mylangue ? "保存海报" : "Save the poster" }}</a
           >
           >
-          <a class="btnn" :href="`share/${Mylangue?'share':'shareEn'}.png`" download v-else>{{
-            Mylangue ? "保存海报" : "Save the poster"
-          }}</a>
         </div>
         </div>
       </div>
       </div>
       <!-- 答错失败 -->
       <!-- 答错失败 -->
@@ -187,9 +201,11 @@ export default {
     //点击确定
     //点击确定
     btnOk() {
     btnOk() {
       if (this.caseInd === null)
       if (this.caseInd === null)
-        return this.$message.warning(
-          `${this.Mylangue ? "未选择答案" : "No Answer is Selected"}`
-        );
+        return this.$message({
+          message: `${this.Mylangue ? "未选择答案" : "No Answer is Selected"}`,
+          type: "warning",
+          center: true,
+        });
       if (this.topic[this.topicInd].correct === this.caseABC) {
       if (this.topic[this.topicInd].correct === this.caseABC) {
         // console.log('答对了');
         // console.log('答对了');
         this.caseErr = "zhengQue";
         this.caseErr = "zhengQue";
@@ -537,6 +553,7 @@ export default {
     }
     }
 
 
     .main {
     .main {
+      min-height: 500px;
       max-height: 640px;
       max-height: 640px;
       width: 100%;
       width: 100%;
       max-width: 350px;
       max-width: 350px;
@@ -557,13 +574,13 @@ export default {
           width: 130px;
           width: 130px;
           height: 240px;
           height: 240px;
           .renwen {
           .renwen {
-            left: -15px;
+            left: -22px;
           }
           }
         }
         }
         .begin_right {
         .begin_right {
           padding-top: 10px;
           padding-top: 10px;
           & > p {
           & > p {
-            font-size: 16px;
+            font-size: 14px;
             margin-bottom: 5px;
             margin-bottom: 5px;
           }
           }
           .btnn {
           .btnn {
@@ -577,7 +594,7 @@ export default {
       }
       }
       .EnActive {
       .EnActive {
         .begin_left {
         .begin_left {
-          margin: 40px auto 50px;
+          margin: 40px auto 40px;
           width: 280px;
           width: 280px;
           height: 122px;
           height: 122px;
           background: url("../../../assets/img/issueEn.png");
           background: url("../../../assets/img/issueEn.png");
@@ -601,9 +618,14 @@ export default {
         }
         }
         .topic_con {
         .topic_con {
           & > li {
           & > li {
+            min-height: 58px;
             height: auto;
             height: auto;
             padding: 10px 0;
             padding: 10px 0;
             font-size: 16px;
             font-size: 16px;
+            & > span {
+              display: inline-block;
+              max-width: calc(100% - 85px);
+            }
             .case {
             .case {
               width: 20px;
               width: 20px;
               height: 20px;
               height: 20px;
@@ -670,7 +692,7 @@ export default {
             font-size: 16px;
             font-size: 16px;
           }
           }
           & > img {
           & > img {
-            height: 220px;
+            height: 200px;
             margin: 10px 0;
             margin: 10px 0;
           }
           }
           .btnn {
           .btnn {

+ 1 - 0
web/src/views/gui/component/quality.vue

@@ -152,6 +152,7 @@ export default {
       display: flex;
       display: flex;
       flex-wrap: wrap;
       flex-wrap: wrap;
       .row {
       .row {
+        cursor: pointer;
         margin-right: 10px;
         margin-right: 10px;
         margin-bottom: 20px;
         margin-bottom: 20px;
         overflow: hidden;
         overflow: hidden;

+ 1 - 0
web/src/views/gui/component/share.vue

@@ -56,6 +56,7 @@ export default {
       this.$message({
       this.$message({
         message: `${this.Mylangue ? "复制成功" : "copy successful"}`,
         message: `${this.Mylangue ? "复制成功" : "copy successful"}`,
         type: "success",
         type: "success",
+        center: true
       });
       });
     },
     },
   },
   },

+ 11 - 1
web/src/views/gui/menu.vue

@@ -374,14 +374,24 @@ export default {
     };
     };
   },
   },
   computed: {},
   computed: {},
+  watch:{
+    mobilShow(val){
+      if(val) {
+        this.$emit('mapHide')
+      }
+    }
+  },
   mounted() {
   mounted() {
     this.getlikeCon("detail/");
     this.getlikeCon("detail/");
   },
   },
   methods: {
   methods: {
+    mobilShowHide(){
+      this.mobilShow=false
+    },
+    // 封装一个移动端菜单隐藏的方法,让父组件调用 ↑
     // 切换语言
     // 切换语言
     langueCut() {
     langueCut() {
       if (window.location.href.indexOf("_1") > -1) {
       if (window.location.href.indexOf("_1") > -1) {
-        console.log();
         window.location.href = window.location.origin +window.location.pathname+ window.location.hash.slice(0, -2);
         window.location.href = window.location.origin +window.location.pathname+ window.location.hash.slice(0, -2);
       } else window.location.href = window.location.origin +window.location.pathname+window.location.hash+'_1';
       } else window.location.href = window.location.origin +window.location.pathname+window.location.hash+'_1';
       location.reload(true);
       location.reload(true);