Merge branch 'dev' of http://git.izouma.com/xiongzhu/jmrh into dev

src/main/data-center/src/components/orgInfo.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="org-info">
         <div class="square-box">
-            <el-image :src="info.logo" fit="cover">
+            <el-image :src="info.logo" fit="contain">
                 <div slot="error" class="image-slot">
                     <i class="el-icon-picture-outline"></i>
                 </div>
@@ -40,6 +40,9 @@ export default {
         bottom: 0;
     }
 }
+.el-image {
+    background-color: #fff;
+}
 
 .el-image /deep/ .image-slot {
     width: 100%;

src/main/data-center/src/components/projectInfo.vue

@@ -3,10 +3,10 @@
         <el-image :src="img" fit="cover"> </el-image>
         <div class="info">
             <div class="text1">
-                <div class="tag">{{ info.reviewStatus }}{{ info.passStatus }}</div>
+                <!-- <div class="tag">{{ info.reviewStatus }}{{ info.passStatus }}</div> -->
                 {{ info.name }}
             </div>
-            <div class="text2">{{ info.intro }}</div>
+            <div class="text2" v-html="info.intro"></div>
 
             <div class="time">
                 {{ info.createdAt }}
@@ -79,10 +79,13 @@ export default {
         -webkit-line-clamp: 2;
         overflow: hidden;
         max-height: 62px;
-        font-size: 18px;
+        font-size: 16px;
         color: #ffffff;
         line-height: 31px;
         margin-top: 7px;
+        /deep/ p {
+            margin: 0;
+        }
     }
 
     .time {

src/main/data-center/src/views/Search.vue

@@ -54,7 +54,7 @@ export default {
     components: { orgInfo, ProjectInfo },
     data() {
         return {
-            type: 'orgInfo',
+            type: 'project',
             typeOptions: [
                 {
                     label: '企业',
@@ -104,6 +104,7 @@ export default {
                     search: this.searchval,
                     size: this.size,
                     page: this.page,
+                    sort: 'createdAt,desc',
                 })
                 .then((res) => {
                     this.list = [...this.list, ...res.content];