冲突解决

nngkxxdp/src/main/resources/static/school/css/school.css

@@ -1,81 +1,81 @@
 .content {
-    width: 87.5rem;
-    margin: 0.625rem auto;
+    width: 70%;
+    margin: 8.5px auto;
 }
 
 .content .search {
     width: 100%;
     display: flex;
     align-items: center;
-    font-size: 1.25rem;
+    font-size: 16px;
 }
 
 .content .search input {
-    width: 65.9375rem;
-    height: 3.625rem;
+    width: 957px;
+    height: 80px;
     background: #FFFFFF;
-    border: 0.0625rem solid #A0A0A0;
+    border: 1px solid #A0A0A0;
     opacity: 0.51;
-    border-radius: 0.25rem;
-    padding-left: 1.0625rem;
+    border-radius: 4px;
+    padding-left: 10px;
 }
 
 .content .search input::placeholder {
-    font-size: 1.25rem;
+    font-size: 16px;
     color: #999999;
 }
 
 .content .search button {
-    width: 14.3125rem;
-    height: 3.625rem;
+    width: 280px;
+    height: 55px;
     display: flex;
     align-items: center;
     justify-content: center;
     color: #FFFFFF;
     background: #004A93;
-    border-radius: 0.25rem;
-    margin-left: 1.125rem;
-    font-size: 1.25rem;
+    border-radius: 10px;
+    margin-left: 10px;
+    font-size: 20px;
 }
 
 .condition .item {
     display: flex;
-    margin-top: 1.25rem;
+    margin-top: 16px;
     position: relative;
 }
 
 .item .title {
-    width: 9.0625rem;
-    font-size: 1.25rem;
+    width: 127px;
+    font-size: 16px;
     color: #333333;
     display: flex;
     justify-content: space-around;
 }
 
 .item .list {
-    width: 77.625rem;
+    width: 100%;
     display: flex;
     flex-wrap: wrap;
-    border-bottom: 0.0625rem solid rgb(153 153 153 / 40%);
+    border-bottom: 1px solid rgb(153 153 153 / 40%);
 }
 .item .more{
     display: none;
-    font-size: 0.5em;
+    font-size: 7px;
     color: #2e7ceb;
     position: absolute;
     bottom: 11px;
     right: 10px;
 }
 .item .list li {
-    height: 1.9375rem;
-    line-height: 1.9375rem;
+    height: 32px;
+    line-height: 32px;
     text-align: center;
-    border-radius: 0.375rem;
-    font-size: 1rem;
+    border-radius: 5px;
+    font-size: 16px;
     color: #333333;
-    padding: 0 1.125rem;
-    margin-left: 0.625rem;
-    margin-bottom: 0.625rem;
+    padding: 0 16px;
+    margin-left: 9px;
+    margin-bottom: 9px;
     cursor: pointer;
 }
 
@@ -86,28 +86,28 @@
 
 .schoolList {
     display: flex;
-    margin-top: 1.25rem;
+    margin-top: 17.5px;
 }
 
 .schoolList .logo {
-    width: 18.75rem;
-    height: 9.5625rem;
+    width: 287px;
+    height: 134px;
     background-size: 100% 100%;
     position: relative;
 }
 
 .schoolList .logo .name {
-    padding: 0px 2.1875rem 0px 1.25rem;
+    padding: 0px 30.6px 0px 17.5px;
     background-size: 100% 100%;
-    height: 2.5625rem;
-    line-height: 2.5625rem;
-    padding-left: 1.25rem;
-    font-size: 1rem;
+    height: 36px;
+    line-height: 36px;
+    padding-left: 17.5px;
+    font-size: 16px;
     color: #FFFFFF;
     box-sizing: border-box;
     position: absolute;
-    top: 0.5625rem;
-    left:-0.625rem;
+    top: 8px;
+    left:-8px;
 }
 
 
@@ -116,11 +116,11 @@
 }
 
 .schoolList .message {
-    margin-left: 1.25rem;
+    margin-left: 17.5px;
 }
 
 .schoolList .message .title {
-    font-size: 1.625rem;
+    font-size: 23px;
     font-weight: bold;
     color: #333333;
 }
@@ -131,11 +131,11 @@
 }
 
 .schoolList .message li {
-    width: 16.875rem;
-    font-size: 1rem;
+    width: 236.25px;
+    font-size: 16px;
     color: #666666;
     float: left;
-    margin-top: 0.625rem;
+    margin-top: 8.75px;
     overflow:hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -143,7 +143,7 @@
 }
 
 .schoolList .message li img {
-    margin-right: 0.5rem;
+    margin-right: 8px;
 }
 
 .hand {
@@ -152,14 +152,14 @@
 
 .ewm {
     position: absolute;
-    left: 28.75rem;
+    left: 402px;
     top: 0px;
     z-index: 99999;
     background: #f6f6f6;
-    border-radius: 0.3125rem;
-    height: 9.375rem;
-    width: 9.375rem;
-    padding: 0.5rem;
+    border-radius: 6px;
+    height: 131.25px;
+    width: 131.25px;
+    padding: 8px;
     display: none;
 }
 

nngkxxdp/src/main/resources/static/school/schoolDetail.html

@@ -273,25 +273,6 @@
         </ul>
         <div style="font-size: 16px;color: #333333;margin-top: 20px;line-height: 36px; min-height: 112px;box-sizing: border-box;"
             id="jsao">
-
-            </div>
-            <ul class="titleList">
-                <li class="click">收费情况</li>
-            </ul>
-            <div class="cost">
-                <ul class="title">
-                    <li>学杂费/书杂费</li>
-                </ul>
-                <ul class="cont " style="min-height: 6rem" id="conts">
-
-                </ul>
-            </div>
-            <ul class="titleList">
-                <li class="click" style="width: 11.25rem">资助奖励（国家）</li>
-            </ul>
-            <div style="font-size: 1rem;color: #333333;margin-top: 1.25rem;line-height: 2.25rem; min-height: 7rem;box-sizing: border-box;"
-                 id="jsao">
-
             </div>
         </div>
     </div>