فهرست منبع

Merge branch 'master' of http://116.63.33.55/git/nazw

# Conflicts:
#	nngkxxdp/src/main/resources/static/school/schoolDetail.html
elis 2 سال پیش
والد
کامیت
6edf93c29b

+ 3 - 3
nngkxxdp/src/main/resources/static/school/js/schoolDetail.js

@@ -89,9 +89,9 @@ function initHead(data){
 			'</ul>' +
 		'</div>' +
 		'<ul class="bottom">' +
-			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 0.9375rem;"><span>电话:</span><span class="link" title="'+data.contactTel+'">'+data.contactTel+'</span></li>' +
-			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 0.8125rem;"><span>地址:</span><span class="link" title="'+data.address+'">'+data.address+'</span></li>' +
-			"<li style='cursor:pointer;position: relative;' onclick='clickQRCode()'><img src='images/logo-wx.png' alt=''><span>微信:点击查看二维码</span><div id='ewmImg' style='position: absolute;z-index: 99999;background: #f6f6f6;border-radius: 0.3125rem;height: 9.375rem;width: 9.375rem;padding: 0.5rem;display: none;top: 1.875rem;'><img style='height: 9.375rem;width: 9.375rem;' src='" + wechatImg + "' alt=''></div></li>" +
+			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 15px;"><span>电话:</span><span class="link" title="'+data.contactTel+'">'+data.contactTel+'</span></li>' +
+			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 13px;"><span>地址:</span><span class="link" title="'+data.address+'">'+data.address+'</span></li>' +
+			"<li style='cursor:pointer;position: relative;' onclick='clickQRCode()'><img src='images/logo-wx.png' alt=''><span>微信:点击查看二维码</span><div id='ewmImg' style='position: absolute;z-index: 99999;background: #f6f6f6;border-radius: 5px;height: 150px;width: 150px;padding: 8px;display: none;top: 30px;'><img style='height: 150px;width: 150px;' src='" + wechatImg + "' alt=''></div></li>" +
 			'<li><img src="images/logo-gw.png" alt=""><span>官网:</span><span class="link" onclick="gotos(\''+website+'\')" title="'+website+'">'+website+'</span></li>' +
 		'</ul>'
 	document.getElementById('infoHead').innerHTML =html

+ 80 - 60
nngkxxdp/src/main/resources/static/school/schoolDetail.html

@@ -18,11 +18,11 @@
         }
 
         .content .route {
-            width: 6.25rem;
-            height: 1.875rem;
-            line-height: 1.875rem;
+            width: 100px;
+            height: 30px;
+            line-height: 30px;
             text-align: center;
-            font-size: 0.875rem;
+            font-size: 14px;
             background: #004A93;
             color: #fff;
             float: right;
@@ -30,20 +30,20 @@
 
         .schoolList {
             display: flex;
-            margin-top: 1.25rem;
+            margin-top: 20px;
         }
 
         .schoolList .logo {
-            width: 34.375rem;
-            height: 19.3125rem;
+            width: 550px;
+            height: 309px;
             background-size: 100% 100%;
             position: relative;
             background-position: center center;
         }
 
         .logo-img {
-            width: 34.375rem;
-            height: 19.3125rem;
+            width: 550px;
+            height: 309px;
         }
 
         .schoolList .logo .name {
@@ -57,44 +57,44 @@
             /*box-sizing: border-box;*/
             /*position: absolute;*/
             /*top: 9px;*/
-            padding: 0px 2.1875rem 0px 1.25rem;
+            padding: 0px 35px 0px 20px;
             background-size: 100% 100%;
-            height: 2.5625rem;
-            line-height: 2.5625rem;
-            padding-left: 1.25rem;
-            font-size: 1rem;
+            height: 41px;
+            line-height: 41px;
+            padding-left: 20px;
+            font-size: 16px;
             color: #FFFFFF;
             box-sizing: border-box;
             position: absolute;
-            top: 0.5625rem;
-            left: -0.625rem;
+            top: 9px;
+            left: -10px;
         }
 
         .schoolList .message {
-            width: 35rem;
-            margin-left: 1.25rem;
+            width: 560px;
+            margin-left: 20px;
         }
 
         .schoolList .message .title {
-            font-size: 1.625rem;
+            font-size: 26px;
             font-weight: bold;
             color: #333333;
         }
 
         .schoolList .message .other {
-            width: 37.3125rem;
+            width: 597px;
             /*height: 9.4375rem;*/
             background: rgb(176 176 176 / 22%);
-            font-size: 1rem;
+            font-size: 16px;
             color: #666666;
-            padding: 0.625rem 0;
+            padding: 10px 0;
             box-sizing: border-box;
             display: flex;
-            margin-top: 0.9375rem;
+            margin-top: 15px;
         }
 
         .schoolList .message .other li {
-            line-height: 1.875rem;
+            line-height: 30px;
             word-wrap: break-word;
             overflow: hidden;
             white-space: nowrap;
@@ -104,33 +104,33 @@
 
         .schoolList .message .other ul {
             width: 50%;
-            padding-left: 1.625rem;
+            padding-left: 26px;
             box-sizing: border-box;
         }
 
         .schoolList .message .bottom {
-            margin-top: 0.9375rem;
+            margin-top: 15px;
         }
 
         .schoolList .message .bottom li {
-            width: 16.25rem;
-            font-size: 1rem;
-            height: 1.875rem;
-            line-height: 1.875rem;
+            width: 260px;
+            font-size: 16px;
+            height: 30px;
+            line-height: 30px;
             color: #666666;
             float: left;
-            margin-top: 0.625rem;
+            margin-top: 10px;
             display: flex;
             align-items: center;
         }
 
         .schoolList .message .bottom li:nth-child(2n) {
-            margin-left: 2.5rem;
+            margin-left: 40px;
         }
 
         .link {
             display: inline-block;
-            width: 10rem;
+            width: 160px;
             word-wrap: break-word;
             overflow: hidden;
             white-space: nowrap;
@@ -141,7 +141,7 @@
         .schoolList .message .bottom li span {
             white-space: nowrap;
             cursor: pointer;
-            line-height: 1.875rem;
+            line-height: 30px;
         }
 
         .schoolList .message .bottom li a {
@@ -152,22 +152,22 @@
         }
 
         .schoolList .message .bottom li img {
-            margin-right: 0.5rem;
+            margin-right: 8px;
         }
 
         .titleList {
             width: 100%;
             display: flex;
-            border-bottom: 0.0625rem solid #004A93;
-            margin-top: 2.5rem;
+            border-bottom: 1px solid #004A93;
+            margin-top: 40px;
         }
 
         .titleList li {
-            width: 9.125rem;
-            height: 3.5rem;
-            line-height: 3.5rem;
+            width: 146px;
+            height: 56px;
+            line-height: 56px;
             text-align: center;
-            font-size: 1.25rem;
+            font-size: 20px;
             color: #333333;
         }
 
@@ -195,33 +195,33 @@
 
         .cost li {
             width: 50%;
-            padding-left: 2.3125rem;
+            padding-left: 37px;
         }
 
         .cost .title {
-            height: 3.4375rem;
+            height: 55px;
             background: #77A7D5;
-            font-size: 1.25rem;
+            font-size: 20px;
             color: #FFFFFF;
         }
 
         .cont li {
-            height: 12.9375rem;
+            height: 207px;
             font-size: 1rem;
             color: #333333;
-            border: 0.0625rem solid #77A7D5;
+            border: 1px solid #77A7D5;
         }
 
         .cont .list {
             display: flex;
             align-items: center;
-            line-height: 2.25rem;
+            line-height: 36px;
         }
 
         .cont .list .redius {
-            width: 0.5rem;
-            height: 0.5rem;
-            border-radius: 0.25rem;
+            width: 8px;
+            height: 8px;
+            border-radius: 4px;
             background-color: #333;
         }
     </style>
@@ -240,19 +240,39 @@
                     <img class="logo-img" src="images/school.png" />
                     <div class="name" style="background-image: url(images/bg-xx.png);" id="schoolType"></div>
                 </div>
-                <div class="message" id="infoHead">
-                </div>
-                <div class="route" style="cursor:pointer " id="route" onclick="back()">返回</div>
+                
             </div>
-            <ul class="titleList">
-                <li id="school" class="click" onclick="checkSchool()">学校介绍</li>
-                <li id="principal" onclick="checkPrincipal()">校长介绍</li>
-                <li id="JT" onclick="checkJT()">餐食情况</li>
-                <li id="ZZZS" onclick="checkZZZS()">招生方式</li>
+            <div class="message" id="infoHead">
+            </div>
+            <div class="route" style="cursor:pointer " id="route" onclick="back()">返回</div>
+        </div>
+        <ul class="titleList">
+            <li id="school" class="click" onclick="checkSchool()">学校介绍</li>
+            <li id="principal" onclick="checkPrincipal()">校长介绍</li>
+            <li id="JT" onclick="checkJT()">餐食情况</li>
+            <li id="ZZZS" onclick="checkZZZS()">招生方式</li>
+
+        </ul>
+        <div style="font-size: 16px;color: #333333;text-indent: 40px;margin-top: 20px;line-height: 36px;min-height: 200px;padding: 0 10px;box-sizing: border-box;"
+            id="contentText">
+
+        </div>
+        <ul class="titleList">
+            <li class="click">收费情况</li>
+        </ul>
+        <div class="cost">
+            <ul class="title">
+                <li>学杂费/书杂费</li>
+            </ul>
+            <ul class="cont " style="min-height: 96px" id="conts">
 
             </ul>
-            <div style="font-size: 1rem;color: #333333;text-indent: 2.5rem;margin-top: 1.25rem;line-height: 2.25rem;min-height: 12.5rem;padding: 0 0.625rem;box-sizing: border-box;"
-                 id="contentText">
+        </div>
+        <ul class="titleList">
+            <li class="click" style="width: 180px">资助奖励(国家)</li>
+        </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">

+ 6 - 7
nngkxxdp/src/main/resources/static/school/schoolMobile.html

@@ -49,7 +49,7 @@
         }
 
         .content .search input {
-            width: 62% !important;
+            width: 59% !important;
             font-size: 0.75rem !important;
         }
 
@@ -136,15 +136,11 @@
             align-items: center !important;
         }
 
-            #pageMessage {
-                width: 64% !important;
+        #pageMessage {
+                width: 76% !important;
                 margin-top: 0.625rem !important;
 
             }
-        #pageMessage {
-            width: 64% !important;
-            margin-top: 0.625rem !important;
-        }
 
         .page .bottomBtn {
             width: 64% !important;
@@ -160,6 +156,9 @@
             height: 2.6rem;
             overflow: hidden;
         }
+        .ewm{
+            left: 0 !important;
+        }
     </style>
 </head>