Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/inva_4_tivo/css/knowledgeField.css

@@ -1,7 +1,6 @@
 .knowledgeFieldCon {
   position: relative;
   background: #f6f7fb;
-  height: 100%;
   padding-top: 4.5rem;
   display: flex;
 }
@@ -68,6 +67,10 @@
 }
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item {
   display: flex;
+  cursor: pointer;
+}
+.knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item:hover .textContent div {
+  color: #3396fb;
 }
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .image {
   width: 10.1875rem;
@@ -132,6 +135,12 @@
   font-size: 1.5625rem;
   z-index: 2;
   cursor: pointer;
+  width: 1.875rem;
+  height: 1.875rem;
+}
+.knowledgeFieldCon .knowledgeDetails .returnIcon img {
+  width: 100%;
+  height: 100%;
 }
 .knowledgeFieldCon .knowledgeDetails .returnIcon:hover {
   color: #3396fb;
@@ -186,6 +195,7 @@
   justify-content: center;
   border-radius: 0.375rem;
   background: linear-gradient(180deg, #3597fb 0%, #39e5ff 100%);
+  cursor: pointer;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con li {
   font-family: Microsoft YaHei UI;
@@ -203,7 +213,6 @@
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .hypertextContent {
   background: #f6f6f6;
   padding: 1.875rem;
-  overflow-y: auto;
   margin: 0 1.875rem;
   flex: 1;
   font-size: 1rem;
@@ -260,9 +269,6 @@
   border: 1px solid #fff;
   cursor: pointer;
 }
-.knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList .latestList-item:hover {
-  border: 1px solid #409eff;
-}
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList .latestList-item:hover .latestList-item-text {
   color: #3396fb;
 }
@@ -316,10 +322,10 @@
   height: 100%;
 }
 .knowledgeFieldCon .linkButton {
-  color: #3396fb;
+  color: #7b7b7b;
   font-family: Microsoft YaHei UI;
   font-weight: regular;
-  font-size: 1rem;
+  font-size: 0.875rem;
   line-height: normal;
   letter-spacing: 0px;
   cursor: pointer;

fhKeeper/formulahousekeeper/inva_4_tivo/css/knowledgeField.less

@@ -1,7 +1,7 @@
 .knowledgeFieldCon {
   position: relative;
   background: #f6f7fb;
-  height: 100%;
+  // height: 100%;
   padding-top: 4.5rem;
   display: flex;
   // 知识园地
@@ -68,6 +68,12 @@
 
       .knowledgeField-content-item {
         display: flex;
+        cursor: pointer;
+        &:hover {
+          .textContent div {
+            color: #3396fb;
+          }
+        }
         .image {
           width: 10.1875rem;
           height: 6.8125rem;
@@ -131,6 +137,12 @@
       font-size: 1.5625rem;
       z-index: 2;
       cursor: pointer;
+      width: 1.875rem;
+      height: 1.875rem;
+      img {
+        width: 100%;
+        height: 100%;
+      }
     }
     .returnIcon:hover {
       color: #3396fb;
@@ -187,6 +199,7 @@
             justify-content: center;
             border-radius: .375rem;
             background: linear-gradient(180deg, #3597fb 0%, #39e5ff 100%);
+            cursor: pointer;
           }
         }
         li {
@@ -207,7 +220,7 @@
       .hypertextContent {
         background: #f6f6f6;
         padding: 1.875rem;
-        overflow-y: auto;
+        // overflow-y: auto;
         margin: 0 1.875rem;
         flex: 1;
         font-size: 1rem;
@@ -265,7 +278,7 @@
           border: 1px solid #fff;
           cursor: pointer;
           &:hover {
-            border: 1px solid #409eff;
+            // border: 1px solid #409eff;
             .latestList-item-text {
               color: #3396fb;
             }
@@ -321,10 +334,10 @@
   }
 
   .linkButton {
-    color: #3396fb;
+    color: #7b7b7b;
     font-family: Microsoft YaHei UI;
     font-weight: regular;
-    font-size: 1rem;
+    font-size: .875rem;
     line-height: normal;
     letter-spacing: 0px;
     cursor: pointer;

fhKeeper/formulahousekeeper/inva_4_tivo/knowledge.ftl

@@ -37,7 +37,7 @@
         <div class="flex1 knowledgeField-content">
           <#list knowledgeFieldTableList as item>
             <div>
-              <div class="knowledgeField-content-item">
+              <div class="knowledgeField-content-item" onclick="triggerButtonClick(${item.id})">
                 <div class="image"><img src="data:image;base64,${item.baseImage}" class="wh100" class="wh100"></img>
                 </div>
                 <div class="textContent">
@@ -107,6 +107,13 @@
   function learnMore(id) {
     window.location.href = knowledgeDetails + `?id=` + id
   }
+  function triggerButtonClick(itemId) {
+    // 找到该 item 对应的按钮并触发点击事件
+    const button = document.querySelector('button[onclick="learnMore('+itemId+')"]');
+    if (button) {
+      button.click();
+    }
+  }
   function confirmJump() {
     let inputVal = document.getElementById("paginationInput").value;
     if(inputVal <= 0) {

fhKeeper/formulahousekeeper/inva_4_tivo/knowledgeDetails.ftl

@@ -43,7 +43,7 @@
           </div>
           <div class="flex-center distribution timeContent">
             <p>发布时间</p>
-            <span>${ article.createTime }</span>
+            <span>${ article.createTimeStr }</span>
           </div>
           <div class="flex-center distribution readUse" style="justify-content: flex-end;">
             <div class="text">推荐使用:</div>
@@ -87,7 +87,7 @@
                 </div>
                 <div class="latestList-item-text">
                   <div class="latestList-item-text-title">${ item.title }</div>
-                  <div class="data">${ item.createTime }</div>
+                  <div class="data">${ item.createTimeStr }</div>
                 </div>
               </div>
             </#list>
@@ -107,7 +107,7 @@
                 </div>
                 <div class="latestList-item-text">
                   <div class="latestList-item-text-title">${ item.title }</div>
-                  <div class="data">${item.createTime}</div>
+                  <div class="data">${item.createTimeStr}</div>
                 </div>
               </div>
             </#list>