瀏覽代碼

采美百科页面

yuwenjun1997 2 年之前
父節點
當前提交
c9fa9588d6

+ 1 - 1
src/main/resources/static/css/encyclopedia/common.css

@@ -7,7 +7,7 @@ a{text-decoration:none}
 input{outline:none}
 input{outline:none}
 .bk-mask{position:fixed;width:100vw;height:100vh;left:0;top:0;background:rgba(0,0,0,.6);z-index:90}
 .bk-mask{position:fixed;width:100vw;height:100vh;left:0;top:0;background:rgba(0,0,0,.6);z-index:90}
 .hidden{width:100vw;overflow:hidden}
 .hidden{width:100vw;overflow:hidden}
-.jconfirm-content{overflow: hidden}
+.jconfirm-content{overflow: hidden !important;}
 
 
 @media screen and (min-width:768px){.only-mobile{display:none !important}
 @media screen and (min-width:768px){.only-mobile{display:none !important}
     ::-webkit-scrollbar{width:8px;height:8px;background-color:#f5f5f5}
     ::-webkit-scrollbar{width:8px;height:8px;background-color:#f5f5f5}

+ 1 - 0
src/main/resources/static/css/encyclopedia/detail.css

@@ -1,3 +1,4 @@
+.scapegoat{color: #F57C40 !important;}
 @media screen and (min-width:768px){main{background:#FAFAFA}
 @media screen and (min-width:768px){main{background:#FAFAFA}
     img.scapegoat{vertical-align: -4px;margin:0 2px; cursor: pointer;}
     img.scapegoat{vertical-align: -4px;margin:0 2px; cursor: pointer;}
     .bk-banner{height:320px;position:relative;z-index:10;overflow:hidden}
     .bk-banner{height:320px;position:relative;z-index:10;overflow:hidden}

+ 5 - 2
src/main/resources/static/css/encyclopedia/list.css

@@ -6,7 +6,8 @@
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%}
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:24px}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:24px}
     .bk-list .bk-list-item .bk-info h2{font-size:18px;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
     .bk-list .bk-list-item .bk-info h2{font-size:18px;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
-    .bk-list .bk-list-item .bk-info .bk-info-desc{font-size:14px;color:#666666;margin-top:16px;height:48px;line-height:24px;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .bk-list .bk-list-item .bk-info .bk-info-desc,
+    .bk-list .bk-list-item .bk-info .bk-info-desc *{font-size:14px;color:#666666 !important;margin-top:16px;height:48px;line-height:24px;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
     .bk-list .bk-list-item .bk-info img{display: none}
     .bk-list .bk-list-item .bk-info img{display: none}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#B2B2B2;margin-top:40px}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#B2B2B2;margin-top:40px}
     .bk-list .bk-list-item::after{content:"";position:absolute;width:1248px;height:216px;border:3px solid #F57C40;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:-1;opacity:0;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
     .bk-list .bk-list-item::after{content:"";position:absolute;width:1248px;height:216px;border:3px solid #F57C40;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:-1;opacity:0;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
@@ -23,7 +24,9 @@
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%;border-radius:0.08rem}
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%;border-radius:0.08rem}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:0.24rem}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:0.24rem}
     .bk-list .bk-list-item .bk-info h2{font-size:0.32rem;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}
     .bk-list .bk-list-item .bk-info h2{font-size:0.32rem;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}
-    .bk-list .bk-list-item .bk-info .bk-info-desc{font-size:0.26rem;color:#666666;margin-top:0.16rem;height:0.75rem;line-height:0.375rem;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .bk-list .bk-list-item .bk-info .bk-info-desc,
+    .bk-list .bk-list-item .bk-info .bk-info-desc *
+    {font-size:0.26rem;color:#666666;margin-top:0.16rem;height:0.75rem;line-height:0.375rem;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
     .bk-list .bk-list-item .bk-info img{display: none}
     .bk-list .bk-list-item .bk-info img{display: none}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:0.22rem;color:#B2B2B2;margin-top:0.32rem}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:0.22rem;color:#B2B2B2;margin-top:0.32rem}
 }
 }

+ 7 - 3
src/main/resources/static/css/encyclopedia/search.css

@@ -11,8 +11,10 @@
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%}
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:24px}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:24px}
     .bk-list .bk-list-item .bk-info h2{font-size:18px;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
     .bk-list .bk-list-item .bk-info h2{font-size:18px;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
-    .bk-list .bk-list-item .bk-info p{font-size:14px;color:#666666;margin-top:16px;height:48px;line-height:24px;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .bk-list .bk-list-item .bk-info .bk-info-desc,
+    .bk-list .bk-list-item .bk-info .bk-info-desc *{font-size:14px;color:#666666;margin-top:16px;height:48px;line-height:24px;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#B2B2B2;margin-top:40px}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:14px;color:#B2B2B2;margin-top:40px}
+    .bk-list .bk-list-item .bk-info img{display: none}
     .bk-list .bk-list-item:hover{cursor:pointer}
     .bk-list .bk-list-item:hover{cursor:pointer}
     .bk-list .bk-list-item:hover h2{color:#F57C40}
     .bk-list .bk-list-item:hover h2{color:#F57C40}
 }
 }
@@ -28,6 +30,8 @@
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%;border-radius:0.08rem}
     .bk-list .bk-list-item .bk-cover img{display:block;width:100%;height:100%;border-radius:0.08rem}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:0.24rem}
     .bk-list .bk-list-item .bk-info{position:relative;z-index:2;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-negative:0;flex-shrink:0;margin-left:0.24rem}
     .bk-list .bk-list-item .bk-info h2{font-size:0.32rem;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}
     .bk-list .bk-list-item .bk-info h2{font-size:0.32rem;color:#333333;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}
-    .bk-list .bk-list-item .bk-info p{font-size:0.26rem;color:#666666;margin-top:0.16rem;height:0.75rem;line-height:0.375rem;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .bk-list .bk-list-item .bk-info .bk-info-desc,
+    .bk-list .bk-list-item .bk-info .bk-info-desc *{font-size:0.26rem;color:#666666;margin-top:0.16rem;height:0.75rem;line-height:0.375rem;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .bk-list .bk-list-item .bk-info img{display: none}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:0.22rem;color:#B2B2B2;margin-top:0.32rem}
     .bk-list .bk-list-item .bk-info .bk-info-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:0.22rem;color:#B2B2B2;margin-top:0.32rem}
-}
+}

+ 4 - 1
src/main/resources/static/js/encyclopedia/common.js

@@ -110,7 +110,10 @@ $(function () {
     });
     });
     $('#searchForm').on('submit', function () {
     $('#searchForm').on('submit', function () {
         const keyword = $('#searchInput').val()
         const keyword = $('#searchInput').val()
-        if (!keyword) return false
+        if (!keyword) {
+            CAIMEI.Alert('搜索词条不能为空', '确定', false);
+            return false
+        }
         location.href = '/encyclopedia/search.html?keyword=' + keyword
         location.href = '/encyclopedia/search.html?keyword=' + keyword
         return false
         return false
     })
     })

+ 1 - 1
src/main/resources/templates/encyclopedia/search.html

@@ -28,7 +28,7 @@
                 <div class="bk-cover"><img :src="item.image" :alt="item.name"/></div>
                 <div class="bk-cover"><img :src="item.image" :alt="item.name"/></div>
                 <div class="bk-info">
                 <div class="bk-info">
                     <h2 v-html="item.name"></h2>
                     <h2 v-html="item.name"></h2>
-                    <p v-html="item.discription"></p>
+                    <div class="bk-info-desc" v-html="item.discription"></div>
                     <div class="bk-info-footer"><span>浏览量:{{item.pv}}</span><span>{{item.publishTime}}</span></div>
                     <div class="bk-info-footer"><span>浏览量:{{item.pv}}</span><span>{{item.publishTime}}</span></div>
                 </div>
                 </div>
             </a>
             </a>