Merge remote-tracking branch 'origin/master'

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

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

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

@@ -6,6 +6,7 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
 		layer = layui.layer,
 		util = layui.util,
 		element = layui.element;
+
 	init();
 
 });
@@ -13,10 +14,10 @@ const PATH = "https://www.cqna.gov.cn/data";
 // const PATH = "https://192.168.0.13:7777";
 
 function init(){
-	var searchUrl = window.location.href;
+	var searchUrl = window.parent.location.href;
 	var searchData = searchUrl.split("=");
 	let id = searchData[1]
-	// let id = "school2022NACC3"
+	// let id = "school2022NACC7"
 	get('/nazwSchool/info', true, {"id":id}, function (res) {
 		let data = res.data;
 		if (!data) {
@@ -76,9 +77,12 @@ function initHead(data){
 
 }
 function gotos(src){
-
-	// console.log(src)
-	window.location.href=src;
+	let split = src.split("//");
+	if (split.length>1){
+		window.open(src);
+	}else {
+		window.open("http://"+src)
+	}
 }
 let p =[]
 function initbody(data){
@@ -93,7 +97,7 @@ function initbody(data){
 function conts(data){
 	let html = ""
 	html+=data.bookCharge==null?"":data.bookCharge;
-	html+=data.studyCharge==null?"":data.studyCharge;
+	// html+=data.studyCharge==null?"":data.studyCharge;
 	document.getElementById('conts').innerHTML = html;
 }
 

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

@@ -273,7 +273,7 @@
         getData();
     }
     function gotoInfo(id) {
-        window.location.href = PATH + "/school/schoolDetail.html?id=" + schoolData[id].id
+        window.open("https://www.cqna.gov.cn//2022wzgb/sxna/xx/detail.html?id=" + schoolData[id].id)
     }
     // 拿数据
     function getData() {
@@ -312,16 +312,21 @@
                             "<div style='position: relative' class=\"message\">" +
                             "<div onclick='gotoInfo(" + i + ")' class=\"title hand\">" + schoolData[i].name + "</div>" +
                             "<ul>" +
-                            "<li><div class='imglogo'><img src=\"images/logo-lb.png\" alt=\"\"></div><span>学校类别：</span><span>" + getSchoolType(schoolData[i].schoolType) + "</span></li>" +
-                            "<li><div class='imglogo'><img src=\"images/logo-xz.png\" alt=\"\"></div><span>学校性质：</span><span>" + getNature(schoolData[i].natureType) + "</span></li>" +
-                            "<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>" +
-                            "<li onclick='gotoOfficial(" + i + ")' class=\"hand\"><div class='imglogo'><img src=\"images/logo-gw.png\" alt=\"\"></div><span>官网：</span><span><a title=" + website + ">" + website + "</a></span></li>" +
-                            "<li onclick='clickQRCode(" + i + ")' class=\"hand\"><div class='imglogo'><img src=\"images/logo-wx.png\" alt=\"\"></div><span>微信：点击查看二维码</span><div class='ewm' id='ewmNumber" + i + "'><img style='height: 9.375rem;width: 9.375rem;' src='" + schoolData[i].wechatImg + "' alt=''></div></li>" +
-                            "</ul>" +
-                            "<ul style=\"margin-top: 0.625rem;\">" +
-                            "<li><div class='imglogo'><img src=\"images/logo-dh.png\" alt=\"\"></div><span>电话：</span><span title=" + tell + ">" + tell + "</span></li>" +
-                            "<li><div class='imglogo'><img src=\"images/logo-dz.png\" alt=\"hand\"></div><span>地址：</span><span title=" + schoolAddress + ">" + schoolAddress + "</span></li>" +
+                            "<li><img src=\"images/logo-lb.png\" alt=\"\"><span>学校类别：</span><span>" + getSchoolType(schoolData[i].schoolType) + "</span></li>" +
+                            "<li><img src=\"images/logo-xz.png\" alt=\"\"><span>学校性质：</span><span>" + getNature(schoolData[i].natureType) + "</span></li>" +
+                            "<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>"
+                            } 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+="</ul>" +
+                            "<ul style=\"margin-top: 10px;\">" +
+                            "<li><img src=\"images/logo-dh.png\" alt=\"\"><span>电话：</span><span title=" + tell +">" + tell + "</span></li>" +
+                            "<li><img src=\"images/logo-dz.png\" alt=\"hand\"><span>地址：</span><span title=" + schoolAddress +">" + schoolAddress + "</span></li>" +
                             "</ul>" +
                             "</div>" +
                             "</div >"
@@ -431,7 +436,13 @@
     }
     function gotoOfficial(number) {
         if (schoolData[number].website != null && schoolData[number].website != '') {
-            window.open(schoolData[number].website);
+            let split = schoolData[number].website.split("//");
+            if (split.length>1){
+                window.open(schoolData[number].website);
+            }else {
+                window.open("http://"+schoolData[number].website)
+            }
+            // window.open(schoolData[number].website);
         }
     }
 

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

@@ -80,7 +80,7 @@
 
         .schoolList .message .other {
             width: 37.3125rem;
-            height: 9.4375rem;
+            /*height: 9.4375rem;*/
             background: rgb(176 176 176 / 22%);
             font-size: 1rem;
             color: #666666;
@@ -179,14 +179,15 @@
         }
 
         .cost {
-            margin: 0.625rem auto;
-            width: 84.75rem;
+            /*margin: 0.625rem auto;*/
+            /*width: 84.75rem;*/
         }
 
         .cost ul {
             width: 100%;
             display: flex;
             align-items: center;
+
         }
 
         .cost li {
@@ -275,34 +276,16 @@
         </ul>
         <div class="cost">
             <ul class="title">
-                <li>书杂费</li>
-                <li>学杂费</li>
+                <li>学杂费/书杂费</li>
             </ul>
-            <ul class="cont " style="min-height: 18.75rem" id="conts">
-                <!--<li><div class="list"><div class="redius"></div><span>项目名称：</span><span>书杂费</span></div><div class="list"><div class="redius"></div><span>项目名称：</span><span>书杂费</span></div><div class="list"><div class="redius"></div><span>项目名称：</span><span>书杂费</span></div><div class="list"><div class="redius"></div><span>项目名称：</span><span>书杂费</span></div><div class="list"><div class="redius"></div><span>项目名称：</span><span>书杂费</span></div></li>-->
-                <!--                <li style="border-left:none;">-->
-                <!--                    <div class="list">-->
-                <!--                        <div class="redius"></div><span>项目名称：</span><span>书杂费</span>-->
-                <!--                    </div>-->
-                <!--                    <div class="list">-->
-                <!--                        <div class="redius"></div><span>项目名称：</span><span>书杂费</span>-->
-                <!--                    </div>-->
-                <!--                    <div class="list">-->
-                <!--                        <div class="redius"></div><span>项目名称：</span><span>书杂费</span>-->
-                <!--                    </div>-->
-                <!--                    <div class="list">-->
-                <!--                        <div class="redius"></div><span>项目名称：</span><span>书杂费</span>-->
-                <!--                    </div>-->
-                <!--                    <div class="list">-->
-                <!--                        <div class="redius"></div><span>项目名称：</span><span>书杂费</span>-->
-                <!--                    </div>-->
-                <!--                </li>-->
+            <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;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;margin-top: 1.25rem;line-height: 2.25rem; min-height: 7rem;box-sizing: border-box;"
             id="jsao">
             重庆市南岸区珊瑚实验小学，创办于1986年。学校校园环境优美，教学设施完善，师资力量雄厚，是国家教育部命名的全国现代技术教育实验学校，重庆市首
             比示范学校。学校占地近60
@@ -312,6 +295,20 @@
     </div>
 </body>
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
+<script>
+    if (isMobileUserAgent()){
+        var searchUrl = window.parent.location.href;
+        var searchData = searchUrl.split("=");
+        let id = searchData[1]
+        window.location = 'schoolDetail-Mobile.html?id="'+id+'"'
+    }
+
+    function isMobileUserAgent() {
+        return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
+            window.parent.navigator.userAgent.toLowerCase("")
+        );
+    }
+</script>
 <script src="js/jquery-3.5.1.min.js"></script>
 <script src="js/schoolDetail.js"></script>