修复一波bug

web/src/views/About/Director.vue

@@ -82,8 +82,8 @@
         </p>
       </div>
       <div class="back_btn"
-        @click="$router.push('/Layout/About')"
-        @keydown.enter.passive="$router.push('/Layout/About')"
+        @click="$router.replace('/Layout/About')"
+        @keydown.enter.passive="$router.replace('/Layout/About')"
         tabindex="0"
         aria-label="Link"
       >

web/src/views/About/President.vue

@@ -48,7 +48,7 @@
         </div>
       </div>
     </div>
-    <div class="back_btn" @click="$router.push('/Layout/About')">Back to top</div>
+    <div class="back_btn" @click="$router.replace('/Layout/About')">Back to top</div>
   </div>
 </template>
 

web/src/views/About/index.vue

@@ -57,8 +57,8 @@
       </div>
       <p
         class="more"
-        @click="$router.push('/Layout/About/Director')"
-        @keydown.enter.passive="$router.push('/Layout/About/Director')"
+        @click="$router.replace('/Layout/About/Director')"
+        @keydown.enter.passive="$router.replace('/Layout/About/Director')"
         tabindex="0"
         aria-label="Link"
       >
@@ -128,8 +128,8 @@
         class="see"
         src="/data/About/a7.gif"
         alt=""
-        @click="$router.push('/Layout/About/link')"
-        @keydown.enter.passive="$router.push('/Layout/About/link')"
+        @click="$router.replace('/Layout/About/link')"
+        @keydown.enter.passive="$router.replace('/Layout/About/link')"
         tabindex="0"
         aria-label="Link"
         aria-description="See More"

web/src/views/Collections/index.vue

