Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/ShouBo

webM/src/assets/base.css

@@ -11,14 +11,22 @@
 
 /* Document
    ========================================================================== */
+   @font-face {
+    font-family: 'Medium';
+    src: url('./fontSet/SourceHanSans-Medium.otf');
+    font-weight: normal;
+    font-style: normal;
+  }
 * {
     margin: 0;
     padding: 0;
     box-sizing: border-box;
 }
-img{
+
+img {
     vertical-align: top;
 }
+
 p {
     line-height: 24px;
     font-family: Regular;
@@ -68,21 +76,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 +589,24 @@ 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;
+}
+.titP{
+    font-size: 14px !important;
+    font-family: 'Medium';
+    text-align: left;
+}

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/Collections/index.vue

@@ -145,7 +145,7 @@ export default {
       & > div {
         font-weight: 700;
         color: #fff;
-        font-size: 22px;
+        font-size: 24px;
         position: absolute;
         top: 0;
         left: 0;

webM/src/views/Collections/info.vue

@@ -12,7 +12,7 @@
         :key="index"
       >
         <img v-lazy="`/data/Collections/${img}/${index + 1}.png`" alt="" />
-        <p v-html="item.h3"></p>
+        <p  class="titP" v-html="item.h3"></p>
       </div>
     </div>
   </div>

webM/src/views/Exhibitions/Detail.vue

@@ -34,7 +34,7 @@
               @swipeleft="OverSwiper(1)"
               @swiperight="OverSwiper(0)"
             >
-              <h3>{{ info.tit }}</h3>
+              <h3 v-html="info.tit"></h3>
               <div v-html="info.article"></div>
             </v-touch>
           </div>

webM/src/views/Exhibitions/Overseas.vue

@@ -8,7 +8,7 @@
         :key="index"
       >
         <img v-lazy="item.cover" alt="" />
-        <p v-html="item.h3"></p>
+        <p class="titP" v-html="item.h3"></p>
       </div>
     </div>
   </div>

webM/src/views/Exhibitions/Past.vue

@@ -8,7 +8,7 @@
         :key="index"
       >
         <img v-lazy="item.cover" alt="" />
-        <p v-html="item.h3"></p>
+        <p  class="titP" v-html="item.h3"></p>
       </div>
     </div>
   </div>

webM/src/views/Exhibitions/Permanent.vue

@@ -8,7 +8,7 @@
         :key="index"
       >
         <img v-lazy="item.cover" alt="" />
-        <p v-html="item.h3"></p>
+        <p class="titP" v-html="item.h3"></p>
       </div>
     </div>
   </div>

webM/src/views/Layout/index.vue

@@ -483,6 +483,9 @@ export default {
       font-size: 14px;
       color: #fff;
       border-bottom: 1px solid #d1d1d1;
+      &>p{
+        text-align: left;
+      }
     }
     .link {
       height: 50px;

webM/src/views/Publications/Catalogues.vue

@@ -1,24 +1,13 @@
 <template>
   <div class="PuCatalogues">
     <div class="card">
-      <span class="page">{{ infoInd + 1 }} / {{ imgList.length }}</span>
       <div
         class="row"
-        v-for="(item, index) in imgList"
+        @click="toPdf(item.id)"
+        v-for="item in imgList"
         :key="item.id"
-        :style="`left:${index * 15}px;height:${100 - index * 5}%;opacity:${
-          1 - index * 0.2 <= 0 ? 0.1 : 1 - index * 0.2
-        }; z-index: ${imgList.length - index};`"
       >
-        <v-touch
-          @click.native="toPdf(info.id)"
-          v-if="index === 0"
-          tag="img"
-          @swipeleft="moveSwiper(1)"
-          @swiperight="moveSwiper(0)"
-          :src="info.imgUrl"
-          alt=""
-        />
+        <img v-lazy="item.imgUrl" alt="" />
       </div>
     </div>
   </div>
@@ -74,40 +63,27 @@ export default {
   //方法集合
   methods: {
     toPdf(id) {
+      // 记录点击的滚动距离
+      let dom = document.querySelector(".Layout");
+      this.$route.meta.sroolBack = dom.scrollTop;
+
       this.$router.push({
         name: "PublicationsPdf",
         query: { id },
       });
     },
-    // 封装一个滑动的方法
-    moveSwiper(val) {
-      let dom = document.querySelector(".card");
-      dom.style.opacity = 0;
-      // this.info={...this.info,imgUrl:require('@/assets/img/loading.gif')}
-      setTimeout(() => {
-        if (val === 0) {
-          // 右滑减小
-          if (this.infoInd === 0) this.infoInd = this.imgList.length - 1;
-          else this.infoInd--;
-        } else {
-          //左滑增加
-          if (this.infoInd < this.imgList.length - 1) this.infoInd++;
-          else this.infoInd = 0;
-        }
-        this.info = this.imgList[this.infoInd];
-        dom.style.opacity = 1;
-        // 存储页码
-        this.$route.meta.pageSize = this.infoInd;
-      }, 300);
-    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
-  //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    if (this.$route.meta.pageSize) this.infoInd = this.$route.meta.pageSize;
-    this.info = this.imgList[this.infoInd];
+  created() {
+    if (this.$route.meta.sroolBack) {
+      let dom = document.querySelector(".Layout");
+      setTimeout(() => {
+        dom.scrollTo({ top: this.$route.meta.sroolBack });
+      }, 200);
+    }
   },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {},
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前
@@ -123,38 +99,17 @@ export default {
   padding: 20px 20px 40px;
   .card {
     width: 100%;
-    height: 400px;
-    position: relative;
-    transition: all 0.3s;
-    .page {
-      z-index: 990;
-      background-color: rgba(183, 149, 80, 0.3);
-      width: 68px;
-      height: 40px;
-      text-align: center;
-      line-height: 40px;
-      color: #fff;
-      position: absolute;
-      font-weight: 700;
-      right: 0px;
-      bottom: 0px;
-      font-size: 16px;
-    }
+    display: flex;
+    flex-wrap: wrap;
     .row {
-      border-radius: 8px;
-      position: absolute;
-      left: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      width: 80%;
-      height: 400px;
-      background-color: #fff;
-      box-shadow: 0px 1px 4px 3px #ccc;
+      width: 48%;
+      margin-bottom: 4%;
+      margin-right: 4%;
       & > img {
-        touch-action: pan-y !important;
-        border-radius: 8px;
         width: 100%;
-        height: 100%;
+      }
+      &:nth-of-type(2n) {
+        margin-right: 0;
       }
     }
   }

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