改bug

web/src/views/Collections/component/info.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="CollectionsInfo" tabindex="0" :style="{
+  <div class="CollectionsInfo" :style="{
     top: needPaddingTop ? '105px' : '0',
     bottom: needPaddingBottom ? '219px' : '0',
   }">
@@ -16,7 +16,7 @@
           aria-label="Image"
           :aria-description="infoObj.h3.replace(/(<([^>]+)>)/ig, '')"
         />
-        <span :style="{ opacity: num, left: numLeft, top: numTop }"></span>
+        <span :style="{ opacity: smallImageLogoOpacity, left: numLeft, top: numTop }"></span>
       </div>
       <!-- 看大图 -->
       <div class="look" @click="lookBig" @keydown.enter.passive="lookBig"
@@ -54,11 +54,11 @@
         <img :src="`/data/Collections/${infoObj.url}/big${infoObj.id}.png`"
           alt=""
           tabindex="0"
-          aria-label="Big image"
+          aria-label="Image"
           :aria-description="infoObj.h3.replace(/(<([^>]+)>)/ig, '')"
         />
         <span
-          :style="{ opacity: num, left: bigNumLeft, top: bigNumTop }"
+          :style="{ opacity: bigImageLogoOpacity, left: bigNumLeft, top: bigNumTop }"
         ></span>
       </div>
     </div>
@@ -84,7 +84,8 @@ export default {
     return {
       bigShow: false,
       // 从0到1的随机小数
-      num: 1,
+      smallImageLogoOpacity: 1,
+      bigImageLogoOpacity: 1,
       // 从0到100的随机整数
       numTop: "0px",
       numLeft: "0px",
@@ -121,11 +122,14 @@ export default {
           let maxLeft = bDom.offsetWidth - 64;
           let maxTop = bDom.offsetHeight - 133;
           this.timeIdBig = setInterval(() => {
-            if (this.num === 0) {
+            this.bigImageLogoOpacity = 0;
+            setTimeout(() => {
+              this.bigImageLogoOpacity = 1;
+              // 控制位移
               this.bigNumLeft = Math.ceil(Math.random() * maxLeft) + "px";
               this.bigNumTop = Math.ceil(Math.random() * maxTop) + "px";
-            }
-          }, 1000);
+            }, 500);
+          }, 3000);
         }, 100);
       });
     },
@@ -174,16 +178,15 @@ export default {
         let bigLeft = dom.offsetWidth - 64;
         // 最大Top
         let bigTop = dom.offsetHeight - 133;
-        // 生成随机整数
         this.timeId = setInterval(() => {
-          // 控制透明度
-          if (this.num === 0) {
-            this.num = 1;
+          this.smallImageLogoOpacity = 0;
+          setTimeout(() => {
+            this.smallImageLogoOpacity = 1;
             // 控制位移
             this.numLeft = Math.ceil(Math.random() * bigLeft) + "px";
             this.numTop = Math.ceil(Math.random() * bigTop) + "px";
-          } else this.num = 0;
-        }, 1000);
+          }, 500);
+        }, 3000);
       }, 100);
     });
   },
