Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

t# especially if it merges an updated upstream into a topic branch.

official_frontend/src/views/about/qualifications.vue

@@ -139,7 +139,7 @@
                             return;
                             //有图片时
                         } else if (this.cooperationsForm.image != null) {
-                            form.append("multipartFile", this.cooperationsForm.image);
+                            form.append("file", this.cooperationsForm.image);
                         }
                         if (this.cooperationsForm.id != null) {
                             form.append("id", this.cooperationsForm.id);

website/src/main/resources/templates/about.html

@@ -110,7 +110,7 @@
                     </div>
                 </div>
                 <div class="row portfolio text-center">
-                    <div class="col-md-3" style="margin-bottom: 60px;" th:each="item : ${qualifications}">
+                    <div class="col-md-4" style="margin-bottom: 60px;" th:each="item : ${qualifications}">
                         <div class="box-image-text">
                             <div class="image"><img th:src="${{item.imgUrl}}" alt="..." class="img-fluid">
                                 <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->

website/src/main/resources/templates/css/style.blue.css

@@ -1476,6 +1476,18 @@ header.nav-holder.sticky {
   margin-bottom: 15px;
 }
 
+.box-image-text .height-set {
+    display: inline-block;
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    text-align: center;
+}
+
+.box-image-text .height-set {
+    max-height: 120px;
+}
+
 .box-image-text .overlay {
   width: 100%;
   height: 100%;

website/src/main/resources/templates/partner.html

@@ -87,7 +87,7 @@
                             <div class="row mb-4">
                                 <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==0">
                                     <div class="box-image-text">
-                                        <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
+                                        <div class="image height-set"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                                             <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
                                         </div>
                                         <div class="content">
@@ -105,7 +105,7 @@
                             <div class="row mb-4">
                                 <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==1">
                                     <div class="box-image-text">
-                                        <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
+                                        <div class="image height-set"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                                             <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
                                         </div>
                                         <div class="content">
@@ -123,7 +123,7 @@
                             <div class="row mb-4">
                                 <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==2">
                                     <div class="box-image-text">
-                                        <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
+                                        <div class="image height-set"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                                             <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
                                         </div>
                                         <div class="content">
@@ -141,7 +141,7 @@
                             <div class="row mb-4">
                                 <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==3">
                                     <div class="box-image-text">
-                                        <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
+                                        <div class="image height-set"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                                             <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
                                         </div>
                                         <div class="content">
@@ -159,7 +159,7 @@
                             <div class="row mb-4">
                                 <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==4">
                                     <div class="box-image-text">
-                                        <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
+                                        <div class="image height-set"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                                             <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
                                         </div>
                                         <div class="content">
@@ -177,7 +177,7 @@
                             <div class="row mb-4">
                                 <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==5">
                                     <div class="box-image-text">
-                                        <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
+                                        <div class="image height-set"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                                             <!--<div class="overlay d-flex align-items-center justify-content-center"><a href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
                                         </div>
                                         <div class="content">