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

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

@@ -157,21 +157,21 @@
     z-index: 99999;
     background: #f6f6f6;
     border-radius: 0.3125rem;
-    height: 9.375rem;
-    width: 9.375rem;
+    height: 10.775rem;
+    width: 10.775rem;
     padding: 0.5rem;
     display: none;
 }
 
 .ewm2 {
     position: absolute;
-    left: 260px;
-    top: 50px;
+    left: 8rem;
+    top: 4.5rem;
     z-index: 99999;
     background: #f6f6f6;
-    border-radius: 5px;
-    height: 150px;
-    width: 150px;
-    padding: 8px;
+    border-radius: 0.3125rem;
+    height: 10.775rem;
+    width: 10.775rem;
+    padding: 0.5rem;
     display: none;
-}
+}

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

@@ -10,7 +10,7 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
 		var searchUrl = window.parent.location.href;
 		var searchData = searchUrl.split("=");
 		let id = searchData[1]
-		window.location = PATH+'/school/shellDe.html?id='+id
+		window.location = PATH+'/school/schoolDetailMoblies.html?id='+id
 	}
 	setHeader()
 	setFooter()
@@ -89,8 +89,8 @@ function initHead(data){
 		'</div>' +
 		'<ul class="bottom">' +
 			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 15px;"><span>电话：</span><span class="link" title="'+contactTel+'">'+contactTel+'</span></li>' +
-			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 13px;"><span>地址：</span><span class="link" title="'+address+'">'+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-dt.png" alt="" style="margin-right: 13px;"><span>地址：</span><span class="link" title="'+address+'">'+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>"
 
 		if (!(website==null||website=="")){
 			html+='<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')" title="'+website+'">'+website+'</span></li>'
@@ -219,9 +219,6 @@ function getSchoolType(id) {
 		return "";
 	}
 	switch (id) {
-		case 0:
-			return '幼儿园';
-			break;
 		case 1:
 			return '小学';
 			break;
@@ -253,14 +250,14 @@ function getNature(id) {
 	}
 }
 
-function clickQRCode() {
-	if ($("#ewmImg").css("display") == 'none') {
-		$("#ewmImg").css("display", "block");
-	} else {
-		$("#ewmImg").css("display", "none");
-	}
-
-}
+// function clickQRCode() {
+// 	if ($("#ewmImg").css("display") == 'none') {
+// 		$("#ewmImg").css("display", "block");
+// 	} else {
+// 		$("#ewmImg").css("display", "none");
+// 	}
+//
+// }
 
 function getSchoolTypeImg(id) {
 	switch (id) {

nngkxxdp/src/main/resources/static/school/js/schoolDetailMobile.js

@@ -31,7 +31,7 @@ function init(){
 }
 
 function back(){
-	window.parent.location(PATH + "/school/shellSc.html")
+	window.parent.location(PATH + "/school/schoolMobiles.html")
 }
 // function resizeFrame(){
 // 	var content_iframe = window.parent.document.getElementsByTagName("iframe");//获取iframeID
@@ -79,7 +79,7 @@ function initHead(data){
 		'<ul class="bottom">' +
 			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 0.9375rem;"><span>电话：</span><span class="link" title="'+contactTel+'">'+contactTel+'</span></li>' +
 			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 0.8125rem;"><span>地址：</span><span class="link" title="'+address+'">'+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 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-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')" title="'+website+'">'+website+'</span></li>' +
 		'</ul>'
 	document.getElementById('infoHead').innerHTML =html
@@ -197,9 +197,6 @@ function getSchoolType(id) {
 		return "";
 	}
 	switch (id) {
-		case 0:
-			return '幼儿园';
-			break;
 		case 1:
 			return '小学';
 			break;
@@ -231,14 +228,14 @@ function getNature(id) {
 	}
 }
 
-function clickQRCode() {
-	if ($("#ewmImg").css("display") == 'none') {
-		$("#ewmImg").css("display", "block");
-	} else {
-		$("#ewmImg").css("display", "none");
-	}
-
-}
+// function clickQRCode() {
+// 	if ($("#ewmImg").css("display") == 'none') {
+// 		$("#ewmImg").css("display", "block");
+// 	} else {
+// 		$("#ewmImg").css("display", "none");
+// 	}
+//
+// }
 
 function getSchoolTypeImg(id) {
 	switch (id) {

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

@@ -40,7 +40,6 @@
                     </div>
                     <ul class="list schoolType">
                         <li type="-1" class="click">不限</li>
-                        <li type="0">幼儿园</li>
                         <li type="1">小学</li>
                         <li type="2">中学</li>
                         <li type="6">高等院校</li>
@@ -154,7 +153,7 @@
     }
 
     if (isMobileUserAgent()){
-        window.location = PATH+ '/school/shellSc.html'
+        window.location = PATH+ '/school/schoolMobiles.html'
     }
     $(function () {
         getData();
@@ -324,11 +323,11 @@
                             "<li><img src=\"images/logo-zgbm.png\" alt=\"\"><span>上级主管部门：</span><span>" + competentDepartment + "</span></li>" +
                             "<li><img src=\"images/logo-jituan.png\" alt=\"\"><span>所属集团：</span><span>" + group + "</span></li>"
                             if (!(website==null||website=="")){
-                                schoolHtml+="<li onclick='gotoOfficial(" + i + ")' class=\"hand\"><img src=\"images/logo-gw.png\" alt=\"\"><span>官网：</span><span><a title=" + website +">" + website + "</a></span></li>" +
-                                            "<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>"
+                                schoolHtml+="<li onclick='gotoOfficial(" + i + ")' class=\"hand\"><img src=\"images/logo-gw.png\" alt=\"\"><span>官网：</span><span><a title=" + website +">" + website + "</a></span></li>"
+                                            // "<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>"
                             } else {
-                                schoolHtml+="<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm2' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>" +
-                                    "<li></li>"
+                                // schoolHtml+="<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm2' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>" +
+                                schoolHtml+="<li></li>"
                             }
                             schoolHtml+="</ul>" +
                             "<ul style=\"margin-top: 10px;\">" +
@@ -349,9 +348,6 @@
             return "";
         }
         switch (id) {
-            case 0:
-                return '幼儿园';
-                break;
             case 1:
                 return '小学';
                 break;
@@ -426,21 +422,21 @@
                 break;
         }
     }
-    function clickQRCode(number) {
-        for (var i = 0; i < schoolData.length; i++) {
-            if (i != number) {
-                str = "#ewmNumber" + i
-                $(str).css("display", "none");
-            } else {
-                str = "#ewmNumber" + number
-                if ($(str).css("display") == 'none') {
-                    $(str).css("display", "block");
-                } else {
-                    $(str).css("display", "none");
-                }
-            }
-        }
-    }
+    // function clickQRCode(number) {
+    //     for (var i = 0; i < schoolData.length; i++) {
+    //         if (i != number) {
+    //             str = "#ewmNumber" + i
+    //             $(str).css("display", "none");
+    //         } else {
+    //             str = "#ewmNumber" + number
+    //             if ($(str).css("display") == 'none') {
+    //                 $(str).css("display", "block");
+    //             } else {
+    //                 $(str).css("display", "none");
+    //             }
+    //         }
+    //     }
+    // }
     function gotoOfficial(number) {
         if (schoolData[number].website != null && schoolData[number].website != '') {
             let split = schoolData[number].website.split("//");

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

@@ -169,7 +169,7 @@
         }
 
         .cost {
-            margin: 0.625rem auto;
+            /*margin: 0.625rem auto;*/
             width: 100%;
         }
 
@@ -243,13 +243,13 @@
                 <li>学杂费/书杂费</li>
 
             </ul>
-            <ul class="cont" style="padding-left: 1rem; min-height: 18.75rem;box-sizing: border-box" id="conts">
+            <ul class="cont" style="padding-left: 1rem; min-height: 5.75rem;box-sizing: border-box" id="conts">
             </ul>
         </div>
         <ul class="titleList">
             <li class="click" style="width: 11.25rem">资助奖励（国家）</li>
         </ul>
-        <div style="font-size: 1rem;color: #333333;text-indent: 2.5rem;margin-top: 1.25rem;line-height: 2.25rem; min-height: 18.75rem;padding: 0 0.625rem;box-sizing: border-box;"
+        <div style="font-size: 1rem;color: #333333;text-indent: 2.5rem;margin-top: 1.25rem;line-height: 2.25rem; min-height: 5.75rem;padding: 0 0.625rem;box-sizing: border-box;"
             id="jsao">
 
         </div>

nngkxxdp/src/main/resources/static/school/shellDe.html → nngkxxdp/src/main/resources/static/school/schoolDetailMoblies.html

@@ -31,11 +31,12 @@
       position: fixed;
       top: 90%;
       right: 0;
+      z-index: 9999;
   }
 </style>
 <body>
 <div style="width:100%;" id="header"></div>
-<iframe id="childshell" width="100%" height="2000px" src="schoolMobile.html"></iframe>
+<iframe id="childshell" width="100%" height="1000px" src="schoolMobile.html"></iframe>
 <div class="jdroute" style="cursor:pointer;" id="route" onclick="back()">返回</div>
 <div style="width:100%;" id="footer"></div>
 

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

@@ -170,7 +170,6 @@
                 </div>
                 <ul class="list schoolType">
                     <li type="-1" class="click">不限</li>
-                    <li type="0">幼儿园</li>
                     <li type="1">小学</li>
                     <li type="2">中学</li>
                     <li type="6">高等院校</li>
@@ -448,11 +447,11 @@
                             "<li><div class='imglogo'><img src=\"images/logo-zgbm.png\" alt=\"\"></div><span>上级主管部门：</span><span>" + competentDepartment + "</span></li>" +
                             "<li><div class='imglogo'><img src=\"images/logo-jituan.png\" alt=\"\"></div><span>所属集团：</span><span>" + group + "</span></li>"
                             if (!(website==null||website=="")){
-                                schoolHtml+="<li onclick='gotoOfficial(" + i + ")' class=\"hand\"><img src=\"images/logo-gw.png\" alt=\"\"><span>官网：</span><span><a title=" + website +">" + website + "</a></span></li>" +
-                                    "<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>"
+                                schoolHtml+="<li onclick='gotoOfficial(" + i + ")' class=\"hand\"><img src=\"images/logo-gw.png\" alt=\"\"><span>官网：</span><span><a title=" + website +">" + website + "</a></span></li>"
+                                    // "<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>"
                             } else {
-                                schoolHtml+="<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm2' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>" +
-                                    "<li></li>"
+                                // schoolHtml+="<li onclick='clickQRCode(" + i + ")' class=\"hand\"><img src=\"images/logo-wx.png\" alt=\"\"><span>微信：点击查看二维码</span><div class='ewm2' id='ewmNumber" + i + "'><img style='height: 150px;width: 150px;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>" +
+                                schoolHtml+="<li></li>"
                             }
                             schoolHtml+="</ul>" +
                                 "<ul style=\"margin-top: 0.625rem;\">" +
@@ -474,9 +473,6 @@
             return "";
         }
         switch (id) {
-            case 0:
-                return '幼儿园';
-                break;
             case 1:
                 return '小学';
                 break;
@@ -560,21 +556,21 @@
         }
     }
 
-    function clickQRCode(number) {
-        for (var i = 0; i < schoolData.length; i++) {
-            if (i != number) {
-                str = "#ewmNumber" + i
-                $(str).css("display", "none");
-            } else {
-                str = "#ewmNumber" + number
-                if ($(str).css("display") == 'none') {
-                    $(str).css("display", "block");
-                } else {
-                    $(str).css("display", "none");
-                }
-            }
-        }
-    }
+    // function clickQRCode(number) {
+    //     for (var i = 0; i < schoolData.length; i++) {
+    //         if (i != number) {
+    //             str = "#ewmNumber" + i
+    //             $(str).css("display", "none");
+    //         } else {
+    //             str = "#ewmNumber" + number
+    //             if ($(str).css("display") == 'none') {
+    //                 $(str).css("display", "block");
+    //             } else {
+    //                 $(str).css("display", "none");
+    //             }
+    //         }
+    //     }
+    // }
 
     function gotoOfficial(number) {
         if (schoolData[number].website != null && schoolData[number].website != '') {

nngkxxdp/src/main/resources/static/school/shellSc.html → nngkxxdp/src/main/resources/static/school/schoolMobiles.html

@@ -20,7 +20,7 @@
 </style>
 <body>
 <div style="width:100%;" id="header"></div>
-    <iframe width="100%" height="2000px" src="schoolMobile.html"></iframe>
+    <iframe width="100%" height="1000px" src="schoolMobile.html"></iframe>
 <div style="width:100%;" id="footer"></div>
 </body>
 <script src="js/jquery-3.5.1.min.js"></script>