shaogen1995 3 rokov pred
rodič
commit
7e4792a302

+ 15 - 1
webM/src/assets/base.css

@@ -21,10 +21,10 @@ img{
 }
 p {
     line-height: 24px;
+    font-family: Regular;
 }
 
 html {
-    font-family: sans-serif;
     /* 1 */
     line-height: 1.15;
     /* 2 */
@@ -44,6 +44,7 @@ html {
  */
 
 body {
+    font-family:Bold;
     margin: 0;
 }
 
@@ -68,9 +69,22 @@ section {
  */
 
 h1 {
+    font-family:Bold;
     font-size: 2em;
     margin: 0.67em 0;
 }
+h2{
+    font-family:Bold;
+}
+h3{
+    font-family:Bold;
+}
+h4{
+    font-family:Bold;
+}
+h5{
+    font-family:Bold;
+}
 
 
 /* Grouping content

+ 5 - 2
webM/src/components/card.vue

@@ -141,16 +141,18 @@ export default {
       object-fit: cover;
     }
     .page {
+      opacity: .3;
+      color: #B79550;
       position: absolute;
       font-weight: 700;
       right: 5px;
       bottom: 5px;
-      font-size: 14px;
+      font-size: 16px;
     }
 
     .txt {
       touch-action: pan-y!important;
-      height: 260px;
+      height: 250px;
       overflow-y: auto;
       padding: 20px 20px 0;
       & > h3 {
@@ -165,6 +167,7 @@ export default {
       & > p {
         color: #6a6a6a;
         font-size: 14px;
+        line-height: 1.15;
       }
     }
   }

+ 1 - 1
webM/src/views/Collections/Detail.vue

@@ -67,7 +67,7 @@ export default {
         font-size: 22px;
         font-weight: 700;
         padding-left: 30px;
-        background: url("../../assets/img/Layout/chosen.png") left center
+        background: url("../../assets/img/Layout/chosen.png") left 4px
           no-repeat;
         background-size: 22px 18px;
         margin-bottom: 20px;

+ 1 - 1
webM/src/views/Collections/index.vue

@@ -126,7 +126,7 @@ export default {
     .row {
       position: relative;
       width: 100%;
-      margin-bottom: 20px;
+      margin-bottom: 10px;
       & > img {
         width: 100%;
         border-radius: 5px;

+ 1 - 1
webM/src/views/Home/index.vue

@@ -117,7 +117,7 @@ export default {
 <style lang='less' scoped>
 .Home {
   width: 100%;
-  padding-top: 50px;
+  // padding-top: 50px;
   .one {
     width: 100%;
     .my-swipe {

+ 1 - 0
webM/src/views/Join/Give.vue

@@ -98,6 +98,7 @@ export default {
     margin-bottom: 15px;
   }
   .poh{
+    opacity: .45;
     padding: 15px;
     background-color: #c1aa7b;
     border-radius: 5px;

+ 8 - 1
webM/src/views/Publications/Catalogues.vue

@@ -123,11 +123,18 @@ export default {
     position: relative;
     transition: all 0.3s;
     .page {
+      z-index: 999;
+      background-color: rgba(183, 149, 80, .3);
+      width: 68px;
+      height: 40px;
+      text-align: center;
+      line-height: 40px;
+      color: #fff;
       position: absolute;
       font-weight: 700;
       right: 0px;
       bottom: 0px;
-      font-size: 14px;
+      font-size: 16px;
     }
     .row {
       border-radius: 8px;

+ 1 - 1
webM/src/views/Publications/Magazines.vue

@@ -285,7 +285,7 @@ export default {
   .biaoji {
     font-size: 22px;
     padding-left: 30px;
-    background: url("../../assets/img/Layout/chosen.png") left center no-repeat;
+    background: url("../../assets/img/Layout/chosen.png") left 4px no-repeat;
     background-size: 22px 18px;
     margin-bottom: 20px;
     margin-top: 20px;

+ 1 - 0
webM/src/views/Search/About.vue

@@ -77,6 +77,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/All.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Collections.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Employment.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Events.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Exhibitions.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Join.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Learn.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Research.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Terms.vue

@@ -82,6 +82,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/Visit.vue

@@ -77,6 +77,7 @@ export default {
 </script>
 <style lang='less' scoped>
 .null {
+  font-family: Bold;
   font-size: 30px;
   margin-top: 50px;
   text-align: center;

+ 1 - 0
webM/src/views/Search/index.vue

@@ -256,6 +256,7 @@ export default {
     width: 100%;
     padding: 20px 20px 40px;
     .title {
+      font-family: Bold;
       width: calc(100% - 40px);
       margin: 0 auto 15px;
       padding-left: 30px;

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 44 - 44
webM/src/views/bottom/Events/data.js


+ 23 - 1
webM/src/views/bottom/Events/index.vue

@@ -10,6 +10,7 @@
         <div class="txt">
           <h3 v-html="item.h3"></h3>
           <p v-for="(val, index) in item.txt" :key="index">
+            <span>■</span>
             {{ val.name }}
           </p>
           <i>Date:{{ item.i }}</i>
@@ -89,13 +90,34 @@ export default {
         left: 50%;
         transform: translate(-50%,-50%);
         & > h3 {
+          padding-bottom: 8px;
+          position: relative;
           text-align: center;
           font-size: 16px;
-          margin-bottom: 5px;
+          margin-bottom: 10px;
+          &::after{
+            content: '';
+            position: absolute;
+            display: inline-block;
+            width: 60%;
+            bottom: 0;
+            left: 50%;
+            transform: translateX(-50%);
+            height: 2px;
+            background-color: #fff;
+          }
         }
         & > p {
+          padding-left: 15px;
+          position: relative;
           font-size: 12px;
           line-height: 16px;
+          &>span{
+            position: absolute;
+            top: 0;
+            left: 0;
+
+          }
         }
         & > i {
           margin-top: 5px;

+ 13 - 2
webM/src/views/bottom/Events/info1.vue

@@ -18,6 +18,7 @@
           :key="index"
           @click="skip(item.path)"
         >
+        <span>■</span>
           {{ item.name }}
         </p>
       </div>
@@ -103,7 +104,7 @@ export default {
         font-size: 22px;
         font-weight: 700;
         padding-left: 30px;
-        background: url("../../../assets/img/Layout/chosen.png") left center
+        background: url("../../../assets/img/Layout/chosen.png") left 4px
           no-repeat;
         background-size: 22px 18px;
         margin-bottom: 5px;
@@ -128,16 +129,26 @@ export default {
       padding: 20px 15px;
       border-bottom: 1px solid #ccc;
       & > p {
+        padding-left: 15px;
+        position: relative;
+        font-family: Bold;
         font-size: 14px;
         color: #6a6a6a;
+        &>span{
+          position: absolute;
+          left: 0;
+          top: 0;
+        }
       }
       .active {
-        color: red;
+        font-weight: 700;
+        color: #bc1c24;
       }
     }
     .box3 {
       padding: 20px 15px 10px;
       /deep/.xx {
+        font-family: Bold;
         font-size: 16px;
         color: #000000;
         font-weight: 700;

+ 41 - 24
webM/src/views/bottom/Events/info2.vue

@@ -8,11 +8,19 @@
       <div class="box1">
         <h3 v-html="data.h3"></h3>
         <div class="info">
-          <span class="info_1">{{data.i}}</span>
+          <span class="info_1">{{ data.i }}</span>
         </div>
       </div>
       <div class="box2">
-        <p v-for="(item,index) in data.txt" :class="{active:item.path==$route.params.id}" :key="index" @click="skip(item.path)">{{item.name}}</p>
+        <p
+          v-for="(item, index) in data.txt"
+          :class="{ active: item.path == $route.params.id }"
+          :key="index"
+          @click="skip(item.path)"
+        >
+        <span>■</span>
+          {{ item.name }}
+        </p>
       </div>
       <div class="box3" v-html="data.main"></div>
     </div>
@@ -35,27 +43,27 @@ export default {
   computed: {},
   //监控data中的数据变化
   watch: {
-    $route(){
-      this.dataChange()
-    }
+    $route() {
+      this.dataChange();
+    },
   },
   //方法集合
   methods: {
-    skip(path){
-      this.$router.push(`/Layout/EventsInfo2/${path}`).catch(()=>{})
+    skip(path) {
+      this.$router.push(`/Layout/EventsInfo2/${path}`).catch(() => {});
     },
     // 封装获取数据的方法
     dataChange() {
       let id = this.$route.params.id;
-      id =Number(id)
-      Events.forEach(v=>{
-        if(v.id===id) this.data=v
-      })
+      id = Number(id);
+      Events.forEach((v) => {
+        if (v.id === id) this.data = v;
+      });
     },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {
-    this.dataChange()
+    this.dataChange();
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {},
@@ -88,7 +96,7 @@ export default {
   }
   .main {
     padding: 20px 15px 40px;
-    background: url('../../../assets/img/bgEI.png');
+    background: url("../../../assets/img/bgEI.png");
     .box1 {
       padding: 0 15px 5px;
       border-bottom: 1px solid #ccc;
@@ -96,7 +104,7 @@ export default {
         font-size: 22px;
         font-weight: 700;
         padding-left: 30px;
-        background: url("../../../assets/img/Layout/chosen.png") left center
+        background: url("../../../assets/img/Layout/chosen.png") left 4px
           no-repeat;
         background-size: 22px 18px;
         margin-bottom: 5px;
@@ -117,31 +125,40 @@ export default {
         }
       }
     }
-    .box2{
+    .box2 {
       padding: 20px 15px;
       border-bottom: 1px solid #ccc;
-      &>p{
+      & > p {
+        padding-left: 15px;
+        position: relative;
+        font-family: Bold;
         font-size: 14px;
-        color: #6A6A6A;
+        color: #6a6a6a;
+        &>span{
+          position: absolute;
+          left: 0;
+          top: 0;
+        }
       }
-      .active{
-        color: red;
+      .active {
+        font-weight: 700;
+        color: #bc1c24;
       }
     }
-    .box3{
+    .box3 {
       padding: 20px 15px 10px;
-      /deep/.xx{
+      /deep/.xx {
         font-size: 16px;
         color: #000000;
         font-weight: 700;
       }
-      /deep/ p{
+      /deep/ p {
         font-size: 14px;
         line-height: 20px;
         margin-bottom: 15px;
-        color: #6A6A6A;
+        color: #6a6a6a;
       }
-      /deep/ img{
+      /deep/ img {
         width: 100%;
         display: block;
         margin-bottom: 15px;

+ 2 - 1
webM/src/views/bottom/Events/info3.vue

@@ -96,7 +96,7 @@ export default {
         font-size: 22px;
         font-weight: 700;
         padding-left: 30px;
-        background: url("../../../assets/img/Layout/chosen.png") left center
+        background: url("../../../assets/img/Layout/chosen.png") left 4px
           no-repeat;
         background-size: 22px 18px;
         margin-bottom: 5px;
@@ -132,6 +132,7 @@ export default {
         margin-bottom: 15px;
       }
       /deep/.xx{
+        font-family: Bold;
         font-size: 16px;
         color: #000000;
         font-weight: 700;

+ 42 - 24
webM/src/views/bottom/Events/info4.vue

@@ -8,11 +8,19 @@
       <div class="box1">
         <h3 v-html="data.h3"></h3>
         <div class="info">
-          <span class="info_1">{{data.i}}</span>
+          <span class="info_1">{{ data.i }}</span>
         </div>
       </div>
       <div class="box2">
-        <p v-for="(item,index) in data.txt" :class="{active:item.path==$route.params.id}" :key="index" @click="skip(item.path)">{{item.name}}</p>
+        <p
+          v-for="(item, index) in data.txt"
+          :class="{ active: item.path == $route.params.id }"
+          :key="index"
+          @click="skip(item.path)"
+        >
+        <span>■</span>
+          {{ item.name }}
+        </p>
       </div>
       <div class="box3" v-html="data.main"></div>
     </div>
@@ -35,27 +43,27 @@ export default {
   computed: {},
   //监控data中的数据变化
   watch: {
-    $route(){
-      this.dataChange()
-    }
+    $route() {
+      this.dataChange();
+    },
   },
   //方法集合
   methods: {
-    skip(path){
-      this.$router.push(`/Layout/EventsInfo4/${path}`).catch(()=>{})
+    skip(path) {
+      this.$router.push(`/Layout/EventsInfo4/${path}`).catch(() => {});
     },
     // 封装获取数据的方法
     dataChange() {
       let id = this.$route.params.id;
-      id =Number(id)
-      Events.forEach(v=>{
-        if(v.id===id) this.data=v
-      })
+      id = Number(id);
+      Events.forEach((v) => {
+        if (v.id === id) this.data = v;
+      });
     },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {
-    this.dataChange()
+    this.dataChange();
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {},
@@ -88,7 +96,7 @@ export default {
   }
   .main {
     padding: 20px 15px 40px;
-    background: url('../../../assets/img/bgEI.png');
+    background: url("../../../assets/img/bgEI.png");
     .box1 {
       padding: 0 15px 5px;
       border-bottom: 1px solid #ccc;
@@ -96,7 +104,7 @@ export default {
         font-size: 22px;
         font-weight: 700;
         padding-left: 30px;
-        background: url("../../../assets/img/Layout/chosen.png") left center
+        background: url("../../../assets/img/Layout/chosen.png") left 4px
           no-repeat;
         background-size: 22px 18px;
         margin-bottom: 5px;
@@ -117,31 +125,41 @@ export default {
         }
       }
     }
-    .box2{
+    .box2 {
       padding: 20px 15px;
       border-bottom: 1px solid #ccc;
-      &>p{
+      & > p {
+        padding-left: 15px;
+        position: relative;
+        font-family: Bold;
         font-size: 14px;
-        color: #6A6A6A;
+        color: #6a6a6a;
+        &>span{
+          position: absolute;
+          left: 0;
+          top: 0;
+        }
       }
-      .active{
-        color:red;
+      .active {
+        font-weight: 700;
+        color: #bc1c24;
       }
     }
-    .box3{
+    .box3 {
       padding: 20px 15px 10px;
-      /deep/.xx{
+      /deep/.xx {
+        font-family: Bold;
         font-size: 16px;
         color: #000000;
         font-weight: 700;
       }
-      /deep/ p{
+      /deep/ p {
         font-size: 14px;
         line-height: 20px;
         margin-bottom: 15px;
-        color: #6A6A6A;
+        color: #6a6a6a;
       }
-      /deep/ img{
+      /deep/ img {
         width: 100%;
         display: block;
         margin-bottom: 15px;

+ 2 - 1
webM/src/views/bottom/Events/info5.vue

@@ -96,7 +96,7 @@ export default {
         font-size: 22px;
         font-weight: 700;
         padding-left: 30px;
-        background: url("../../../assets/img/Layout/chosen.png") left center
+        background: url("../../../assets/img/Layout/chosen.png") left 4px
           no-repeat;
         background-size: 22px 18px;
         margin-bottom: 5px;
@@ -135,6 +135,7 @@ export default {
         margin-bottom: 15px;
       }
       /deep/.xx{
+        font-family: Bold;
         font-size: 16px;
         color: #000000;
         font-weight: 700;