@@ -240,7 +243,7 @@ export default {
         width: 100%;
       }
       & > span {
-        transition: opacity 0.3s;
+        transition: opacity 0.5s;
         display: block;
         position: absolute;
         top: 0;
@@ -317,7 +320,7 @@ export default {
         object-fit: cover;
       }
       & > span {
-        transition: opacity 0.3s;
+        transition: opacity 0.5s;
         display: block;
         position: absolute;
         top: 0;

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

@@ -88,7 +88,7 @@
           />
         </div>
       </div>
-      <div class="null" v-if="data.length === 0">no information...</div>
+      <div class="null" v-if="data.length === 0" tabindex="0">no information...</div>
       <!-- 列表详情信息 -->
       <div class="listAreaWrapper" data-aria-viewport-area tabindex="0"
         aria-label :aria-description="`You've reached the content area of the ${$parent.topLi[$route.params.id - 1].name} page. To browse the content, please use the tab key.`">

web/src/views/Exhibitions/index.vue

@@ -4,7 +4,7 @@
     <div class="ban_wrapper" data-aria-viewport-area tabindex="0"
       aria-label :aria-description="`You've reached the banner area of the ${topLi[$route.params.id - 1].name} page; this area has one image; please use the tab key to navigate through the content.`"
     >
-      <div class="ban" tabindex="0" aria-label="Image" :aria-description="topLi[$route.params.id - 1].name"></div>
+      <div class="ban" tabindex="0" aria-label="Image" aria-description="Exhibitions"></div>
     </div>
     <div class="nav_2" data-aria-viewport-area tabindex="0"
       aria-label aria-description="You've reached the secondary menu under the Exhibition section. This menu contains four options. To browse the content,  please use the tab key."

web/src/views/Exhibitions/info.vue

@@ -132,7 +132,7 @@
         </div>
       </div>
       <!-- Exhibition Objects -->
-      <div class="picpart" ref="Objects" :class="{noShow:data.objects === 0}" data-aria-viewport-area tabindex="0"
+      <div class="picpart" ref="Objects" v-if="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>
@@ -185,7 +185,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."
-        :class="{noShow:data.galleries === 0}"
+        v-if="data.galleries !== 0"
       >
         <div class="title_3" tabindex="0">——<span>Exhibition Galleries</span>——</div>
         <!-- 图片 -->
@@ -278,11 +278,11 @@ export default {
       let Overview = this.$refs.Overview;
       let Objects = this.$refs.Objects;
       let Galleries = this.$refs.Galleries;
-      if (val === 1)
+      if (val === 1 && Overview)
         window.scrollTo({ top: Overview.offsetTop, behavior: "smooth" });
-      else if (val === 2)
+      else if (val === 2 && Objects)
         window.scrollTo({ top: Objects.offsetTop, behavior: "smooth" });
-      else if (val === 3)
+      else if (val === 3 && Galleries)
         window.scrollTo({ top: Galleries.offsetTop, behavior: "smooth" });
     },
 
@@ -592,12 +592,6 @@ export default {
         height: auto;
       }
     }
-    .noShow{
-      border:none;
-      padding: 0;
-      height: 0;
-      overflow: hidden;
-    }
   }
   .back_btn {
     font-family: Arial, Helvetica, sans-serif;

web/src/views/JoinSupport/index.vue

@@ -11,7 +11,7 @@
         class="ban"
         tabindex="0"
         aria-label="Image"
-        :aria-description="$route.meta.nameAll"
+        aria-description="Join & Support"
       ></div>
     </div>
     <div class="nav_2" data-aria-viewport-area tabindex="0"

web/src/views/LearnEngage/index.vue

@@ -9,7 +9,7 @@
       <div class="ban"
         tabindex="0"
         aria-label="Image"
-        :aria-description="currentTabText"
+        aria-description="Learn & Engage"
       ></div>
     </div>
     <div class="nav_2" data-aria-viewport-area tabindex="0"

web/src/views/Publications/index.vue

@@ -6,7 +6,7 @@
       aria-label
       :aria-description="`You've reached the banner area of the ${$route.meta.nameAll} page; this area has one image; please use the tab key to go through the content.`"
     >
-      <div class="ban" :class="banImg" tabindex="0" aria-label="Image" :aria-description="$route.meta.nameAll"></div>
+      <div class="ban" :class="banImg" tabindex="0" aria-label="Image" aria-description="Publications"></div>
     </div>
     <div class="nav_2" data-aria-viewport-area tabindex="0"
       aria-label aria-description="You've reached the secondary menu of the Publications section; this menu has two options; please use the tab key to go through the menu."

web/src/views/Visit/Visit2.vue

@@ -62,7 +62,7 @@
             </p>
             <p><br /></p>
             <p tabindex="0"
-              aria-description=""
+              :aria-description="`There are 3,600 daily personal booking places, available through website (3000 places) and telephone (600 places). The website ${$homePageUrl} offers 24-hour service, and the telephone +86 (10) 63393339 service is available from 09:00 to 17:00. One person is only allowed to book one ticket.`"
             >
               <span
                 style="
@@ -441,17 +441,18 @@
                           font-family: arial, helvetica, sans-serif;
                           font-size: 14px;
                         "
-                        >Telephone reservation (group visitors):
+                      >
+                        Telephone reservation (group visitors):
                         <span
-                          tabindex="0"
                           style="
                             font-size: 14px;
                             font-family: arial, helvetica, sans-serif;
                             color: rgb(255, 0, 0);
                           "
-                          >+86 (10) 63370458&nbsp;</span
-                        ></span
-                      >
+                        >
+                          +86 (10) 63370458&nbsp;
+                        </span>
+                      </span>
                     </p>
                     <p><br /><br /></p>
                     <p>

web/src/views/Visit/index.vue

@@ -4,7 +4,7 @@
       aria-label :aria-description="`You've reached the banner area of the ${$route.meta.nameAll} page; this area has one image; please use the tab key to navigate through the content.`"
     >
       <div class="ban" tabindex="0" aria-label="Image" 
-        :aria-description="`${$route.meta.nameAll} banner`"
+        aria-description="Visit"
       />
     </div>
     <div class="nav_2" data-aria-viewport-area tabindex="0"

web/src/views/layout/index.vue

@@ -5,8 +5,17 @@
       <!-- 公共头部 -->
       <div class="topNav">
         <div class="main_nav_wrap">
-          <h1 class="logo">
-            <img src="@/assets/images/logo.png" alt="" />
+          <h1 class="logo" tabindex="0" aria-label="Image"
+            aria-description="CAPTIAL MUSEUM.CHINA"
+          >
+            <img src="@/assets/images/logo.png" alt="" 
+              v-if="[0, 2, 4].includes(themeIdx)"
+            />
+            <img src="@/assets/images/logo.webp" 
+              alt="" 
+              style="width: 198px; height: 40px;"
+              v-if="[1, 3].includes(themeIdx)"
+            />
           </h1>
           <ul
             class="main_nav" tabindex="0" data-aria-navigation-area
@@ -359,12 +368,12 @@ export default {
       .language {
         background: url("../../assets/images/dh1.png") no-repeat 0 18px;
         width: 73px;
-        text-indent: 20px;
         & > a {
           color: #fff;
           text-decoration: none;
           display: inline-block;
-          height: 100%;
+          margin-left: 40px;
+          padding-right: 5px;
           &:hover {
             border-bottom: 2px solid #ca000a;
           }
@@ -434,35 +443,18 @@ export default {
         cursor: pointer;
       }
     }
-    // /deep/.el-input__icon {
-    //   font-size: 20px;
-    //   line-height: 30px;
-    //   color: #ca000a;
-    // }
-    // .btnn {
-    //   cursor: pointer;
-    //   z-index: 99;
-    //   position: absolute;
-    //   right: 0px;
-    //   top: 0px;
-    //   width: 40px;
-    //   height: 30px;
-    //   border-radius: 15px;
-    // }
   }
 }
 .rightNav {
   position: fixed;
-  width: 60px;
-  top: 0;
-  bottom: 0;
+  top: 60%;
   right: 0;
+  height: 164px;
+  width: 60px;
   z-index: 990;
   .rightIco {
     width: 100%;
-    height: 164px;
-    position: absolute;
-    top: 60%;
+    height: 100%;
     & > li {
       background-color: rgba(0, 0, 0, 0.8);
       text-align: center;