Merge branch 'liuqiang' into v3

src/views/highSearch/HighSearch.vue

@@ -78,13 +78,12 @@
     </div>
     <IdentifyFont :openFile="openFile"></IdentifyFont>
   </div>
-
 </template>
 
 <script setup>
 import { onMounted, ref } from "vue";
 import { search } from "@/api/search/search.js";
-import IdentifyFont from '@/components/IdentifyFont/IdentifyFont.vue'
+import IdentifyFont from "@/components/IdentifyFont/IdentifyFont.vue";
 const searchText = ref(""); //搜索ipt的值
 const selectValue = ref(1); //文档空间类型
 const page = ref(1); //页数
@@ -101,7 +100,7 @@ const selectOptions = [
 ];
 
 // ----------------------------
-const openFile = ref(true)
+const openFile = ref(true);
 // ----------------------------
 
 onMounted(async () => {});
@@ -142,7 +141,7 @@ const doSearch = async () => {
   }
 };
 const setScroll = async () => {
-  // console.log("到底啦");
+  console.log("到底啦");
   if (beEnd.value) return;
   page.value += 1;
   const query = {
@@ -152,7 +151,7 @@ const setScroll = async () => {
     type: selectValue.value,
   };
   const res = await search(query);
-  // console.log(res);
+  console.log(res);
   if (res.data.length > 0) {
     // 如果返回的有数据
     total.value += res.data.length;
@@ -222,6 +221,7 @@ const setScroll = async () => {
 .result_box {
   margin-top: 8px;
   padding-left: 16px;
+  height: calc(100% - 180px);
   .left_box {
     display: flex;
     align-items: center;
@@ -235,6 +235,7 @@ const setScroll = async () => {
     width: 100%;
     height: 100%;
     overflow: auto;
+    // box-sizing: border-box;
     .oneBox {
       width: 100%;
       // height: 120px;