shaogen1995 %!s(int64=3) %!d(string=hai) anos
pai
achega
153629ac28

+ 3 - 1
src/pages/collection/collection-detail.vue

@@ -63,8 +63,9 @@
             />
             <div class="detail">
               <div class="detail-wrapper">
-                <div class="detail-picOrModel" v-if="detail.type === 'img'">
+                <div class="detail-picOrModel">
                   <el-image
+                    v-if="detail.type === 'img'"
                     style="width: 100px; height: 100px"
                     :src="$cdnUrl + detail.thumb"
                     :preview-src-list="bigImgUrl"
@@ -128,6 +129,7 @@ export default {
   created () {
     // console.log(77777, this.$route.query)
     this.detail = this.$route.query
+    // console.log(999,this.detail);
     this.bigImgUrl[0] = this.$cdnUrl + this.detail.thumb
     this.collectionType = this.detail.navType
   },

+ 6 - 1
src/pages/exhibition/exhibition-type.vue

@@ -345,17 +345,22 @@ export default {
               justify-content: flex-start;
               margin-bottom: 2%;
               margin-right: 2%;
-              width: 32%;
+              width: 240px;
+              height: 240px;
               cursor: pointer;
               position: relative;
               &:nth-of-type(3n){
                   margin-right:0;
               }
               .pic {
+                border:1px solid #ccc;
                 width: 100%;
+                height: 100%;
                 font-size: 0; // 消除img自带间距
                 > img {
                   width: 100%;
+                  height: 100%;
+                  object-fit: contain;
                 }
               }
               .cover {

+ 19 - 18
src/pages/home/home.vue

@@ -53,6 +53,7 @@ export default {
         method: 'post',
         url: '/api/web/slideshow/list'
       })
+      // eslint-disable-next-line
       this.sliceArr = result && result['code'] === 0 && result['data'] || []
     }
   },
@@ -83,31 +84,31 @@ export default {
 
 <style lang="less">
 .swiper-button-prev, .swiper-container-rtl .swiper-button-next{
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  background-color: rgba(0, 0, 0, .7);
+  width: 40px !important;
+  height: 40px !important;
+  border-radius: 50% !important;
+  background-color: rgba(0, 0, 0, .7) !important;
 }
 .swiper-button-next, .swiper-container-rtl .swiper-button-prev{
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  background-color: rgba(0, 0, 0, .7);
+  width: 40px !important;
+  height: 40px !important;
+  border-radius: 50% !important;
+  background-color: rgba(0, 0, 0, .7) !important;
 }
 .swiper-button-prev::after,
   .swiper-button-next::after {
-    color: #fff;
-    font-size: 16px;
+    color: #fff !important;
+    font-size: 16px !important;
   }
-.swiper-pagination-bullet-active {
-  background: #fff!important;
-}
 .swiper-pagination-bullet{
-  background-color: rgba(255,255,255,.4);
-  opacity: 1;
-  width: 50px;
-  height: 5px;
-  border-radius: 5px;
+  background-color: rgba(255,255,255,.4) !important;
+  opacity: 1 !important;
+  width: 50px !important;
+  height: 5px !important;
+  border-radius: 5px !important;
 }
 
+  .swiper-pagination-bullet-active {
+    background: #fff!important;
+  }
 </style>

+ 1 - 1
src/pages/information/information-type.vue

@@ -84,7 +84,7 @@
                 <div class="desc">
                   <div class="desc-title">{{ item.name || "--" }}</div>
                   <div class="desc-content" v-html="item.description"></div>
-                  <div class="desc-time">出版时间 {{ item.pubDate.slice(0,7)}}</div>
+                  <div class="desc-time" v-if="item.pubDate">出版时间 {{ item.pubDate.slice(0,7)}}</div>
                 </div>
               </li>
             </ul>