up

webM/src/assets/base.css

@@ -16,9 +16,11 @@
     padding: 0;
     box-sizing: border-box;
 }
-img{
+
+img {
     vertical-align: top;
 }
+
 p {
     line-height: 24px;
     font-family: Regular;
@@ -68,21 +70,25 @@ section {
  */
 
 h1 {
-    font-family:Bold;
+    font-family: Bold;
     font-size: 2em;
     margin: 0.67em 0;
 }
-h2{
-    font-family:Bold;
+
+h2 {
+    font-family: Bold;
 }
-h3{
-    font-family:Bold;
+
+h3 {
+    font-family: Bold;
 }
-h4{
-    font-family:Bold;
+
+h4 {
+    font-family: Bold;
 }
-h5{
-    font-family:Bold;
+
+h5 {
+    font-family: Bold;
 }
 
 
@@ -577,4 +583,19 @@ template {
 
 [hidden] {
     display: none;
+}
+
+.null {
+    font-size: 24px !important;
+    font-weight: 400 !important;
+    margin-top: 30px !important;
+    font-family: Bold !important;
+}
+
+.indexUrl {
+    word-break: break-all
+}
+
+p {
+    text-align: justify;
 }

webM/src/views/About/index.vue

@@ -90,7 +90,7 @@
       <div id="About4">
         <h3 class="title">Contact</h3>
         <div class="pp">Official website of Capital Museum:</div>
-        <p>首页（地址待定）</p>
+        <p class="indexUrl">https://zzbbh.4dage.com/shouBoM/index.html</p>
         <div class="pp">Telephone reservation (individual visitors):</div>
         <p>+86 (10) 63393339</p>
         <div class="pp">Telephone reservation (group visitors):</div>

webM/src/views/Search/About.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchAbout" v-else>
     <div
       class="row"

webM/src/views/Search/All.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchAll" v-else>
     <div
       class="row"

webM/src/views/Search/Collections.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchCollections" v-else>
     <div
       class="row"

webM/src/views/Search/Employment.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchEmployment" v-else>
     <div
       class="row"

webM/src/views/Search/Events.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchEvents" v-else>
     <div
       class="row"

webM/src/views/Search/Exhibitions.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchExhibitions" v-else>
     <div
       class="row"

webM/src/views/Search/Join.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchJoin" v-else>
     <div
       class="row"

webM/src/views/Search/Learn.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchLearn" v-else>
     <div
       class="row"

webM/src/views/Search/Research.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchResearch" v-else>
     <div
       class="row"

webM/src/views/Search/Terms.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchTerms" v-else>
     <div
       class="row"

webM/src/views/Search/Visit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="null" v-if="data.length === 0">no information...</div>
+  <div class="null" v-if="data.length === 0">no result...</div>
   <div class="SearchVisit" v-else>
     <div
       class="row"

webM/src/views/Visit/VisitInfo.vue

@@ -22,7 +22,7 @@
       <p>
         There are 3,600 daily personal booking places, available through website
         (3000 places) and telephone (600 places). The website
-        <a href="#/">首页（地址待定）</a> offers 24-hour service, and the
+        <a href="#/" class="indexUrl">https://zzbbh.4dage.com/shouBoM/index.html</a> offers 24-hour service, and the
         telephone <br/>+86 (10) 63393339 service is available from 09:00 to 17:00. One
         person is only allowed to book one ticket.
       </p>
@@ -95,7 +95,7 @@
         Museum will make a publicannouncement in advance. Please visit the
         official website or inquire by telephone for detailed information.
       </p>
-      <p>Official website: 首页（地址待定）</p>
+      <p class="indexUrl">Official website: https://zzbbh.4dage.com/shouBoM/index.html</p>
       <p>Phone: +86 (10) 63370491</p>
     </div>
   </div>

webM/src/views/bottom/Events/index.vue

@@ -9,10 +9,10 @@
         <img :src="`/data/EventsM/T${index + 1}.png`" alt="" />
         <div class="txt">
           <h3 v-html="item.h3"></h3>
-          <p v-for="(val, index) in item.txt" :key="index" @click.stop="$router.push(`/Layout/EventsInfo${item.id}/${val.path}`)">
+          <!-- <p v-for="(val, index) in item.txt" :key="index" @click.stop="$router.push(`/Layout/EventsInfo${item.id}/${val.path}`)">
             <span>■</span>
             {{ val.name }}
-          </p>
+          </p> -->
           <i>Date:{{ item.i }}</i>
         </div>
       </div>

webM/src/views/bottom/Use.vue

@@ -39,16 +39,16 @@
           Any reprints and quotes of any copyrighted articles on this website
           should conform to following requirements:
         </p>
-        <p>
+        <p class="indexUrl">
           (1) For non-commercial, non-profit and non-advertising uses, author's
           name and source of the used article or picture, "首都博物馆网站" or
-          "首页（地址待定）", should be attached.
+          "https://zzbbh.4dage.com/shouBoM/index.html", should be attached.
         </p>
-        <p>
+        <p class="indexUrl">
           (2) For business, profit-making and advertising use, you should obtain
           consent of the original author, and attach the name of that author,
           limits of authority and the source, "首都博物馆网站"or
-          "首页（地址待定）".
+          "https://zzbbh.4dage.com/shouBoM/index.html".
         </p>
         <p>
           (3) Any modification and cancellation of any articles or pictures