@@ -192,7 +192,7 @@ export default {
       });
     },
     cutTab(path) {
-      this.$router.push(`/Layout/Collections/${path}`).catch(() => {});
+      this.$router.replace(`/Layout/Collections/${path}`).catch(() => {});
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

web/src/views/Events/index.vue

@@ -83,7 +83,7 @@ export default {
   //方法集合
   methods: {
     skip(id) {
-      this.$router.push(`/Layout/EventsInfo/${id}`);
+      this.$router.replace(`/Layout/EventsInfo/${id}`);
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

web/src/views/Events/info.vue

@@ -140,7 +140,7 @@ export default {
       this.toTop()
     },
     skip(id) {
-      this.$router.push(`/Layout/EventsInfo/${id}`).catch(() => {});
+      this.$router.replace(`/Layout/EventsInfo/${id}`).catch(() => {});
     },
     // 点击回到顶部
     toTop() {

web/src/views/Exhibitions/component/List.vue

@@ -175,7 +175,7 @@ export default {
     // 点击单个文章跳转详情
     toInfo(id){
      let k = this.$route.params.id;
-      this.$router.push({
+      this.$router.replace({
         name:'ExhibitionsInfo',
         query:{id,k}
       })

web/src/views/Exhibitions/index.vue

@@ -129,7 +129,7 @@ export default {
   //方法集合
   methods: {
     skip(url) {
-      this.$router.push(url).catch(() => {});
+      this.$router.replace(url).catch(() => {});
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

web/src/views/Exhibitions/info.vue

@@ -126,7 +126,7 @@
         </div>
       </div>
       <!-- Exhibition Objects -->
-      <div class="picpart" ref="Objects" v-if="data.objects !== 0" data-aria-viewport-area tabindex="0"
+      <div class="picpart" ref="Objects" :class="{noShow:data.objects === 0}" data-aria-viewport-area tabindex="0"
         aria-label aria-description="You've reached the section of exhibition objects, please use the tab key to go through the content."
       >
         <div class="title_3" tabindex="0">——<span>Exhibition Objects</span>——</div>
@@ -179,7 +179,7 @@
         data-aria-viewport-area
         tabindex="0"
         aria-label aria-description="You've reached the section of exhibition galleries, please use the tab key to go through the content."
-        v-if="data.galleries !== 0"
+        :class="{noShow:data.galleries === 0}"
       >
         <div class="title_3" tabindex="0">——<span>Exhibition Galleries</span>——</div>
         <!-- 图片 -->
@@ -258,10 +258,10 @@ export default {
     },
     // 点击面包屑的最后一个
     backExh(txt) {
-      if (txt === "Current") this.$router.push("/Layout/Exhibitions/1");
-      else if (txt === "Permanent") this.$router.push("/Layout/Exhibitions/2");
-      else if (txt === "Past") this.$router.push("/Layout/Exhibitions/3");
-      else if (txt === "Overseas") this.$router.push("/Layout/Exhibitions/4");
+      if (txt === "Current") this.$router.replace("/Layout/Exhibitions/1");
+      else if (txt === "Permanent") this.$router.replace("/Layout/Exhibitions/2");
+      else if (txt === "Past") this.$router.replace("/Layout/Exhibitions/3");
+      else if (txt === "Overseas") this.$router.replace("/Layout/Exhibitions/4");
     },
     // 固定滚动的切换
     cutGun(val) {
@@ -471,6 +471,9 @@ export default {
             line-height: 26px;
             text-align: center;
           }
+          /deep/ i {
+            font-style: italic;
+          }
         }
         /deep/p {
           font-size: 18px;
@@ -583,6 +586,12 @@ export default {
         height: auto;
       }
     }
+    .noShow{
+      border:none;
+      padding: 0;
+      height: 0;
+      overflow: hidden;
+    }
   }
   .back_btn {
     height: 38px;

web/src/views/Home/index.vue

@@ -60,7 +60,7 @@
       aria-label aria-description="You've reached the pop-up window section; this section contains four URLs; please use the tab key to go through the content."
     >
       <div
-        class="t1" @click="$router.push('/Layout/Visit/2')"
+        class="t1" @click="$router.replace('/Layout/Visit/2')"
         tabindex="0"
         aria-label="Link"
         aria-description="Reservation"
@@ -84,7 +84,7 @@
           </div>
         </div>
       </div>
-      <div class="t2" @click="$router.push('/Layout/Visit/1')"
+      <div class="t2" @click="$router.replace('/Layout/Visit/1')"
         tabindex="0"
         aria-label="Link"
         aria-description="Visit Info"
@@ -130,7 +130,7 @@
           </div>
         </div>
       </div>
-      <div class="t4" @click="$router.push('/Layout/Events')"
+      <div class="t4" @click="$router.replace('/Layout/Events')"
         tabindex="0"
         aria-label="Link"
         aria-description="Events"
@@ -171,7 +171,7 @@ export default {
   methods: {
     // 底部的跳转
     botskip() {
-      this.$router.push("/Layout/About").catch(() => {});
+      this.$router.replace("/Layout/About").catch(() => {});
       setTimeout(() => {
         window.scrollTo({ top: 1307, behavior: "smooth" });
       }, 100);

web/src/views/JoinSupport/Give.vue

@@ -75,7 +75,7 @@ export default {
   //方法集合
   methods: {
     skip(id) {
-      this.$router.push({
+      this.$router.replace({
         name: "GiveInfo",
         query: { id },
       });

web/src/views/JoinSupport/Volunteer.vue

@@ -45,7 +45,7 @@ export default {
   methods: {
     // 点击单个进入详情
     skip(id) {
-      this.$router.push({
+      this.$router.replace({
         name: "VolunteerInfo",
         query: { id },
       });

web/src/views/JoinSupport/index.vue

@@ -97,7 +97,7 @@ export default {
   //方法集合
   methods: {
     skip(url){
-      this.$router.push(`/Layout/JoinSupport/${url}`).catch(() => {});
+      this.$router.replace(`/Layout/JoinSupport/${url}`).catch(() => {});
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）

web/src/views/LearnEngage/index.vue

@@ -133,7 +133,7 @@ export default {
   methods: {
     // 跳转到info页面
     toInfo(id) {
-      this.$router.push({
+      this.$router.replace({
         name: "LearnEngageInfo",
         query: { id, k:this.topId,m:this.pageSize},
       });
@@ -144,7 +144,7 @@ export default {
       window.scrollTo({ top: 300, behavior: "smooth" });
     },
     skip(url) {
-      this.$router.push(url).catch(() => {});
+      this.$router.replace(url).catch(() => {});
     },
     // 封装一个处理数据的方法
     getData() {

web/src/views/LearnEngage/info.vue

@@ -76,8 +76,8 @@
         </div>
         <div
           class="back"
-          @click="$router.push(`/Layout/LearnEngage/${mbTxt}?m=${pageSize}`)"
-          @keydown.enter.passive="$router.push(`/Layout/LearnEngage/${mbTxt}?m=${pageSize}`)"
+          @click="$router.replace(`/Layout/LearnEngage/${mbTxt}?m=${pageSize}`)"
+          @keydown.enter.passive="$router.replace(`/Layout/LearnEngage/${mbTxt}?m=${pageSize}`)"
           tabindex="0"
           aria-label="Link"
         >

web/src/views/Publications/Publications1.vue

@@ -105,7 +105,7 @@ export default {
   methods: {
     // 点击书籍跳转
     jump(id) {
-      this.$router.push({
+      this.$router.replace({
         name: "PublicationsInfo",
         query: { id },
       });

web/src/views/Publications/index.vue

@@ -91,11 +91,11 @@ export default {
         else if (id <= 17) temp = 2019;
         else if (id <= 23) temp = 2018;
         else temp = 2017;
-        this.$router.push({
+        this.$router.replace({
           name: "Publications1",
           query: { k: temp },
         });
-      } else this.$router.push(url).catch(() => {});
+      } else this.$router.replace(url).catch(() => {});
     },
     backUrl() {
       if (this.$route.path === "/Layout/PublicationsInfo") {
@@ -107,7 +107,7 @@ export default {
         else if (id <= 17) temp = 2019;
         else if (id <= 23) temp = 2018;
         else temp = 2017;
-        this.$router.push({
+        this.$router.replace({
           name: "Publications1",
           query: { k: temp },
         });

web/src/views/Search/data.js

@@ -259,7 +259,7 @@ export const Exhibitions = [
     id: 33,
     cover: '/data/Exhibitions/Past/23.jpg',
     h3: 'Chinese Traditional Custom of the Birthday Celebration for the Senior Citizen',
-    p: '​The exhibition "Chinese Traditional Custom of the Birthday Celebration for the Senior Citizen," sponsored by the Embassy of People"s Republic of China in the Republic of Mauritius, Ministry of Arts and Culture in the Republic of Mauritius and the Beijing Municipal Administration of Cultural Heritage, and hosted by the China Cultural Center in Mauritius and the Capital Museum, was unveiled on Feb. 10, 2018 at the Cultural Center."',
+    p: `The exhibition "Chinese Traditional Custom of the Birthday Celebration for the Senior Citizen," sponsored by the Embassy of People's Republic of China in the Republic of Mauritius, Ministry of Arts and Culture in the Republic of Mauritius and the Beijing Municipal Administration of Cultural Heritage, and hosted by the China Cultural Center in Mauritius and the Capital Museum, was unveiled on Feb. 10, 2018 at the Cultural Center."`,
     path: '#/Layout/ExhibitionsInfo?id=33&k=3'
   },
   {

web/src/views/Search/dataAll.js

@@ -257,7 +257,7 @@ export const dataAll = [
     id: 33,
     cover: '/data/Exhibitions/Past/23.jpg',
     h3: 'Chinese Traditional Custom of the Birthday Celebration for the Senior Citizen',
-    p: '​The exhibition "Chinese Traditional Custom of the Birthday Celebration for the Senior Citizen," sponsored by the Embassy of People"s Republic of China in the Republic of Mauritius, Ministry of Arts and Culture in the Republic of Mauritius and the Beijing Municipal Administration of Cultural Heritage, and hosted by the China Cultural Center in Mauritius and the Capital Museum, was unveiled on Feb. 10, 2018 at the Cultural Center."',
+    p: `The exhibition "Chinese Traditional Custom of the Birthday Celebration for the Senior Citizen," sponsored by the Embassy of People's Republic of China in the Republic of Mauritius, Ministry of Arts and Culture in the Republic of Mauritius and the Beijing Municipal Administration of Cultural Heritage, and hosted by the China Cultural Center in Mauritius and the Capital Museum, was unveiled on Feb. 10, 2018 at the Cultural Center."`,
     path: '#/Layout/ExhibitionsInfo?id=33&k=3'
   },
   {

web/src/views/Visit/Visit2.vue

@@ -2,7 +2,7 @@
   <div class="Visit2" data-aria-viewport-area tabindex="0"
     aria-label aria-description="You've reached the content area for the Reservation page. This area contains three parts of content. Please press the tab key to browse the information."
   >
-    <div
+    <!-- <div
       class="public"
       :class="{ hintShow: hintShow }"
       @click="hintShow = true"
@@ -14,7 +14,7 @@
         The reservation service is now under maintenance. Please go to Capital
         Museum's WeChat account for reservation.<span>X</span>
       </div>
-    </div>
+    </div> -->
     <div class="mm1">
       <div class="mm1l">
         <p>
@@ -34,18 +34,18 @@
           required to show the number and valid ID in order to receive free
           entrance tickets on the day of their visit.
         </p>
-        <h2 tabindex="0">Online Reservation</h2>
+        <!-- <h2 tabindex="0">Online Reservation</h2> -->
       </div>
     </div>
     <div class="sidebar">
       <ul>
         <!-- 第一个内容 -->
         <li class="title">
+          <div class="showCon" @click="cutFlag('one')"></div>
           <span tabindex="0">Guidelines for Reservations</span>
           <span
             class="arrow"
             :class="{ 'arrow-up': flag === 'one' }"
-            @click="cutFlag('one')"
             @keydown.enter.passive="cutFlag('one')"
             tabindex="0"
             aria-label="Button"
@@ -223,6 +223,7 @@
                 </tr>
               </tbody>
             </table>
+            <br/>
             <table data-sort="sortDisabled">
               <tbody>
                 <tr class="firstRow">
@@ -371,11 +372,11 @@
         </li>
         <!-- 第二个内容 -->
         <li class="title title2">
+          <div class="showCon" @click="cutFlag('tow')"></div>
           <span tabindex="0">Group Visit</span>
           <span
             class="arrow"
             :class="{ 'arrow-up': flag === 'tow' }"
-            @click="cutFlag('tow')"
             @keydown.enter.passive="cutFlag('tow')"
             tabindex="0"
             aria-label="Button"
@@ -480,11 +481,11 @@
         </li>
         <!-- 第三个内容 -->
         <li class="title title3">
+          <div class="showCon" @click="cutFlag('three')"></div>
           <span tabindex="0">Relevant Information</span>
           <span
             class="arrow"
             :class="{ 'arrow-up': flag === 'three' }"
-            @click="cutFlag('three')"
             @keydown.enter.passive="cutFlag('three')"
             tabindex="0"
             aria-label="Button"
@@ -672,10 +673,19 @@ export default {
     clear: both;
     & > ul {
       .title {
+        position: relative;
         font-size: 24px;
         line-height: 50px;
         margin-bottom: 1px;
         background: url("../../assets/images/Visit/m-28.jpg") no-repeat;
+        .showCon{
+          cursor: pointer;
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 50px;
+        }
         span {
           margin-left: 10px;
         }

web/src/views/Visit/Visit7.vue

@@ -90,14 +90,18 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
         padding-top: 20px;
         width: 50%;
         &>p{
+          position: relative;
           display: flex;
           align-items: center;
           font-size: 14px;
           margin-bottom: 20px;
+          padding-left: 45px;
           &>span{
+            position: absolute;
+            top: -5px;
+            left: 0;
             display: block;
             font-size: 30px;
-            margin-right: 10px;
           }
         }
         &:nth-of-type(1){

web/src/views/Visit/index.vue

@@ -79,7 +79,7 @@ export default {
   //方法集合
   methods: {
     skip(url){
-      this.$router.push(url).catch(() => {});
+      this.$router.replace(url).catch(() => {});
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）

web/src/views/bottom/Index.vue

@@ -1,14 +1,22 @@
 <template>
-  <div class="bottomIndex" data-aria-viewport-area tabindex="0"
-    aria-label aria-description="You've reached the content area of the Site Index, please use the tab key to navigate through the content."
+  <div
+    class="bottomIndex"
+    data-aria-viewport-area
+    tabindex="0"
+    aria-label
+    aria-description="You've reached the content area of the Site Index, please use the tab key to navigate through the content."
   >
-    <img src="/data/Index/1.jpg" alt="" 
+    <img
+      src="/data/Index/1.jpg"
+      alt=""
       tabindex="0"
       aria-label="Text"
       aria-description="Site Index"
     />
     <div class="home" title="Home" tabindex="-1">
-      <img src="/data/Index/home.jpg" alt=""
+      <img
+        src="/data/Index/home.jpg"
+        alt=""
         @click="skip('/')"
         @keydown.enter.passive="skip('/')"
         tabindex="0"
@@ -430,7 +438,13 @@ export default {
           left: "0px",
           path: "",
         },
-        { title: "Moblie Site", width: "105px", top: 1, left: "0px", path: "/null" },
+        {
+          title: "Moblie Site",
+          width: "105px",
+          top: 1,
+          left: "0px",
+          path: "https://zzbbh.4dage.com/shouBoM/index.html#/Layout/Home",
+        },
         {
           title: "Terms of Use",
           width: "120px",
@@ -463,7 +477,11 @@ export default {
   //方法集合
   methods: {
     skip(url, sroll) {
-      this.$router.push(url).catch(() => {});
+      if(url==='https://zzbbh.4dage.com/shouBoM/index.html#/Layout/Home') {
+        window.open(url)
+        return
+      }
+      this.$router.replace(url).catch(() => {});
       if (sroll) {
         setTimeout(() => {
           window.scrollTo({ top: sroll, behavior: "smooth" });
@@ -475,7 +493,10 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    this.$eventBus.$emit('request-read', ` You've reached the Site Index page. This page contains one navigation section, three window sections, and one interactive section. To choose an area, please hit the shortcut key.`)
+    this.$eventBus.$emit(
+      "request-read",
+      ` You've reached the Site Index page. This page contains one navigation section, three window sections, and one interactive section. To choose an area, please hit the shortcut key.`
+    );
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -523,7 +544,7 @@ export default {
           position: absolute;
         }
       }
-      .active{
+      .active {
         cursor: pointer;
       }
       .one {

web/src/views/layout/index.vue

@@ -203,25 +203,25 @@ export default {
     // 点击搜索
     search() {
       // if (this.searchTxt.trim() === "" || this.searchTxt.trim().length < 4) return
-      this.$router.push({
+      this.$router.replace({
         name: "Search",
         params: {txt:this.searchTxt},
       });
     },
     // 第一级的跳转
     skipOne(url) {
-      this.$router.push("/Layout/" + url).catch(() => {});
+      this.$router.replace("/Layout/" + url).catch(() => {});
     },
     // 第二级的跳转
     skipTow(url, about) {
       document.activeElement.blur()
       // 如果是about页面
       if (about === true) {
-        this.$router.push("/Layout/About").catch(() => {});
+        this.$router.replace("/Layout/About").catch(() => {});
         setTimeout(() => {
           window.scrollTo({ top: url, behavior: "smooth" });
         }, 100);
-      } else this.$router.push(url).catch(() => {});
+      } else this.$router.replace(url).catch(() => {});
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

web/src/views/null/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="null">
     <div>
-      <div @click="$router.push('/')">返 回 首 页</div>
+      <div @click="$router.replace('/')">返 回 首 页</div>
       <div class="back" @click="$router.go(-1)">返 回 上 一 页</div>
     </div>
   </div>