Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/static/css/encyclopedia/common.css

@@ -7,6 +7,7 @@ a{text-decoration: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}
 .hidden{width:100vw;overflow:hidden}
+.jconfirm-content{overflow: hidden}
 
 @media screen and (min-width:768px){.only-mobile{display:none !important}
     ::-webkit-scrollbar{width:8px;height:8px;background-color:#f5f5f5}
@@ -112,4 +113,4 @@ input{outline:none}
     .bk-footer .beian span{margin:0 4px}
     .bk-footer .beian i{display:inline-block;width:16px;height:16px;vertical-align:-3px;font-size:0;background:url("/img/base/icon-icp@2x.png") no-repeat center;background-size:16px}
     .bk-footer .copyright{font-size:12px;color:#e1e1e1;font-weight:lighter;line-height:0.48rem}
-}
+}

src/main/resources/static/css/encyclopedia/detail.css

@@ -10,8 +10,8 @@
     .bk-detail-left .bk-overview{color:#999999;margin-top:16px}
     .bk-detail-left .bk-information{display:table;margin-top:48px;margin-bottom:48px;width:100%}
     .bk-detail-left .bk-information .bk-row{display:table-row}
-    .bk-detail-left .bk-information .bk-row .bk-label{display:table-cell;font-weight:bold;color:#9AA5B5;border-bottom:1px dashed #BEBEBE;padding:18px 0 10px}
-    .bk-detail-left .bk-information .bk-row .bk-content{font-size:14px;display:table-cell;border-bottom:1px dashed #BEBEBE;padding:18px 0 10px}
+    .bk-detail-left .bk-information .bk-row .bk-label{display:table-cell;font-weight:bold;color:#9AA5B5;border-bottom:1px dashed #BEBEBE;padding:18px 0 10px;white-space:nowrap;}
+    .bk-detail-left .bk-information .bk-row .bk-content{font-size:14px;display:table-cell;border-bottom:1px dashed #BEBEBE;padding:18px 10px 10px}
     .bk-detail-left .bk-section .bk-section-content{line-height: 1.8}
     .bk-detail-left .bk-section .bk-title{position:relative;margin-top:40px;margin-bottom:24px}
     .bk-detail-left .bk-section .bk-title h2{background:#fff;font-size:22px;display:inline-block;font-weight:normal;position:relative;z-index:20;padding-right:16px}

src/main/resources/static/css/encyclopedia/list.css

@@ -6,7 +6,7 @@
     .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 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{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 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::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 +23,7 @@
     .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 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{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}
-}
+}

src/main/resources/static/js/supplier-center/encyclopedia/components/content-edit/index.js

@@ -5,7 +5,7 @@ const contentEdit = {
     <div class="el-input" :id="editId">
         <div class="bk-toolbar" @click="handleToolBarClick" v-show="isFocus"></div>
         <div class="bk-bubble" @click="handleBubbleClick" v-show="bubbleNum>0">{{bubbleNum}}</div>
-        <div class="el-input__inner bk-input" contenteditable="true" @focus="isFocus = true" @blur="onBlur" v-html="value"></div>
+        <div class="el-input__inner bk-input" contenteditable="plaintext-only" @focus="isFocus = true" @blur="onBlur" v-html="value"></div>
         <ul class="bk-literature" v-show="showBubble && bubbleNum>0">
             <li v-for="item in refList" :key="item.ctrlId">
                 <div>{{item | reference}}</div>

src/main/resources/templates/encyclopedia/detail.html

@@ -110,7 +110,7 @@
             </div>
             <div class="bk-pv">
                 <div class="bk-pv-item">浏览次数：<span th:text="*{pv}"></span></div>
-                <div class="bk-pv-item" th:text="*{publishTime}"></div>
+                <div class="bk-pv-item" th:text="*{publishTimeStr}"></div>
             </div>
         </div>
         <div class="bk-detail-right only-pc">

src/main/resources/templates/encyclopedia/list.html

@@ -36,7 +36,7 @@
             <div class="bk-cover"><img th:src="*{image}" th:alt="*{name}"/></div>
             <div class="bk-info">
                 <h2 th:text="*{name}"></h2>
-                <p th:utext="*{discription}"></p>
+                <div class="bk-info-desc" th:utext="*{discription}"></div>
                 <div class="bk-info-footer"><span>浏览量：<span th:text="*{pv lt 10000 ? pv : '9999+'}"></span></span><span th:text="*{publishTimeStr}"></span></div>
             </div>
         </a>