1.0.34

app.js

@@ -1,8 +1,7 @@
-// app.js
 App({
   globalData: {
-    Version: "1.0.20",
-    IsProduction: true,
+    Version: "1.0.34",
+    //IsProduction: true,
     ShareTitle: "上海中考招生信息查询工具",
     SharePath: "pages/index/index",
     ShareImage: '../images/fs_a01.png',
@@ -28,7 +27,8 @@ App({
     PageCount: 100, //每一页翻页数
     TempParam: "", //临时参数
     MyWish: {}, //我的福帖
-
+    FeedbackUrl:"",
+    ArticleList:[]  //文章列表 
   },
   onLaunch: function (options) {
     this.getSystemInfo();

app.json

@@ -27,6 +27,18 @@
   "requiredPrivateInfos": [
     "getLocation"
   ],
+  "navigateToMiniProgramAppIdList": [
+    "wxa5441bbf344692ba",
+    "wx46a7b4c420e6d38f",
+    "wx1fef080f74481cbd",
+    "wx331e8dd070f01d0e",
+    "wx313a8f2c0741efe1",
+    "wx80059777521b897c",
+    "wxb54a6d5aff836ee3",
+    "wxa5e33c61fe37dd01",
+    "wxaa1a8b48d9853872",
+    "wx84b3feac6069eec3"
+  ],
   "window": {
     "navigationBarBackgroundColor": "#F0F0F0",
     "navigationBarTitleText": "秒过分数线",

app.wxss

@@ -258,6 +258,12 @@
   font-size: 24rpx;
   font-weight: 400;
   color:#787878;
+}
+
+.panelSchoolList1Text03{
+  font-size: 24rpx;
+  font-weight: 400;
+  color:#9B9B9B;
   font-family: 'Roboto-Black';
 }
 
@@ -281,6 +287,11 @@
   font-weight: 400;
 }
 
+
+.panelScoreHeader0{
+  font-size: 20rpx;
+}
+
 .panelScoreHeaderTd1{
   width:140rpx;
   margin-left: 30rpx;

pages/main/default.js

@@ -7,9 +7,12 @@ const app = getApp();
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
-    ArticleList:constant.arrArticleList,
+    ArticleList:[],
     District:constant.arrDistrict,  
     Version:app.globalData.Version,
+    Years:constant.arrYear,
+    YearIndex:0,
+    HideAddProgram:1,
   },
   onLoad: function (options) {
     var that = this;
@@ -30,18 +33,97 @@ Page({
       main.getCollect();
     }
 
-    that.getWish();
+    that.getNotice(function(){
+      that.getPersonNum(function(){
+        that.getArticle(function(){
+          that.getWish();
+        });
+      });
+    });
+
+    var hideAddProgram=wx.getStorageSync('HideAddProgram');
+    if (!hideAddProgram){
+      wx.checkIsAddedToMyMiniProgram({
+        success:function(e){
+          console.log(e.added);
+          that.setData({
+            HideAddProgram:e.added,
+          });
+        }
+      })
+    }
   },
   onShow:function(){
     this.getWish();
   },
-  getWish:function(){
+  onHideAddProgram:function(){
+    wx.setStorageSync('HideAddProgram', 1);
+    this.setData({
+      HideAddProgram:1,
+    });
+  },
+  showMore:function(e){
+    var that = this;
+    var id=e.currentTarget.dataset.id;
+    if (id==1){
+      that.setData({
+        Page1:0,
+      });
+    }
+    else if (id==2){
+      that.setData({
+        Page2:0,
+      });
+    }
+  },
+  getPersonNum:function(callback){
+    var that = this;
+    main.getData("GetMPSCityPersonNum", function (data) {
+      if (data) {
+        that.setData({
+          PersonNum: data,
+        });
+        if (callback)
+          callback();
+      }
+    });
+  },
+  getWish:function(callback){
     var that = this;
     main.getData("GetMPSWish?WishType=all", function (data) {
       if (data) {
         that.setData({
           WishList: data,
+          Page1:1,
+          Page2:1,
         });
+        if (callback)
+          callback();
+      }
+    });
+  },
+  getNotice:function(callback){
+    var that = this;
+    main.getData("GetMPSNotice", function (data) {
+      if (data) {
+        that.setData({
+          Notice: data,
+        });
+        if (callback)
+          callback();
+      }
+    });
+  },
+  getArticle:function(callback){
+    var that = this;
+    main.getData("GetMPSArticle", function (data) {
+      if (data) {
+        that.setData({
+          ArticleList: data,
+        });
+        app.globalData.ArticleList=data;
+        if (callback)
+          callback();
       }
     });
   },
@@ -51,6 +133,19 @@ Page({
   onShareTimeline: function () {
     return this.onShareAppMessage();
   },
+  gotoMiniprogram:function(){
+    main.gotoMiniprogram(184);
+  },
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      if (e.currentTarget.dataset.object=="Years"){
+        that.setData({
+          YearIndex:e.currentTarget.dataset.index
+        });
+      }
+    });   
+  },
   onShareAppMessage: function () {
     return {
       title: "上海中考招生信息查询工具",

pages/main/default.wxml

@@ -1,5 +1,17 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image class="pic_01" src="../images/pic_01.png"></image>
+  <image class="info_01" src="../images/info_01.png" bindtap="onHideAddProgram" wx:if="{{!HideAddProgram}}"></image>
+  
+  <view class="panel0 FlexRow" wx:if="{{Notice.IsShow}}">
+    <view class="panel01 FlexColumn">
+      <view class="panel011">{{Notice.Content}}</view>
+      <view class="panel012">{{Notice.Title}}</view>
+      <view class="panel013 FlexRow" bindtap="goto" data-url="{{Notice.ButtonUrl}}" wx:if="{{Notice.ButtonTitle}}">
+        <image class="{{Notice.ButtonIcon}}" src="../images/{{Notice.ButtonIcon}}"></image>
+        <view>{{Notice.ButtonTitle}}</view>
+      </view>
+    </view>
+  </view>
   <view class="panel1 FlexColumn">
     <image class="pic_04" src="../images/pic_04.png"></image>
     <view class="panel11 FlexColumn">
@@ -60,37 +72,117 @@
   </view>
 
   <view class="panel2 FlexColumn">
-    <view class="text06">参考文章</view>
+
+    <block wx:if="{{false}}">
+      <view class="panel20 FlexRow" bindtap="gotoMiniprogram">
+        <view class="panel201 FlexColumn">
+          <view class="panel2011">秒过其它产品介绍</view>
+          <view class="panel2012">秒过学习·艾宾浩斯背记小程序轻松记牢「高考考纲3500词」</view>
+          <view class="panel2013">报名新手班，手把手教会使用，助您中考后更进一步！</view>
+        </view>
+        <image src="../images/ad_02.png" class="ad_02"></image>
+      </view>
+      <image src="../images/line_03.png" class="line_03"></image>
+    </block>
+    
+    <view class="panelBasicCss panel4 FlexColumn">
+      <view class="panel41 FlexRow">
+        <view class="panel411">中招快报</view>
+        <view class="panel412">{{PersonNum.Year}}年</view>
+        <view class="panel412 panel413">相较上年</view>
+      </view>
+      <view class="panel4line03"></view>
+      <view class="panel42 FlexRow" wx:for="{{PersonNum.List}}" wx:key="*this" wx:if="{{index<3}}">
+        <view class="panel421"></view>
+        <view class="panel422">{{item.Name}}</view>
+        <view class="panel423 FlexRow">
+          <view>{{item.Year1}}</view>
+          <view class="panel4231">({{item.Rate}}%)</view>
+        </view>
+        <view class="panel424 FlexRow">
+          <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item.Year2>0}}"></image>
+          <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.Year2<0}}"></image>
+          <view class="panel4241" wx:if="{{item.Year2>0}}">{{item.Year2}}</view>
+          <view class="panel4242" wx:if="{{item.Year2<0}}">{{-item.Year2}}</view>
+          <view class="panel4243" wx:if="{{item.Year2==0}}"></view>
+        </view>
+        <view class="panel4244 FlexRow" wx:if="{{item.Other}}">
+          <view class="panel42441">{{item.Other}}</view>
+        </view>
+      </view>
+      <view class="panel4line04"></view>
+      <view class="panel42 FlexRow" wx:for="{{PersonNum.List}}" wx:key="*this" wx:if="{{index==3}}">
+        <view class="panel421 panel4211"></view>
+        <view class="panel422">{{item.Name}}</view>
+        <view class="panel423">{{item.Year1}}</view>
+        <view class="panel424 FlexRow">
+          <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item.Year2>0}}"></image>
+          <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.Year2<0}}"></image>
+          <view class="panel4241" wx:if="{{item.Year2>0}}">{{item.Year2}}</view>
+          <view class="panel4241" wx:if="{{item.Year2<0}}">{{-item.Year2}}</view>
+          <view class="panel4241" wx:if="{{item.Year2==0}}">持平</view>
+        </view>
+      </view>
+
+      <view class="panel4line03"></view>
+    </view>
+    
+    <block wx:if="{{IsShow}}">
+      <view class="panelRadio2 panelMarginTop FlexRow" style="margin: 80rpx 0 30rpx 40rpx;">
+      <view class="text14">详细文章</view><view class="panelRadio21 panelRadio21{{item.CSS}}" wx:for="{{Years}}" wx:key="index" bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio" wx:if="{{index<2}}">{{item.Name}}年</view>
+    </view>
     <view class="panel21 FlexColumn" >
-      <view class="panel211 FlexColumn" wx:for="{{ArticleList}}" wx:key="index" bindtap="goto" data-url="docs?ID={{item.ID}}">
+      <view class="panel211 FlexRow" wx:for="{{ArticleList}}" wx:key="index" bindtap="goto" data-url="docs?ID={{item.ID}}" wx:if="{{item.Category==Years[YearIndex].Name && item.IsPageShow>=Page1}}">
         <view class="panel2111 FlexRow">
+          <image wx:if="{{item.Logo}}" class="imgLogo2" src="../images/{{item.Logo}}"></image>
+          <view class="text07">{{item.Title}}</view>
+          <image wx:if="{{item.TitleImage}}" class="TitleImage" src="{{ImagePath}}web/_ScoreLine/{{item.TitleImage}}"></image>
+        </view>
+      </view>
+      <view class="panel213 FlexRow" bindtap="showMore" data-id="1" wx:if="{{Page1==1}}">
+        <view>查看更多</view>
+        <view class="panel2131 FlexRow">
+          <image class="icon_fold_03" src="../images/icon_fold_03.png"></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="text06" style="margin-bottom: 30rpx;font-size:28rpx;">志愿填报小知识</view>
+    <view class="panel21 FlexColumn" >
+      <view class="panel211 panel212 FlexColumn" wx:for="{{ArticleList}}" wx:key="index" bindtap="goto" data-url="docs?ID={{item.ID}}" 
+      wx:if="{{ item.Category=='小知识' && item.IsPageShow>=Page2}}">
+        <view class="panel2111 FlexRow" style="margin-top: 30rpx;">
+          <image wx:if="{{item.Logo}}" class="imgLogo2" src="../images/{{item.Logo}}"></image>
           <view class="panel21111 FlexColumn">
-            <view class="panel211111 FlexRow">
-              <image wx:if="{{item.Logo}}" class="imgLogo2" src="../images/{{item.Logo}}"></image>
-              <view class="text08">{{item.Category}}</view>
-            </view>
-            <view class="text07">{{item.Title}}</view>
+            <view class="text071">{{item.Title}}</view>
+            <view class="line04" wx:if="{{item.ID!=9}}"></view>
           </view>
-          <image wx:if="{{item.TitleImage}}" class="TitleImage" src="{{ImagePath}}web/_ScoreLine/{{item.TitleImage}}"></image>
         </view>
-        
-        <view class="line04"></view>
+      </view>
+      <view class="panel213 FlexRow" bindtap="showMore" data-id="2" wx:if="{{Page2==1}}">
+        <view>查看更多</view>
+        <view class="panel2131 FlexRow">
+          <image class="icon_fold_03" src="../images/icon_fold_03.png"></image>
+        </view>
       </view>
     </view>
+    </block>
+    
+    <image class="line_05" src="../images/line_03.png"></image>
     <block wx:if="{{IsShow}}">
-      <view style="height:30rpx;"></view>
+      <view style="height:50rpx;"></view>
       <view class="panel1133 FlexRow" bindtap="goto" data-url="userinfo?ReturnCount=1">
-        <view class="text03 text031">编辑用户信息</view>
+        <view class="text03 text031">用户信息</view>
         <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
       </view>
-      <view class="line04" style="margin-top: 0;"></view>
+      <view class="line07" style="margin-top: 0;"></view>
       <view class="panel1133 FlexRow" bindtap="goto" data-url="feedbackinfo">
         <view class="text03 text031">纠错与建议</view>
         <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
       </view>
     </block>
     
-    <view class="line04" style="margin-top: 0;"></view>
+    <view class="line07" style="margin-top: 0;"></view>
     <view class="panel2 FlexRow">
       <text class="text09">
         <text class="text10">诚恳声明：</text>本产品所有图文内容来自网络，仅供家长对上海地区招生计划有大致了解。由于有可能存在错谬，故不能作为填报志愿的决策依据，请务必以当时当地教育局和学校提供的信息为准。我们将认真对待用户提供的纠错和建议，尽可能刊载正确信息。

pages/main/default.wxss

@@ -6,6 +6,47 @@
   width: 100%;
   height:234rpx;
 }
+.info_01{
+  width: 300rpx;
+  height:126rpx;
+  position: absolute;
+  right:10rpx;
+  z-index: 10;
+}
+
+.panel0{
+  width:100%;
+  background-color: #F8C324;
+}
+
+.panel01{
+  width:690rpx;
+  background-color: #fff;
+  border-radius: 30rpx;
+  margin: 40rpx 0 0 0;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.panel011{
+  font-size: 24rpx;
+  font-weight: 400;
+  width: 610rpx;
+  margin-top: 78rpx;
+  margin-bottom:40rpx;
+}
+.panel012{
+  padding: 0 40rpx;
+  line-height:58rpx;
+  border-radius: 30rpx 0 30rpx 0;
+  background-color: #4d4d4d;
+  color:#fff;
+  font-size:20rpx;
+  text-align: center;
+  position: absolute;
+  top:0;
+  left:0;
+}
 
 .panel1{
   width:100%;
@@ -25,7 +66,7 @@
   border-radius: 30rpx;
   background-color: #FFF;
   min-height: 100rpx;
-  margin-top: 40rpx;
+  margin-top: 30rpx;
   position: relative;
 }
 
@@ -251,52 +292,79 @@
 
 .panel21{
   width: 670rpx;
+  align-items: flex-start;
 }
 .panel211{
   width: 100%;
-  margin-top: 30rpx;
+  height:140rpx;
+}
+
+.panel212{
+  width: 100%;
+  align-items: flex-start;
+  height:auto;
 }
+
 .panel2111{
   width: 100%;
-  justify-content: space-between;
+  align-items: flex-start;
+  margin-top: 30rpx;
+  justify-content: flex-start;
 }
 .panel21111{
-  width: 450rpx;
+  height:70rpx;
   align-items: flex-start;
 }
 
-.panel211111{  
-  margin-top: 16rpx;
-}
-
 .text08{
   font-size: 20rpx;
   color:#9B9B9B;
   margin-left: 10rpx;
   height:22rpx;
 }
+
 .text07{
-  margin-top: 17rpx;
   font-size:28rpx;
   font-weight: 400;
-  width:450rpx;
+  width:410rpx;
+  margin: 0 40rpx 0 16rpx;
+}
+
+
+.text071{
+  font-size:28rpx;
+  font-weight: 400;
+  width:600rpx;
+  height:100rpx;
+  margin: 0 0 0 16rpx;
 }
 
 .line04{
+  width:630rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin-left: 16rpx;
+}
+.line07{
   width:670rpx;
   height:1rpx;
   background-color: #E3E3E3;
-  margin-top: 30rpx;
+}
+
+.line_05{
+  width: 670rpx;
+  height:6rpx;
+  margin-top: 60rpx;
 }
 
 .imgLogo2{
   width:24rpx;
-  height:22rpx;
+  height:29rpx;
 }
 
 .TitleImage{
   width:160rpx;
-  height:84rpx;
+  height:80rpx;
   border:1rpx solid #E3E3E3;
   border-radius: 10rpx;
 }
@@ -324,4 +392,185 @@
   width:16rpx;
   height:26rpx;
   margin-right: 60rpx;
+}
+
+.panel20{
+  width:100%;
+  height: 344rpx;
+}
+.panel201{
+  width:398rpx;
+  align-items: flex-start;
+  margin-right: 30rpx;
+}
+.panel2011{
+  font-size:20rpx;
+  color:#787878;
+  margin-bottom: 20rpx;
+}
+.panel2012{
+  font-size:28rpx;
+  margin-bottom: 10rpx;
+}
+.panel2013{
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.ad_02{
+  width:241rpx;
+  height: 205rpx;
+}
+
+.line_03{
+  width:670rpx;
+  height:6rpx;
+}
+
+.panel013{
+  width: 100%;
+  height:80rpx;
+  border-bottom-left-radius: 30rpx;
+  border-bottom-right-radius: 30rpx;
+  background-color: #4d4d4d;
+  color:#fff;
+  font-size:28rpx;
+  margin-top: -10rpx;
+}
+
+.icon_fold_05{
+  width:15rpx;
+  height:20rpx;
+  margin-right: 10rpx;
+}
+.icon_sys_15{
+  width:24rpx;
+  height:24rpx;
+  margin-right: 10rpx;
+}
+
+.panel4{
+  margin-top: 80rpx;
+}
+
+.panel41{
+  width:100%;
+  justify-content: flex-start;
+  align-items: flex-end;
+}
+.panel411{
+  font-size:36rpx;
+  margin-left: 20rpx;
+}
+.panel412{
+  font-size:20rpx;
+  font-weight: 400;
+  margin-left: 246rpx;
+}
+.panel413{
+  margin-left: 102rpx;
+}
+
+.panel4line03{
+  width:670rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin: 30rpx 0 0 0;
+}
+.panel42{
+  width:100%;
+  justify-content: flex-start;
+  margin-top: 30rpx;
+  flex-wrap: wrap;
+}
+.panel421{
+  width: 10rpx;
+  height:10rpx;
+  background-color: #4d4d4d;
+  margin: 11rpx 20rpx 11rpx 30rpx;
+}
+
+.panel422{
+  font-size:24rpx;
+  font-weight: 400;
+  width:240rpx;
+}
+
+.panel423{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin-left: 110rpx;
+  width:170rpx;
+  justify-content: flex-start;
+}
+
+.panel4241{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #FE6659;
+  margin-left: 6rpx;
+}
+
+.panel4242{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #03AF69;
+  margin-left: 6rpx;
+}
+
+.panel4line04{
+  width:670rpx;
+  height:5rpx;
+  background-color: #E3E3E3;
+  margin: 30rpx 0 0 0;
+}
+.panel4211{
+  background-color: #fff;
+}
+
+.panel424{
+  margin-left: 0rpx;
+}
+.panel4244{
+  width:670rpx;
+  height:68rpx;
+  border-radius: 10rpx;
+  background-color: #f8f8f8;
+  margin: 30rpx 0 0 20rpx;
+}
+.panel42441{
+  font-size:20rpx;
+  font-weight: 400;
+  width: 610rpx;
+}
+.panel4231{
+  font-family: Roboto-Black;
+  font-size: 20rpx;
+  color: #9B9B9B;
+  margin-left: 10rpx;
+}
+.text14{
+  font-size:28rpx;
+  margin-right: 30rpx;
+}
+
+.panel213{
+  align-self: flex-end;
+  font-size: 24rpx;
+  color: #EB5C28;
+  margin-top: 30rpx;
+  margin-right: 20rpx;
+}
+
+.panel2131{
+  width:34rpx;
+  height:34rpx;
+  background-color: #EB5C28;
+  border-radius: 50%;
+  margin-left: 20rpx;
+}
+.icon_fold_03{
+  width:18rpx;
+  height:10rpx;
 }

pages/main/district.js

@@ -10,9 +10,9 @@ Page({
     DistrictID: "01",
     SchoolType:constant.arrSchoolType,
     Article:[
-      {ID:1,Title:"市实验性示范性高中、市特色普通高中、\n市级优秀体育学生、艺术骨干学生",Url:"recruitment?PanelType=1&DistrictID="},
-      {ID:2,Title:"国际课程班和中外合作办学高中",Url:"recruitment?PanelType=2&DistrictID="},
-      {ID:3,Title:"中本贯通、五年一贯制、中高职费通",Url:"subscribe?"},
+      {ID:1,Title:"查询市实验性示范性高中、市特色普通高中、\n市级优秀体育学生、艺术骨干学生",Url:"recruitment?PanelType=1&DistrictID="},
+      {ID:2,Title:"查询国际课程班和中外合作办学高中",Url:"recruitment?PanelType=2&DistrictID="},
+      {ID:3,Title:"查询中本贯通、五年一贯制、中高职费通",Url:"subscribe?"},
     ],
   },
   onLoad: function (options) {
@@ -22,17 +22,30 @@ Page({
       DistrictID:options.ID,
       DistrictName:options.Name,
     });
+    
+    wx.setNavigationBarTitle({
+      title: "招生计划·"+that.data.DistrictName,
+    });
+
     that.init();
   },
   init:function(){
     var that = this;
     var id=Number(that.data.DistrictID);
-    main.getData("GetMPSSchool?SelectType=structure&DistrictID="+id, function (data) {
+    main.getData("GetMPSDistrictPersonNum?DistrictID="+id, function (data) {
       if (data) {
         that.setData({
-          SchoolAll: data,
-          SchoolCurrent:data[0].List
+          DistrictPersonNum: data,
+        });
+        main.getData("GetMPSSchool?SelectType=structure&DistrictID="+id, function (data) {
+          if (data) {
+            that.setData({
+              SchoolAll: data,
+              SchoolCurrent:data[0].List
+            });
+          }
         });
+        
       }
     });
   },

pages/main/district.wxml

@@ -3,8 +3,44 @@
     <view class="text01">{{DistrictName}}</view>
     <image class="logo_01b" src="../images/logo_{{DistrictID}}b.png"></image>
   </view>
+  <view class="panelBasicCss panel4 FlexColumn">
+    <view class="panel41 FlexRow">
+      <view class="panel411">计划统计</view>
+      <view class="panel412">{{DistrictPersonNum.Year}}年</view>
+      <view class="panel412 panel413">相较上年</view>
+    </view>
+    <view class="line03"></view>
+    <view class="panel42 FlexRow" wx:for="{{DistrictPersonNum.List}}" wx:key="*this" wx:if="{{index<3}}">
+      <view class="panel421"></view>
+      <view class="panel422">{{item.Name}}</view>
+      <view class="panel423 FlexRow">
+          <view>{{item.Year1}}</view>
+          <view class="panel4231">({{item.Rate}}%)</view>
+        </view>
+      <view class="panel424 FlexRow">
+        <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item.Year2>0}}"></image>
+        <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.Year2<0}}"></image>
+        <view class="panel4241" wx:if="{{item.Year2>0}}">{{item.Year2}}</view>
+        <view class="panel4242" wx:if="{{item.Year2<0}}">{{-item.Year2}}</view>
+        <view class="panel4243" wx:if="{{item.Year2==0}}"></view>
+      </view>
+    </view>
+    <view class="line04"></view>
+    <view class="panel42 panel420 FlexRow" wx:for="{{DistrictPersonNum.List}}" wx:key="*this" wx:if="{{index==3}}">
+      <view class="panel421 panel4211"></view>
+      <view class="panel422">{{item.Name}}</view>
+      <view class="panel423">{{item.Year1}}</view>
+      <view class="panel424 FlexRow">
+        <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item.Year2>0}}"></image>
+        <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.Year2<0}}"></image>
+        <view class="panel4241" wx:if="{{item.Year2>0}}">{{item.Year2}}</view>
+        <view class="panel4241" wx:if="{{item.Year2<0}}">{{-item.Year2}}</view>
+        <view class="panel4241" wx:if="{{item.Year2==0}}">持平</view>
+      </view>
+    </view>
+  </view>
   <view class="panelBasicCss panel2 FlexColumn">
-    <view class="text02">中招速查</view>
+    <view class="text02">招生查询</view>
     <view class="panel21 FlexRow">
       <view class="panel211 FlexColumn" bindtap="goto" data-url="scoreline?PageType=scoreline&ScoreTypeID=2&DistrictID={{DistrictID}}&YearIndex=0">
         <image class="icon_sys_05" src="../images/icon_sys_05.png"></image>
@@ -19,11 +55,12 @@
         <view class="text03">1-15志愿</view>
       </view>
     </view>
-    <view class="text04">自主招生</view>
-    <view class="panel22 FlexRow" wx:for="{{Article}}" wx:key="index" bindtap="goto" data-url="{{item.Url}}{{DistrictID}}">
-      <view class="panel221 FlexColumn">
+    
+    <view class="panel220 FlexRow">
         <image class="icon_sys_03" src="../images/icon_sys_03.png"></image>
-      </view>
+        <view class="text04">自主招生</view>
+    </view>
+    <view class="panel22 FlexRow" wx:for="{{Article}}" wx:key="index" bindtap="goto" data-url="{{item.Url}}{{DistrictID}}">
       <view class="panel222 FlexColumn" >
         <view class="panel2221 FlexRow">
           <text class="text05">{{item.Title}}</text>
@@ -36,7 +73,7 @@
   </view>
 
   <view class="panelBasicCss panel3 FlexRow" bindtap="goto" data-url="map?PageType=2&DistrictID={{DistrictID}}&DistrictName={{DistrictName}}">
-    <view class="text06">本区高中地图</view>
+    <view class="text06">校址地图</view>
     <view class="panel31 FlexRow">
       <image class="pic_03" src="../images/pic_03.png"></image>
       <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
@@ -44,7 +81,7 @@
   </view>
   
   <view class="panelBasicCss panel3 FlexColumn">
-    <view class="text07">本区学校名录</view>
+    <view class="text07">学校名录</view>
     <view class="panelRadio radio2 FlexRow">
       <view class="panelRadio1 panelRadio1{{item.CSS}}" wx:for="{{SchoolType}}" wx:key="index"
       bindtap="onSelect" data-object="SchoolType" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
@@ -72,7 +109,7 @@
               <view class="panelLine2" wx:if="{{item.Accommodation}}"></view>
               <view class="panelSchoolList1Text02">{{item.Accommodation}}</view>
               <view class="panelLine2" wx:if="{{item.SchoolNumber}}"></view>
-              <view class="panelSchoolList1Text02">{{item.SchoolNumber}}</view>
+              <view class="panelSchoolList1Text03">{{item.SchoolNumber}}</view>
             </view>
           </view>
         </view>       

pages/main/district.wxss

@@ -22,10 +22,106 @@
   align-self: flex-start;
 }
 
-.panel2{
+.panel4{
   margin-top: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-top:10rpx solid #4d4d4d;
+  justify-content: flex-start;
+}
+
+.panel41{
+  width:100%;
+  justify-content: flex-start;
+  align-items: flex-end;
+  margin-top: 60rpx;
+}
+.panel411{
+  font-size:36rpx;
+  margin-left: 40rpx;
+}
+.panel412{
+  font-size:20rpx;
+  font-weight: 400;
+  margin-left: 210rpx;
+}
+.panel413{
+  margin-left: 95rpx;
+}
+
+.line03{
+  width:630rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin: 30rpx 0 0 0;
+}
+.panel42{
+  width:100%;
+  justify-content: flex-start;
+  margin-top: 30rpx;
+}
+.panel420{
+  margin-bottom: 60rpx;
+}
+.panel421{
+  width: 10rpx;
+  height:10rpx;
+  background-color: #4d4d4d;
+  margin: 11rpx 20rpx 11rpx 50rpx;
+}
+
+.panel422{
+  font-size:24rpx;
+  font-weight: 400;
+  width:240rpx;
+}
+
+.panel423{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin-left: 70rpx;
+  width:162rpx;
+  justify-content: flex-start;
+}
+
+.panel4231{
+  font-family: Roboto-Black;
+  font-size: 20rpx;
+  color: #9B9B9B;
+  margin-left: 10rpx;
+}
+.panel424{
+  justify-content: flex-start;
+}
+
+.panel4241{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #FE6659;
+  margin-left: 6rpx;
+}
+
+.panel4242{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #03AF69;
+  margin-left: 6rpx;
 }
 
+.line04{
+  width:630rpx;
+  height:5rpx;
+  background-color: #E3E3E3;
+  margin: 30rpx 0 0 0;
+}
+.panel4211{
+  background-color: #fff;
+}
+
+.panel2{
+  margin-top: 30rpx;
+}
 
 .panel21{
   margin-top: 40rpx;
@@ -58,39 +154,36 @@
 }
 
 .text04{
-  margin: 50rpx 0 40rpx 40rpx;
   font-size: 28rpx;
   align-self: flex-start;
 }
 
+.panel220{
+  margin: 50rpx 0 40rpx 40rpx;
+  align-self: start;
+}
+
 .panel22{
   width:100%;
   justify-content: flex-start;
   align-items: flex-start;
 }
 
-.panel221{
-  width:60rpx;
-  height:60rpx;
-  border-radius: 50%;
-  background-color: #F0F0F0;
-  margin-left: 40rpx;
-}
 .icon_sys_03{
   width:28rpx;
   height:26rpx;
+  margin-right: 16rpx;
 }
 
 
 .panel222{
-  width:580rpx;
-  margin-left: 30rpx;
+  width:630rpx;
+  margin-left: 85rpx;
   align-items: flex-start;
 }
 
 .panel2221{
   width:100%;
-  height:66rpx;
   justify-content: space-between;
 }
 
@@ -100,7 +193,7 @@
 }
 
 .line02{
-  width:540rpx;
+  width:580rpx;
   height:1rpx;
   background-color: #E3E3E3;
   margin: 30rpx 0 30rpx 0;

pages/main/docs.js

@@ -7,10 +7,14 @@ const app = getApp();
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
-    ArticleList:constant.arrArticleList,
+    IsShow:-1,
   },
   onLoad: function (options) {
     var that = this;
+    that.setData({
+      ArticleList:app.globalData.ArticleList,
+      IsShow:app.globalData.userInfo.IsShow,
+    });
     var id=options.ID;
     var arr=[];
     var title="";

pages/main/docs.wxml

@@ -1,23 +1,15 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{IsShow}}">
   <image bindtap="{{item.Fun}}" lazy-load="true"  data-url="{{item.Url}}" class="img" mode="widthFix" wx:for="{{ImageArr}}" wx:key="index" src="{{ImagePath}}web/_ScoreLine/{{item.Name}}"></image>
   <view class="panel2 FlexColumn">
-    <view class="text06">参考文章</view>
+    <view class="text06">最新快报</view>
     <view class="panel21 FlexColumn" >
-      <view class="panel211 FlexColumn" wx:for="{{ArticleList}}" wx:key="index" bindtap="redirectTo" data-url="docs?ID={{item.ID}}">
+      <view class="panel211 FlexRow" wx:for="{{ArticleList}}" wx:key="index" bindtap="goto" data-url="docs?ID={{item.ID}}" wx:if="{{item.Category!='小知识' && index<5}}">
         <view class="panel2111 FlexRow">
-          <view class="panel21111 FlexColumn">
-            <view class="panel211111 FlexRow">
-              <image wx:if="{{item.Logo}}" class="imgLogo2" src="../images/{{item.Logo}}"></image>
-              <view class="text08">{{item.Category}}</view>
-            </view>
-            <view class="text07">{{item.Title}}</view>
-          </view>
+          <image wx:if="{{item.Logo}}" class="imgLogo2" src="../images/{{item.Logo}}"></image>
+          <view class="text07">{{item.Title}}</view>
           <image wx:if="{{item.TitleImage}}" class="TitleImage" src="{{ImagePath}}web/_ScoreLine/{{item.TitleImage}}"></image>
         </view>
-        
-        <view class="line04"></view>
       </view>
-      
     </view>
     <view style="height:210rpx;"></view>
   </view>

pages/main/docs.wxss

@@ -2,15 +2,15 @@
   width:100%;
 }
 
-
 .panel2{
   width: 100%;
-  background-color: #f2f2f2;
+  margin-top: 30rpx;
+  background-color: #fff;
 }
 
 .text06{
   font-size: 36rpx;
-  margin: 60rpx 0 0 0;
+  margin: 80rpx 0 0 0;
   align-self: flex-start;
   margin-left:40rpx;
 }
@@ -20,49 +20,35 @@
 }
 .panel211{
   width: 100%;
-  margin-top: 30rpx;
+  height:140rpx;
 }
+
+
 .panel2111{
   width: 100%;
-  justify-content: space-between;
+  align-items: flex-start;
+  margin-top: 30rpx;
 }
 .panel21111{
-  width: 450rpx;
+  height:70rpx;
   align-items: flex-start;
 }
 
-.panel211111{  
-  margin-top: 16rpx;
+.imgLogo2{
+  width:24rpx;
+  height:29rpx;
 }
 
-.text08{
-  font-size: 20rpx;
-  color:#9B9B9B;
-  margin-left: 10rpx;
-  height:22rpx;
-}
 .text07{
-  margin-top: 17rpx;
   font-size:28rpx;
   font-weight: 400;
-  width:450rpx;
-}
-
-.line04{
-  width:670rpx;
-  height:1rpx;
-  background-color: #E3E3E3;
-  margin-top: 30rpx;
-}
-
-.imgLogo2{
-  width:24rpx;
-  height:22rpx;
+  width:410rpx;
+  margin: 0 40rpx 0 16rpx;
 }
 
 .TitleImage{
   width:160rpx;
-  height:84rpx;
+  height:80rpx;
   border:1rpx solid #E3E3E3;
   border-radius: 10rpx;
 }

pages/main/feedbackinfo.js

@@ -78,6 +78,8 @@ Page({
             param.ImageUrl3=arrResult[2].Target;
           if (arrResult.length>3)
             param.ImageUrl4=arrResult[3].Target;
+
+          param.FeedbackUrl=app.globalData.FeedbackUrl;
             
           main.postData('MPSFeedback', param, function (data) {
             wx.showModal({

pages/main/map.js

@@ -265,6 +265,7 @@ Page({
     });
   },
   goto: function (e) {
+    app.globalData.FeedbackUrl="map?id="+this.data.Info.ID+"&DistrictID="+this.data.DistrictID;
     main.goto(e);
   },
   copyUrl:function(e){

pages/main/school.js

@@ -18,6 +18,7 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
+    
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsShow:app.globalData.userInfo.IsShow,
@@ -25,6 +26,7 @@ Page({
       IsCollect:false,
       HasWish:false,
     });
+    
     if (!options.ID){
       wx.navigateBack({
         delta: 1,
@@ -96,10 +98,10 @@ Page({
         data.PersonCount1=0;
         data.PersonCount2=0;
         for(var i=0;i<that.data.ScoreType.length;i++){
-          if (data[that.data.ScoreType[i].Name] && data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-2].Total)
-            data.PersonCount1+=data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-2].Total;
-          if (data[that.data.ScoreType[i].Name] && data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-1].Total)
-            data.PersonCount2+=data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-1].Total;
+          if (data[that.data.ScoreType[i].Name] && data[that.data.ScoreType[i].Name][0] && data[that.data.ScoreType[i].Name][0].Total)
+            data.PersonCount1+=data[that.data.ScoreType[i].Name][0].Total;
+          if (data[that.data.ScoreType[i].Name] && data[that.data.ScoreType[i].Name][1] && data[that.data.ScoreType[i].Name][1].Total)
+            data.PersonCount2+=data[that.data.ScoreType[i].Name][1].Total;
         }
         
         
@@ -112,6 +114,8 @@ Page({
           TailScore:that.data.TailScore,
           Title:data.SchoolType1,
         });
+
+        that.checkListNull(that,list);
       }
       setTimeout(function(){
         wx.hideLoading();
@@ -138,7 +142,13 @@ Page({
     });
   },
   goto: function (e) {
-    main.goto(e);
+    if (e.currentTarget.dataset.url=="school?PageType=school&ID="
+     || e.currentTarget.dataset.url=="school?PageType=school&ID=0")
+      return null;
+    else{
+      app.globalData.FeedbackUrl="school?id="+this.data.Info.ID;
+      main.goto(e);
+    }
   },
   onSelect:function(event){
     var that=this;
@@ -154,22 +164,71 @@ Page({
         var list=[];
         if (that.data.Info[name])
           list=that.data.Info[name][that.data.YearIndex].List;
+        
         that.setData({
           ScoreTypeID: e.currentTarget.dataset.index+1,
           List:list,
         });
+        
+        that.checkListNull(that,list);
+        
       }
       else if (e.currentTarget.dataset.object=="Years"){
 
         var name=that.data.ScoreType[that.data.ScoreTypeID-1].Name;
-        var list=that.data.Info[name][e.currentTarget.dataset.index].List;
+        var list=[];
+        
+        if (e.currentTarget.dataset.index>0 && that.data.Info[name].length>e.currentTarget.dataset.index)
+          list = that.data.Info[name][e.currentTarget.dataset.index].List;
+        else if (e.currentTarget.dataset.index==0)
+          list = that.data.Info[name][e.currentTarget.dataset.index].List;
+
         that.setData({
           List:list,
           YearIndex:e.currentTarget.dataset.index
         });
+
+        that.checkListNull(that,list);
       }
     });   
   },
+
+  checkListNull:function(obj,list){
+    var that=obj;
+    if (list.length==0 
+      && that.data.YearIndex==0 
+      && that.data.ScoreTypeID==4){
+    
+      // wx.showModal({
+      //   title: '暂无公布',
+      //   showCancel:false,
+      //   content: '教育局暂未公布2024年1-15志愿信息，正式数据一般在7月公布，敬请期待。',
+      //   confirmText: '知道了',
+      //   complete: (res) => {
+      //     if (res.confirm) {
+      //       list=that.data.Info["1-15志愿"][1].List;
+      //       that.setData({
+      //         ScoreTypeID: 4,
+      //         YearIndex:1,
+      //         List:list,
+      //       });
+      //       var eventTemp={
+      //         currentTarget:{
+      //           dataset:{
+      //             object:"Years",
+      //             clicktype:"radio",
+      //             index:1,
+      //           }
+      //         }
+      //       }
+      //       main.onSelect(that,eventTemp,function(){});
+      //     }
+      //   }
+      // });
+      
+    }
+  },
+  
   onFold:function(e){
     var that=this;
     that.setData({
@@ -187,6 +246,9 @@ Page({
       }
     });
   },
+  gotoMiniprogram:function(){
+    main.gotoMiniprogram(185);
+  },
   returnTop:function(){
     main.returnTop();
   },

pages/main/school.wxml

@@ -105,7 +105,7 @@
   <view class="panelBasicCss panelMain FlexColumn" wx:if="{{Info.HasData}}">
     <block wx:if="{{Info['自主招生']}}">
       <view class="panelSchoolText20 FlexRow">
-        <view>招生计划{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}</view>
+        <view>招生计划{{Info['自主招生'][0].ScoreYear}}</view>
         <view class="panelSchoolText201 FlexRow">
           <view>总数</view>
           <view class="panelSchoolText2011">{{Info.PersonCount1}}</view>
@@ -115,24 +115,24 @@
         <view class="panelSchool311 FlexColumn" wx:for="{{ScoreType}}" wx:key="index">
           <view class="panelSchoolText04">{{item.Name}}</view>
           <image class="icon_sys_04" src="../images/{{item.Icon}}.png"></image>
-          <view class="panelSchoolText06" wx:if="{{Info[item.Name][Info[item.Name].length-2].Total}}">
-            {{Info[item.Name][Info[item.Name].length-2].Total}}
+          <view class="panelSchoolText06" wx:if="{{Info[item.Name][0].Total}}">
+            {{Info[item.Name][0].Total}}
           </view>
-          <view class="panelSchoolText061" wx:if="{{!Info[item.Name][Info[item.Name].length-2].Total}}">
+          <view class="panelSchoolText061" wx:if="{{!Info[item.Name][0].Total}}">
             无
           </view>
           <view class="panelSchool3111 FlexRow">
-            <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue>0}}"></image>
-            <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue<0}}"></image>
-            <view class="panelSchoolText090" wx:if="{{Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue>0}}">{{Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue}}</view>
-            <view class="panelSchoolText091" wx:if="{{Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue<0}}">{{-Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue}}</view>
-            <view class="panelSchoolText092" wx:if="{{Info[item.Name][Info[item.Name].length-1].TotalDifferenceValue==0}}">持平</view>
+            <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{Info[item.Name][1].TotalDifferenceValue>0}}"></image>
+            <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{Info[item.Name][1].TotalDifferenceValue<0}}"></image>
+            <view class="panelSchoolText090" wx:if="{{Info[item.Name][1].TotalDifferenceValue>0}}">{{Info[item.Name][1].TotalDifferenceValue}}</view>
+            <view class="panelSchoolText091" wx:if="{{Info[item.Name][1].TotalDifferenceValue<0}}">{{-Info[item.Name][1].TotalDifferenceValue}}</view>
+            <view class="panelSchoolText092" wx:if="{{Info[item.Name][1].TotalDifferenceValue==0}}">持平</view>
           </view>
         </view>
       </view>
       <view class="panelSchoolLine02"></view>
       <view class="panelSchoolText04 panelSchoolText10 FlexRow">
-        <view>{{Info['自主招生'][Info['自主招生'].length-1].ScoreYear}}年计划</view>
+        <view>{{Info['自主招生'][1].ScoreYear}}年计划</view>
         <view class="panelSchoolText201 FlexRow">
           <view>总数</view>
           <view class="panelSchoolText2011">{{Info.PersonCount2}}</view>
@@ -140,10 +140,10 @@
       </view>
       <view class="panelSchool31 FlexRow">
         <block wx:for="{{ScoreType}}" wx:key="index">
-          <view class="panelSchoolText11 panelSchoolText111" wx:if="{{Info[item.Name][Info[item.Name].length-1].Total}}">
-            {{Info[item.Name][Info[item.Name].length-1].Total}}
+          <view class="panelSchoolText11 panelSchoolText111" wx:if="{{Info[item.Name][1].Total}}">
+            {{Info[item.Name][1].Total}}
           </view>
-          <view class="panelSchoolText11 panelSchoolText111 panelSchoolText1111" wx:if="{{!Info[item.Name][Info[item.Name].length-1].Total}}">
+          <view class="panelSchoolText11 panelSchoolText111 panelSchoolText1111" wx:if="{{!Info[item.Name][1].Total}}">
             无
           </view>
         </block>
@@ -158,65 +158,65 @@
       <view wx:if="{{ScoreTypeID==1}}" class="panelSchoolIndependent FlexColumn">
         <view class="panelSchoolIndependent1 FlexRow">
           <view class="panelSchoolIndependentText1"></view>
-          <view class="panelSchoolText13 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年</view>
-          <view class="panelSchoolText13 ">{{Info['自主招生'][Info['自主招生'].length-1].ScoreYear}}年</view>
+          <view class="panelSchoolText13 panelSchoolText112">{{Info['自主招生'][0].ScoreYear}}年</view>
+          <view class="panelSchoolText13 ">{{Info['自主招生'][1].ScoreYear}}年</view>
         </view>
         <view class="panelLine"></view>
 
         <!-- 学科 -->
-        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[0].PlanNum}}">
+        <block wx:if="{{Info['自主招生'][0].List[0].PlanNum}}">
           <view class="panelSchoolIndependent1 FlexRow">
             <view class="panelSchoolIndependentText1 panelSchoolText13 panelSchoolText131 FlexColumn">
               <view>市实验示范性高中</view>
               <view>（学科优秀学生）</view>
             </view>
-            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[0].PlanNum}}</view>
-            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[0].PlanNum}}</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][0].List[0].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][1].List[0].PlanNum}}</view>
           </view>
           <view class="panelLine"></view>
         </block>
 
         <!-- 体育 -->
-        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[1].PlanNum}}">
+        <block wx:if="{{Info['自主招生'][0].List[1].PlanNum}}">
           <view class="panelSchoolIndependent1 FlexRow">
             <view class="panelSchoolIndependentText1 panelSchoolText13">市级优秀体育学生</view>
-            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[1].PlanNum}}</view>
-            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[1].PlanNum}}</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][0].List[1].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][1].List[1].PlanNum}}</view>
           </view>
           <view class="panelSchoolIndependent2 FlexColumn">
-            <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[1].SchoolTargetRemark2}}</text>
+            <text class="panelSchoolText16">{{Info['自主招生'][0].ScoreYear}}年项目\n{{Info['自主招生'][0].List[1].SchoolTargetRemark2}}</text>
           </view>
           <view class="panelLine"></view>
         </block>
 
         <!-- 艺术 -->
-        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[2].PlanNum}}">
+        <block wx:if="{{Info['自主招生'][0].List[2].PlanNum}}">
           <view class="panelSchoolIndependent1 FlexRow">
             <view class="panelSchoolIndependentText1 panelSchoolText13">市级艺术骨干学生</view>
-            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[2].PlanNum}}</view>
-            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[2].PlanNum}}</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][0].List[2].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][1].List[2].PlanNum}}</view>
           </view>
           <view class="panelSchoolIndependent2 FlexColumn">
-            <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[2].SchoolTargetRemark2}}</text>
+            <text class="panelSchoolText16">{{Info['自主招生'][0].ScoreYear}}年项目\n{{Info['自主招生'][0].List[2].SchoolTargetRemark2}}</text>
           </view>
           <view class="panelLine"></view>
         </block>
 
         <!-- 国际 -->
-        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[3].PlanNum || Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}">
+        <block wx:if="{{Info['自主招生'][0].List[3].PlanNum || Info['自主招生'][0].List[4].PlanNum}}">
           <view class="panelSchoolText13 panelSchoolIndependent4">国际课程班和中外合作办学高中</view>
           <view class="panelSchoolIndependent3 FlexRow">
             <view class="panelSchoolIndependentText2 panelSchoolText13">本市生源</view>
-            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[3].PlanNum}}</view>
-            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[3].PlanNum}}</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][0].List[3].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][1].List[3].PlanNum}}</view>
           </view>
           <view class="panelSchoolIndependent3 FlexRow">
             <view class="panelSchoolIndependentText2 panelSchoolText13">非本市生源</view>
             <view class="panelSchoolText11 panelSchoolText112">
-              <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}
+              <block wx:if="{{!Info['自主招生'][0].List[4].PlanNum}}">0</block>{{Info['自主招生'][0].List[4].PlanNum}}
             </view>
             <view class="panelSchoolText11 ">
-              <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}
+              <block wx:if="{{!Info['自主招生'][1].List[4].PlanNum}}">0</block>{{Info['自主招生'][1].List[4].PlanNum}}
             </view>
           </view>
           <view class="panelLine"></view>
@@ -233,7 +233,8 @@
       <view class="panelSchoolText17">名额分配综合评价录取志愿</view>
       <view class="panelSchoolText18">名额分配到本校</view>
     </block>
-
+    
+    
     <!-- 名额到区、名额到校、1-15志愿 -->
     <block wx:if="{{ScoreTypeID!=1 && Info[ScoreType[ScoreTypeID-1].Name]}}">
       <view class="panelTool1 panelTool1_1 FlexRow">
@@ -251,8 +252,11 @@
       </view>
 
       <view class="panelMarginTop panelLine"></view>
-
-      <template is="componentList" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:Info.SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull}}" />
+      
+      <!-- 有计划但没有出分数时使用 -->
+      <view class="panelTemp" wx:if="{{false}}">注意：以下是2025年招生计划数量+2024年最低分信息。教育局一般在7月公布2025年最低分信息，故此处配以2024年最低分以供参考。</view>
+    
+      <template is="componentList" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:Info.SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull,YearIndex:YearIndex}}" />
 
     </block>
 
@@ -269,6 +273,11 @@
     <view style="height:50rpx;"></view>
   </view>
 
+  <view class="panelAD FlexColumn" bindtap="gotoMiniprogram">
+    <view class="panelAD01">秒过其它产品介绍</view>
+    <image src="../images/ad_01.png" class="ad_01"></image>
+  </view>
+
   <view class="panelBasicCss FlexColumn" wx:if="{{Info.ImageOther}}">
     <view class="panelSchoolText08">校园风光</view>
     <view class="panelScrollView" bindtap="goto" data-url="imagelist?ID={{Info.ID}}&SchoolFullName={{Info.SchoolFullName}}&SchoolShortName={{Info.SchoolShortName}}&ImageOtherStr={{Info.ImageOtherStr}}">
@@ -295,18 +304,31 @@
   </view>
 
   <view class="panelBasicCss FlexColumn" wx:if="{{Info.SchoolType1=='高中'}}">
+    <view style="height:50rpx"></view>
+    <block wx:if="{{Info.AccommodationRemark}}">
+      <view class="panelSchoolText08 panelSchoolText084">住宿情况</view>
+      <text class="panelContent">{{Info.AccommodationRemark}}</text>
+    </block>
+    
+    <block wx:if="{{Info.Fees}}">
+      <view class="panelSchoolText08 panelSchoolText084">收费标准</view>
+      <text class="panelContent">{{Info.Fees}}</text>
+    </block>
+    
     <block wx:if="{{Info.SchoolType2Short=='区重点（特色）'}}">
       <view class="panelSchoolText082">特色高中办校重点</view>
-      <view class="panelSchoolText08 panelSchoolText083">美育特色</view>
+      <view class="panelSchoolText08 panelSchoolText084">美育特色</view>
       <text class="panelContent">{{Info.Introduction2}}</text>
       <view class="panelSchool22 FlexRow" bindtap="goto" data-url="docs?ID=2">
         <view>上海市19所特色高中情況汇总</view>
         <image class="icon_nextpage_4" src="../images/icon_nextpage_4.png"></image>
       </view>
-      <view class="panelLine"></view>
     </block>
+
+    <view class="panelLine panelLine02" wx:if="{{Info.SchoolType2Short=='区重点（特色）' || Info.AccommodationRemark || Info.Fees}}"></view>
     <view class="panelSchoolText081">
-      <block wx:if="{{Info.SchoolType2Short=='区重点（特色）'}}">更多</block>简介
+      <view class="panelSchoolText0811" wx:if="{{Info.SchoolType2Short=='区重点（特色）' || Info.AccommodationRemark || Info.Fees}}">更多</view>
+      <view class="panelSchoolText0811" wx:if="{{!(Info.SchoolType2Short=='区重点（特色）' || Info.AccommodationRemark || Info.Fees)}}">简介</view>
       <view class="panelFold FlexColumn" bindtap="onFold">
         <view class="panelFold1 FlexColumn">
           <image wx:if="{{!IsFold}}" class="icon_fold_04" src="../images/icon_fold_03.png"></image>
@@ -320,22 +342,44 @@
     </text>
   </view>
 
-  <view class="panelBasicCss panelSchool4 FlexColumn" wx:if="{{Info.Website || Info.ImageQRCode}}">
+  <view class="panelBasicCss panelSchool7 FlexColumn" wx:if="{{Info.Website || Info.ImageQRCode}}">
     <view class="panelSchool40 FlexRow">
       <view class="panelSchool41 FlexColumn">
-        <view class="panelSchool411" wx:if="{{Info.ImageQRCode}}">学校官媒</view>
-        <view class="panelSchool4110" wx:if="{{!Info.ImageQRCode}}">学校官媒</view>
+        <view class="panelSchool411" wx:if="{{Info.ImageQRCode}}">联系</view>
+        <view class="panelSchool4110" wx:if="{{!Info.ImageQRCode}}">联系</view>
         <view class="panelSchool412 FlexRow" wx:if="{{Info.Website}}" bindtap="copyUrl" data-url="{{Info.Website}}">
           <image class="icon_web_01" src="../images/icon_web_01.png"></image>
           <text user-select="true" class="panelSchoolText12">{{Info.WebsiteStr}}</text>
         </view>
-        <view class="panelSchool413 FlexRow" wx:if="{{Info.ImageQRCode}}">
-          <image class="icon_web_01" src="../images/icon_web_02.png"></image>
-          <text class="panelSchoolText13">长按二维码\n关注学校官方公众号</text>
+        <view class="FlexRow" wx:if="{{Info.ImageQRCode}}">
+          <image class="icon_web_02" src="../images/icon_web_02.png"></image>
+          <text class="panelSchoolText13">长按二维码关注学校公众号</text>
+        </view>
+        <view class="panelSchool413 FlexRow" wx:if="{{Info.Phone1 || Info.Phone2}}">
+          <image class="icon_web_02" src="../images/icon_web_03.png"></image>
+          <text class="panelSchoolText21">招生电话</text>
+        </view>
+        <view class="panelSchool413 FlexRow" style="margin-top: 10rpx;" wx:if="{{Info.Phone1 || Info.Phone2}}">
+          <view class="icon_web_02"></view>
+          <text class="panelSchoolText13">{{Info.Phone1}}</text>
+        </view>
+        <view class="panelSchool414 FlexRow" wx:if="{{Info.Phone2}}">
+          <view class="icon_web_02"></view>
+          <text class="panelSchoolText13">国际课程班</text>
         </view>
+        <view class="panelSchool413 FlexRow" style="margin-top: 10rpx;" wx:if="{{Info.Phone2}}">
+          <view class="icon_web_02"></view>
+          <text class="panelSchoolText13">{{Info.Phone2}}</text>
+        </view>
+        <view class="panelSchool413 FlexRow" wx:if="{{Info.ContactTime}}">
+          <view class="icon_web_02"></view>
+          <text class="panelSchoolText13" style="width:586rpx;">{{Info.ContactTime}}</text>
+        </view>
+        
       </view>
       <image wx:if="{{Info.ImageQRCode}}" show-menu-by-longpress="true" data-image="{{Info.ImageQRCode}}" class="panelSchoolQRCode" src="{{ImagePath}}web/_School/{{Info.ImageQRCode}}"></image>
     </view>
+    <view style="height:50rpx;"></view>
   </view>
 
   <view class="panelBasicCss FlexColumn" wx:if="{{Info.SchoolType1=='初中'}}">
@@ -358,6 +402,15 @@
     <view style="height: 20rpx;"></view>
   </view>
 
+  <!-- <view class="panelSchool8 FlexColumn" wx:if="{{false}}">
+    <view class="panelSchoolText14">2025年上海中招信息即将公布（5月底6月初左右），如欲即时了解，请点下面链接订阅更新，届时会在「服务通知」中提醒您。感谢支持！</view>
+    <view class="panelSchool81 FlexRow">
+      <image class="icon_sys_16.png" src="../images/icon_sys_16.png"></image>
+      <view>订阅2025年更新</view>
+    </view>
+    <view class="panelSchoolLine04"></view>
+  </view> -->
+
   <view  wx:if="{{IsShow}}" class="panelSchoolText14" catchtap="goto" data-url="feedbackinfo">
     本页内容来自学校官网、官方公众号、微博等网络资料的整理，整理过程中可能会有偏差，如您发现错误，欢迎协助<text class="panelSchoolText15">纠正</text>。
   </view>

pages/main/school.wxss

@@ -143,18 +143,31 @@
 .panelSchoolText081{
   width: 670rpx;
   align-self: start;
-  margin: 50rpx 0 40rpx 40rpx;
+  margin: 0 0 40rpx 40rpx;
   position: relative;
 }
+
+.panelLine02{
+  margin-bottom: 50rpx;
+}
+
+.panelSchoolText0811{
+  font-size:36rpx;
+}
+
 .panelSchoolText082{
   align-self: start;
-  margin: 50rpx 0 0 40rpx;
+  margin: 0 0 0 40rpx;
   color:#9B9B9B;
   font-size:20rpx;
 }
 .panelSchoolText083{
   margin: 4rpx 0 30rpx 40rpx;
 }
+.panelSchoolText084{
+  margin: 4rpx 0 30rpx 40rpx;
+  font-size:28rpx;
+}
 .panelSchool31{
   width: 100%;
 }
@@ -306,13 +319,20 @@
   justify-content: flex-start;
 }
 
+.panelSchool7{
+  justify-content: flex-start;
+  min-height: 350rpx;
+}
+
 .panelSchool40{
   width: 100%;
   justify-content: space-between;
+  align-items: flex-start;
 }
 .panelSchool41{
   align-items: flex-start;
   margin-left: 40rpx;
+  margin-top: 50rpx;
   font-weight: 700;
 }
 
@@ -331,25 +351,40 @@
 }
 
 .panelSchool412{
-  margin: 30rpx 0 20rpx 0;
+  margin: 40rpx 0 20rpx 0;
   align-items: flex-start;
 }
 
 .panelSchool413{
-  align-items: flex-start;
+  margin-top: 20rpx;
+}
+
+.panelSchool414{
+  margin-top: 20rpx;
+  font-size: 20rpx;
+  color: #9B9B9B;
+  font-weight: 700;
+}
+
+.panelSchoolText21{
+  font-size: 24rpx;
 }
 
 .icon_web_01{
-  margin-top: 6rpx;
+  width:24rpx;
+  height:30rpx;
+  margin-right: 20rpx;
+}
+.icon_web_02{
   width:24rpx;
   height:24rpx;
   margin-right: 20rpx;
 }
 
 .panelSchoolText12{
-  font-size: 28rpx;
-  font-family: 'Roboto-Black';
+  font-size: 24rpx;
   width:360rpx;
+  font-weight: 400;
 }
 .panelSchoolText13{
   font-size: 24rpx;
@@ -376,7 +411,9 @@
 .panelSchoolQRCode{
   width:200rpx;
   height:200rpx;
-  margin: 50rpx 40rpx 50rpx 0;
+  position: absolute;
+  top:100rpx;
+  right:30rpx;
 }
 
 .panelScrollView{
@@ -562,11 +599,6 @@
   font-weight: 400;
 }
 
-.icon_fold_05{
-  width:16rpx;
-  height:14rpx;
-  margin-right: 10rpx;
-}
 .panel11420{
   margin-bottom: 30rpx;
 }
@@ -703,4 +735,52 @@
   width:670rpx;
   text-align: center;
   line-height: 110rpx;
-}
+}
+
+
+.panelAd{
+  width:100%;
+}
+
+.panelAD01{
+  font-size:20rpx;
+  color:#787878;
+  width:690rpx;
+  margin-top: 30rpx;
+}
+
+.ad_01{
+  width:710rpx;
+  height:400rpx;
+  margin-top: 20rpx;
+}
+
+.panelTemp{
+  width:650rpx;
+  margin: 30rpx 0 0 0;
+  font-size: 24rpx;
+}
+
+.panelSchool81{
+  width:500rpx;
+  height: 70rpx;
+  border-radius: 10rpx;
+  border:3rpx solid #EB5C28;
+  background-color: #FCE9E3;
+  color:#EB5C28;
+  font-size:28rpx;
+  margin-top: 30rpx;
+}
+
+.icon_sys_16{
+  width:24rpx;
+  height:24rpx;
+  margin-right: 10rpx;
+}
+
+.panelSchoolLine04{
+  width:630rpx;
+  height: 1rpx;
+  margin: 100rpx 0 -30rpx 0;
+  background-color: #d2d2d2;  
+}

pages/main/scoreline.js

@@ -169,16 +169,35 @@ Page({
           if (data.length==0 && that.data.SchoolCount>0)
             isContrastNull=true;
   
-          that.setData({
-            Accommodation:constant.arrAccommodation,
-            List:data,
-            IsSearch:false,
-            IsListAll:isListAll,
-            TailScore:that.data.TailScore,
-            PageCount:pageCount,
-            PageFilterCount:data.length,
-            ContrastNull:isContrastNull,
-          });
+          if (data.length>0){
+          
+            that.setData({
+              Accommodation:constant.arrAccommodation,
+              List:data,
+              IsSearch:false,
+              IsListAll:isListAll,
+              TailScore:that.data.TailScore,
+              PageCount:pageCount,
+              PageFilterCount:data.length,
+              ContrastNull:isContrastNull,
+            });
+          }
+          else{
+            // wx.showModal({
+            //   title: '暂无公布',
+            //   showCancel:false,
+            //   content: '教育局暂未公布2024年1-15志愿信息，正式数据一般在7月公布，敬请期待。',
+            //   confirmText: '知道了',
+            //   complete: (res) => {
+            //     if (res.confirm) {
+            //       wx.redirectTo({
+            //         url: 'scoreline?PageType='+that.data.PageType+'&SchoolType1='+that.data.SchoolType1+'&ScoreTypeID='+that.data.ScoreTypeID+'&DistrictID='+that.data.DistrictID+"&YearIndex=1",
+            //       });
+            //     }
+            //   }
+            // })
+            
+          }
   
         }
 
@@ -370,6 +389,7 @@ Page({
   },
   showSearch:function(){
     var that=this;
+    app.globalData.TempParam=that.data.PageCount;
     that.setData({
       IsSearch:true,
       IsFocus:true,
@@ -383,6 +403,7 @@ Page({
       IsFocus:false,
       SearchNull:false,
       ContrastNull:false,
+      PageCount:app.globalData.TempParam,
     });
   },
   clearInput2:function(){
@@ -391,6 +412,7 @@ Page({
     that.setData({
       IsSearch:true,
       IsFocus:true,
+      PageCount:app.globalData.TempParam,
     });
   },
   bindKeyInput:function(e){
@@ -398,6 +420,7 @@ Page({
     var that=this;
     var isNull=true;
     var count=0;
+    //debugger;
     for(var i=0;i<that.data.List.length;i++){
       var item=that.data.List[i];
       if (inputValue){
@@ -414,16 +437,24 @@ Page({
         count++;
       }
     }
-    
+    console.log("pagecount:"+that.data.PageCount);
     that.setData({
       List:that.data.List,
       SearchNull:isNull,
       InputValue:inputValue,
       PageFilterCount:count,
+      PageCount:10000,
     });
   },
   goto: function (e) {
-    main.goto(e);
+    if (e.currentTarget.dataset.url=="school?PageType=scoreline&ID="
+     || e.currentTarget.dataset.url=="school?PageType=scoreline&ID=0")
+      return null;
+    else{
+      app.globalData.FeedbackUrl="scoreline?PageType="+this.data.PageType+"&ScoreTypeID="+this.data.ScoreTypeID+"&DistrictID="+this.data.DistrictID;
+      
+      main.goto(e);
+    }
   },
   returnTop:function(){
     main.returnTop();

pages/main/scoreline.wxml

@@ -62,7 +62,10 @@
         </view>
       </view>
     </view>
-
+    
+    <!-- 有计划但没有出分数时使用 -->
+    <view class="panelTemp" wx:if="{{false}}">注意：以下是2025年招生计划数量+2024年最低分信息。教育局一般在7月公布2025年最低分信息，故此处配以2024年最低分以供参考。</view>
+    
     <view class="panelBasicCss panelScore FlexColumn" >
       <view style="height:20rpx"></view>
       <!-- 名额到校 -->
@@ -95,8 +98,8 @@
         <view class="panelRadio1 radio2 panelRadio1{{item.CSS}}" wx:for="{{LocalOrNolocal}}" wx:key="index"
         bindtap="onSelect" data-object="LocalOrNolocal" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
       </view>
-      
-      <template is="componentList" wx:if="{{!(IsSearch && !InputValue)}}" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull,PageCount:PageCount,PageFilterCount:PageFilterCount,ContrastNull:ContrastNull}}" />
+
+      <template is="componentList" wx:if="{{!(IsSearch && !InputValue)}}" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull,PageCount:PageCount,PageFilterCount:PageFilterCount,ContrastNull:ContrastNull,YearIndex:YearIndex}}" />
       
       <view style="height: 50rpx;"></view>
     </view>
@@ -133,7 +136,7 @@
         <view class="panelFooterBottom">转发</view>
       </button>
     </view>
-    <view  wx:if="{{IsShow}}" class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedbackinfo">
+    <view  wx:if="{{IsShow}}" class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedbackinfo?type=scoreline&id={{Info.ID}}">
       <view class="panelFooterLine panelFooterBottom" wx:if="{{PageType=='scoreline'}}"></view>
       <view class="panelFooterBottom panelFooter21">纠错</view>
     </view>

pages/main/scoreline.wxss

@@ -222,4 +222,11 @@
 .panelRecruitmentTest03{
   font-size:32rpx; 
   font-family: 'Roboto-Black';
+}
+
+.panelTemp{
+  width:650rpx;
+  margin: 30rpx 0 0 0;
+  font-size: 24rpx;
+  color: #787878;
 }

pages/template/componentList.wxml

@@ -1,4 +1,26 @@
 <template name="componentList">
+  <!-- 有计划但没有出分数时使用 -->
+  <block wx:if="{{false}}">
+    <!-- 显示全部表头 -->
+    <view class="panelScoreHeader0 panelScoreHeader FlexRow" wx:if="{{IsListAll}}">
+      <view class="panelScoreHeaderTd1"></view>
+      <view class="panelScoreHeaderTd2">24年计划</view>
+      <view class="panelScoreHeaderTd3" style="text-align: right;">23年最低分</view>
+      <view class="panelScoreHeaderTd4"><view class="MarginLeft30">语数外</view></view>
+      <view class="panelScoreHeaderTd5">数学</view>
+      <view class="panelScoreHeaderTd5">语文</view>
+      <view class="panelScoreHeaderTd5">综合</view>
+    </view>
+    
+    <!-- 显示大字表头 -->
+    <view class="panelScoreHeader FlexRow" wx:if="{{!IsListAll}}">
+      <view class="panelScoreHeaderTd6"></view>
+      <view class="panelScoreHeaderTd7">24年计划</view>
+      <view class="panelScoreHeaderTd8">23年最低分</view>
+    </view>
+  </block>
+  <!-- 有计划有出分数时使用 -->
+  <block wx:if="{{true}}">
     <!-- 显示全部表头 -->
     <view class="panelScoreHeader FlexRow" wx:if="{{IsListAll}}">
       <view class="panelScoreHeaderTd1"></view>
@@ -16,178 +38,178 @@
       <view class="panelScoreHeaderTd7">计划</view>
       <view class="panelScoreHeaderTd8">最低分</view>
     </view>
+  </block>
+    
+  <block wx:if="{{!ContrastNull}}">
 
+    <block wx:for="{{List}}" wx:key="index">
     
-    <block wx:if="{{!ContrastNull}}">
+      <!-- 名额到校校名，收藏学校 -->
+      <block wx:if="{{PageType=='scoreline' && ScoreTypeID==3  && item.IsCollect && item.SchoolOfGraduationTemp!=item.SchoolOfGraduation && ((IsSearch && item.IsSearchResult) || !IsSearch)}}" >
+        
+        <view class="panelLine"></view>
+        
+        <view class="panelScoreJuniorCollect FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.SchoolOfGraduation}}">
+          <view class="panelScoreJuniorCollectText">{{item.SchoolFullNameJunior}}</view>
+        </view>
+      </block>
+      <!-- 名额到校校名，普通学校 -->
+      <block wx:if="{{PageType=='scoreline' && ScoreTypeID==3 && !item.IsCollect && item.SchoolOfGraduationTemp!=item.SchoolOfGraduation && ((IsSearch && item.IsSearchResult) || !IsSearch)}}" >
+        
+        <view hidden="{{index>PageCount}}" wx:if="{{index==0}}" class="panelLine"></view>
+        
+        <view hidden="{{index>PageCount}}" class="panelScoreJunior FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.SchoolOfGraduation}}">
+          <view class="panelScoreJunior1"></view>
+          <view class="panelScoreJuniorText">{{item.SchoolFullNameJunior}}</view>
+        </view>
+      </block>
 
-      <block wx:for="{{List}}" wx:key="index">
+      <!-- 名额到校校名，学校主页 -->
+      <block wx:if="{{PageType=='school' && ScoreTypeID==3 && SchoolType1=='高中' && item.DistrictNameTemp!=item.DistrictName}}">
+        <view class="panelLine" wx:if="{{index==0}}"></view>
+        <view class="panelScoreJuniorCollect panelScoreSchoolType FlexRow">
+          <view class="panelScoreJuniorCollectText">{{item.DistrictName}}</view>
+        </view>
+      </block>
       
-        <!-- 名额到校校名，收藏学校 -->
-        <block wx:if="{{PageType=='scoreline' && ScoreTypeID==3  && item.IsCollect && item.SchoolOfGraduationTemp!=item.SchoolOfGraduation && ((IsSearch && item.IsSearchResult) || !IsSearch)}}" >
-          
-          <view class="panelLine"></view>
-          
-          <view class="panelScoreJuniorCollect FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.SchoolOfGraduation}}">
-            <view class="panelScoreJuniorCollectText">{{item.SchoolFullNameJunior}}</view>
-          </view>
-        </block>
-        <!-- 名额到校校名，普通学校 -->
-        <block wx:if="{{PageType=='scoreline' && ScoreTypeID==3 && !item.IsCollect && item.SchoolOfGraduationTemp!=item.SchoolOfGraduation && ((IsSearch && item.IsSearchResult) || !IsSearch)}}" >
-          
-          <view hidden="{{index>PageCount}}" wx:if="{{index==0}}" class="panelLine"></view>
-          
-          <view hidden="{{index>PageCount}}" class="panelScoreJunior FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.SchoolOfGraduation}}">
+      <!-- 1-15志愿，学校性质 -->
+      <block wx:if="{{PageType=='scoreline' && ScoreTypeID==4 && item.SchoolType2ShortIDTemp!=item.SchoolType2ShortID && !SearchNull}}">
+        <view class="panelLine" wx:if="{{index==0}}"></view>
+        <view class="panelScoreJuniorCollect panelScoreSchoolType FlexRow" >
+          <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==1}}">市实验性示范性高中</view>
+          <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==2}}">市特色普通高中</view>
+          <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==3}}">区实验性示范性高中</view>
+          <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==4}}">一般高中</view>
+        </view>
+      </block>
+      
+      <!-- 收藏高中 -->
+      <block wx:if="{{PageType=='collect' && item.TempID!=item.ID}}" >
+        <view class="panelLine" wx:if="{{index==0}}"></view>
+      
+        <view class="panelScoreJunior panelScoreJunior00 FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.ID}}">
+          <view class="panelScoreJunior0 FlexRow">
             <view class="panelScoreJunior1"></view>
-            <view class="panelScoreJuniorText">{{item.SchoolFullNameJunior}}</view>
+            <view class="panelScoreJuniorText panelScoreJuniorText0">{{item.SchoolFullName}}</view>
           </view>
-        </block>
-
-        <!-- 名额到校校名，学校主页 -->
-        <block wx:if="{{PageType=='school' && ScoreTypeID==3 && SchoolType1=='高中' && item.DistrictNameTemp!=item.DistrictName}}">
-          <view class="panelLine" wx:if="{{index==0}}"></view>
-          <view class="panelScoreJuniorCollect panelScoreSchoolType FlexRow">
-            <view class="panelScoreJuniorCollectText">{{item.DistrictName}}</view>
+          <view class="panelScoreJunior2 FlexRow">
+            {{item.District}} <block wx:if="{{SchoolType1=='高中'}}">{{item.SchoolType2Short}} <view class="panelLine2" wx:if="{{item.PublicOrPrivate}}"></view> {{item.PublicOrPrivate}}</block>
           </view>
-        </block>
-        
-        <!-- 1-15志愿，学校性质 -->
-        <block wx:if="{{PageType=='scoreline' && ScoreTypeID==4 && item.SchoolType2ShortIDTemp!=item.SchoolType2ShortID && !SearchNull}}">
-          <view class="panelLine" wx:if="{{index==0}}"></view>
-          <view class="panelScoreJuniorCollect panelScoreSchoolType FlexRow" >
-            <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==1}}">市实验性示范性高中</view>
-            <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==2}}">市特色普通高中</view>
-            <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==3}}">区实验性示范性高中</view>
-            <view class="panelScoreJuniorCollectText" wx:if="{{item.SchoolType2ShortID==4}}">一般高中</view>
-          </view>
-        </block>
-        
-        <!-- 收藏高中 -->
-        <block wx:if="{{PageType=='collect' && item.TempID!=item.ID}}" >
-          <view class="panelLine" wx:if="{{index==0}}"></view>
-        
-          <view class="panelScoreJunior panelScoreJunior00 FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.ID}}">
-            <view class="panelScoreJunior0 FlexRow">
-              <view class="panelScoreJunior1"></view>
-              <view class="panelScoreJuniorText panelScoreJuniorText0">{{item.SchoolFullName}}</view>
-            </view>
-            <view class="panelScoreJunior2 FlexRow">
-              {{item.District}} <block wx:if="{{SchoolType1=='高中'}}">{{item.SchoolType2Short}} <view class="panelLine2" wx:if="{{item.PublicOrPrivate}}"></view> {{item.PublicOrPrivate}}</block>
-            </view>
-          </view>
-        </block>
+        </view>
+      </block>
 
-        <!-- 自主招生 -->
-        <block wx:if="{{item.Name=='自主招生'}}" >
-          <view style="height:30rpx;" wx:if="{{item.ID==item.TempID}}"></view>
-          <view class="panelRecruitment FlexRow">
-            <text class="panelRecruitmentTest01">本校有自主招生计划\n<text class="panelRecruitmentTest02">面向全市招收，本区学生可报</text></text>
-            <view class="panelRecruitment1 FlexRow">
-              <view class="panelRecruitmentTest03">{{item.PlanNum}}</view>
-              <view>（全市总数，不含艺体）</view>
-            </view>
+      <!-- 自主招生 -->
+      <block wx:if="{{item.Name=='自主招生'}}" >
+        <view style="height:30rpx;" wx:if="{{item.ID==item.TempID}}"></view>
+        <view class="panelRecruitment FlexRow">
+          <text class="panelRecruitmentTest01">本校有自主招生计划\n<text class="panelRecruitmentTest02">面向全市招收，本区学生可报</text></text>
+          <view class="panelRecruitment1 FlexRow">
+            <view class="panelRecruitmentTest03">{{item.PlanNum}}</view>
+            <view>（全市总数，不含艺体）</view>
           </view>
-          <view style="height: 30rpx;"></view>
-          <view class="panelLine"></view>
-        </block>
+        </view>
+        <view style="height: 30rpx;"></view>
+        <view class="panelLine"></view>
+      </block>
 
-        <!-- 显示全部列表 -->
-        <view class="panelScoreItem FlexColumn" hidden="{{index>PageCount}}" 
-        wx:if="{{IsListAll && item.IsAccommodation && item.IsPublicOrPrivate && item.IsLocalOrNolocal && item.IsSearchResult && item.Name!='自主招生'}}" 
-        bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.ID}}">
-          
-          <view class="panelLine" wx:if="{{ScoreTypeID==2 && index==0}}"></view>
-          <view class="panelLine" wx:if="{{PageType=='school' && (ScoreTypeID==2 || ScoreTypeID==4) && index==0}}"></view>
+      <!-- 显示全部列表 -->
+      <view class="panelScoreItem FlexColumn" hidden="{{index>PageCount}}" 
+      wx:if="{{IsListAll && item.IsAccommodation && item.IsPublicOrPrivate && item.IsLocalOrNolocal && item.IsSearchResult && item.Name!='自主招生'}}" 
+      bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.ID}}">
+        
+        <view class="panelLine" wx:if="{{ScoreTypeID==2 && index==0}}"></view>
+        <view class="panelLine" wx:if="{{PageType=='school' && (ScoreTypeID==2 || ScoreTypeID==4) && index==0}}"></view>
 
-          <view class="panelScoreItem1 FlexRow">
-            <view class="panelScoreItem11 FlexColumn">
-              <text class="panelScoreText01">{{item.Name}}</text>
-              <view class="panelScoreText02" wx:if="{{(ScoreTypeID==2 || ScoreTypeID==4) && item.DistrictName}}">{{item.DistrictName}}</view>
-              <view class="panelScoreText02" wx:if="{{ScoreTypeID==4 && item.SchoolTargetRemark}}">{{item.SchoolTargetRemark}}</view>
+        <view class="panelScoreItem1 FlexRow">
+          <view class="panelScoreItem11 FlexColumn">
+            <text class="panelScoreText01">{{item.Name}}</text>
+            <view class="panelScoreText02" wx:if="{{(ScoreTypeID==2 || ScoreTypeID==4) && item.DistrictName}}">{{item.DistrictName}}</view>
+            <view class="panelScoreText02" wx:if="{{ScoreTypeID==4 && item.SchoolTargetRemark}}">{{item.SchoolTargetRemark}}</view>
+          </view>
+          <view class="panelScoreItem12 FlexRow" style="height:{{item.Height}}rpx;">
+            <view class="panelScoreItem120 FlexRow">
+              <view class="panelScoreNumber01" wx:if="{{item.PlanNum>=0}}">{{item.PlanNum}}</view>
+              <view class="panelScoreNumber01Null" wx:if="{{item.PlanNum==-999}}">未知</view>
             </view>
-            <view class="panelScoreItem12 FlexRow" style="height:{{item.Height}}rpx;">
-              <view class="panelScoreItem120 FlexRow">
-                <view class="panelScoreNumber01" wx:if="{{item.PlanNum>=0}}">{{item.PlanNum}}</view>
-                <view class="panelScoreNumber01Null" wx:if="{{item.PlanNum==-999}}">未知</view>
-              </view>
-              <view class="panelScoreItem1200 FlexRow">
-                <view class="panelScoreNumber01" wx:if="{{item.ScoreTotal}}">{{item.ScoreTotal}}</view>
-              </view>
+            <view class="panelScoreItem1200 FlexRow">
+              <view class="panelScoreNumber01" wx:if="{{item.ScoreTotal}}">{{item.ScoreTotal}}</view>
             </view>
-            <view class="panelScoreNumber04" wx:if="{{item.Score1}}"><view class="MarginLeft30">{{item.Score1}}</view></view>
-            <view class="panelScoreNumber04 panelScoreNumber04Null" wx:if="{{!item.Score1 && item.ScoreTotal}}"><view class="MarginLeft30">未知</view></view>
-            <view class="panelScoreNumber05" wx:if="{{item.Score2 && item.ScoreTotal}}">{{item.Score2}}</view>
-            <view class="panelScoreNumber05 panelScoreNumber04Null" wx:if="{{!item.Score2 && item.ScoreTotal}}">未知</view>
-            <view class="panelScoreNumber05" wx:if="{{item.Score3 && item.ScoreTotal}}">{{item.Score3}}</view>
-            <view class="panelScoreNumber05 panelScoreNumber04Null" wx:if="{{!item.Score3 && item.ScoreTotal}}">未知</view>
-            <view class="panelScoreNumber05" wx:if="{{item.Score4 && item.ScoreTotal}}">{{item.Score4}}</view>
-            <view class="panelScoreNumber05 panelScoreNumber04Null" wx:if="{{!item.Score4 && item.ScoreTotal}}">未知</view>
-            
           </view>
+          <view class="panelScoreNumber04" wx:if="{{item.Score1}}"><view class="MarginLeft30">{{item.Score1}}</view></view>
+          <view class="panelScoreNumber04 panelScoreNumber04Null" wx:if="{{!item.Score1 && item.ScoreTotal}}"><view class="MarginLeft30">未知</view></view>
+          <view class="panelScoreNumber05" wx:if="{{item.Score2 && item.ScoreTotal}}">{{item.Score2}}</view>
+          <view class="panelScoreNumber05 panelScoreNumber04Null" wx:if="{{!item.Score2 && item.ScoreTotal}}">未知</view>
+          <view class="panelScoreNumber05" wx:if="{{item.Score3 && item.ScoreTotal}}">{{item.Score3}}</view>
+          <view class="panelScoreNumber05 panelScoreNumber04Null" wx:if="{{!item.Score3 && item.ScoreTotal}}">未知</view>
+          <view class="panelScoreNumber05" wx:if="{{item.Score4 && item.ScoreTotal}}">{{item.Score4}}</view>
+          <view class="panelScoreNumber05 panelScoreNumber04Null" wx:if="{{!item.Score4 && item.ScoreTotal}}">未知</view>
+          
         </view>
+      </view>
 
-        <!-- 显示大字列表 -->
-        <view class="panelScoreItem FlexColumn" hidden="{{index>PageCount}}"  wx:if="{{!IsListAll && item.IsAccommodation && item.IsPublicOrPrivate && item.IsLocalOrNolocal && item.IsSearchResult && item.Name!='自主招生'}}"
-        bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.ID}}">
-          
-          <view class="panelLine" wx:if="{{PageType=='scoreline' && ScoreTypeID==2 && index==0}}"></view>
-          <view class="panelLine" wx:if="{{PageType=='school' && (ScoreTypeID==2 || ScoreTypeID==4) && index==0}}"></view>
+      <!-- 显示大字列表 -->
+      <view class="panelScoreItem FlexColumn" hidden="{{index>PageCount}}"  wx:if="{{!IsListAll && item.IsAccommodation && item.IsPublicOrPrivate && item.IsLocalOrNolocal && item.IsSearchResult && item.Name!='自主招生'}}"
+      bindtap="goto" data-url="school?PageType={{PageType}}&ID={{item.ID}}">
+        
+        <view class="panelLine" wx:if="{{PageType=='scoreline' && ScoreTypeID==2 && index==0}}"></view>
+        <view class="panelLine" wx:if="{{PageType=='school' && (ScoreTypeID==2 || ScoreTypeID==4) && index==0}}"></view>
+        
+        <view class="panelScoreItem1 FlexRow">
+          <view class="panelScoreItem13 FlexColumn">
+            <text class="panelScoreText01">{{item.Name}}</text>
+            <view class="panelScoreText02" wx:if="{{(ScoreTypeID==2 || ScoreTypeID==4) && item.DistrictName}}">{{item.DistrictName}}</view>
+            <view class="panelScoreText02" wx:if="{{ScoreTypeID==4 && item.SchoolTargetRemark}}">{{item.SchoolTargetRemark}}</view>
+          </view>
+          <view class="panelScoreItem14 FlexRow" style="height:{{item.Height}}rpx;">
+            <view class="panelScoreNumber06" wx:if="{{item.PlanNum>=0}}">{{item.PlanNum}}</view>
+            <view class="panelScoreNumber06Null" wx:if="{{item.PlanNum==-999}}">未知</view>
           
-          <view class="panelScoreItem1 FlexRow">
-            <view class="panelScoreItem13 FlexColumn">
-              <text class="panelScoreText01">{{item.Name}}</text>
-              <view class="panelScoreText02" wx:if="{{(ScoreTypeID==2 || ScoreTypeID==4) && item.DistrictName}}">{{item.DistrictName}}</view>
-              <view class="panelScoreText02" wx:if="{{ScoreTypeID==4 && item.SchoolTargetRemark}}">{{item.SchoolTargetRemark}}</view>
-            </view>
-            <view class="panelScoreItem14 FlexRow" style="height:{{item.Height}}rpx;">
-              <view class="panelScoreNumber06" wx:if="{{item.PlanNum>=0}}">{{item.PlanNum}}</view>
-              <view class="panelScoreNumber06Null" wx:if="{{item.PlanNum==-999}}">未知</view>
-            
-              <view class="panelScoreItem121 FlexRow" wx:if="{{item.PlanNumDifferenceValue!==null}}">
-                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item.PlanNumDifferenceValue>0}}"></image>
-                <view class="panelScoreNumber02" wx:if="{{item.PlanNumDifferenceValue>0}}">{{item.PlanNumDifferenceValue}}</view>
-                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.PlanNumDifferenceValue<0}}"></image>
-                <view class="panelScoreNumber03" wx:if="{{item.PlanNumDifferenceValue<0}}">{{-item.PlanNumDifferenceValue}}</view>
-                <view class="panelScoreText04" wx:if="{{item.PlanNumDifferenceValue==0}}">平</view>
-              </view>
-            </view>
-            <view class="panelScoreItem15 FlexRow">
-              <view class="panelScoreNumber06">{{item.ScoreTotal}}</view>
-              <view class="panelScoreItem121 FlexRow" wx:if="{{item.ScoreTotalDifferenceValue!==null}}">
-                <image class="icon_up_01" src="../images/icon_up_01.png"  wx:if="{{item.ScoreTotalDifferenceValue>0}}"></image>
-                <view class="panelScoreNumber02" wx:if="{{item.ScoreTotalDifferenceValue>0}}">{{item.ScoreTotalDifferenceValue}}</view>
-                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.ScoreTotalDifferenceValue<0}}"></image>
-                <view class="panelScoreNumber03" wx:if="{{item.ScoreTotalDifferenceValue<0}}">{{-item.ScoreTotalDifferenceValue}}</view>
-                <view class="panelScoreText04" wx:if="{{item.ScoreTotalDifferenceValue==0}}">平</view>
-            </view>
+            <view class="panelScoreItem121 FlexRow" wx:if="{{item.PlanNumDifferenceValue!==null}}">
+              <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item.PlanNumDifferenceValue>0}}"></image>
+              <view class="panelScoreNumber02" wx:if="{{item.PlanNumDifferenceValue>0}}">{{item.PlanNumDifferenceValue}}</view>
+              <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.PlanNumDifferenceValue<0}}"></image>
+              <view class="panelScoreNumber03" wx:if="{{item.PlanNumDifferenceValue<0}}">{{-item.PlanNumDifferenceValue}}</view>
+              <view class="panelScoreText04" wx:if="{{item.PlanNumDifferenceValue==0}}">平</view>
             </view>
           </view>
+          <view class="panelScoreItem15 FlexRow">
+            <view class="panelScoreNumber06">{{item.ScoreTotal}}</view>
+            <view class="panelScoreItem121 FlexRow" wx:if="{{item.ScoreTotalDifferenceValue!==null}}">
+              <image class="icon_up_01" src="../images/icon_up_01.png"  wx:if="{{item.ScoreTotalDifferenceValue>0}}"></image>
+              <view class="panelScoreNumber02" wx:if="{{item.ScoreTotalDifferenceValue>0}}">{{item.ScoreTotalDifferenceValue}}</view>
+              <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item.ScoreTotalDifferenceValue<0}}"></image>
+              <view class="panelScoreNumber03" wx:if="{{item.ScoreTotalDifferenceValue<0}}">{{-item.ScoreTotalDifferenceValue}}</view>
+              <view class="panelScoreText04" wx:if="{{item.ScoreTotalDifferenceValue==0}}">平</view>
+          </view>
+          </view>
         </view>
-      </block>
-
-      <view bindtap="onPage" class="panelPage FlexRow" wx:if="{{(List.length>PageCount && PageFilterCount>PageCount) && !SearchNull}}">
-        <view class="panelPage1">查看更多</view>
-        <view class="panelFold1 FlexColumn">
-          <image class="icon_fold_04" src="../images/icon_fold_03.png"></image>
-        </view>
-      </view>
-      
-      <view class="panelDataRemark FlexColumn" wx:if="{{List.length>0 && !SearchNull}}">
-        <view class="panelDataRemark1">数据表中的特殊情况的说明：</view>
-        <text class="panelDataRemark2">未知，表示官网未公布或没能采集到。\n没有最低分（含分科分数），表示该学校在最低投档控制线上无考生录取，故没有分数。</text>
       </view>
-
-      <block wx:if="{{SearchNull}}">
-        <view class="panelLine"></view>
-        <image class="icon_sys_121" src="../images/icon_sys_12.png"></image>
-        <view class="text02">没有内容</view>
-        <view class="text03"></view>
-      </block>
     </block>
 
-    <block wx:if="{{ContrastNull}}">
+    <view bindtap="onPage" class="panelPage FlexRow" wx:if="{{(List.length>PageCount && PageFilterCount>PageCount) && !SearchNull}}">
+      <view class="panelPage1">查看更多</view>
+      <view class="panelFold1 FlexColumn">
+        <image class="icon_fold_04" src="../images/icon_fold_03.png"></image>
+      </view>
+    </view>
+    
+    <view class="panelDataRemark FlexColumn" wx:if="{{List.length>0 && !SearchNull}}">
+      <view class="panelDataRemark1">数据表中的特殊情况的说明：</view>
+      <text class="panelDataRemark2">未知，表示官网未公布或没能采集到。\n没有最低分（含分科分数），表示该学校在最低投档控制线上无考生录取，故没有分数。</text>
+    </view>
+
+    <block wx:if="{{SearchNull}}">
       <view class="panelLine"></view>
       <image class="icon_sys_121" src="../images/icon_sys_12.png"></image>
-      <view class="text02">在本区无计划</view>
+      <view class="text02">没有内容</view>
       <view class="text03"></view>
     </block>
+  </block>
+
+  <block wx:if="{{ContrastNull}}">
+    <view class="panelLine"></view>
+    <image class="icon_sys_121" src="../images/icon_sys_12.png"></image>
+    <view class="text02">在本区无计划</view>
+    <view class="text03"></view>
+  </block>
 </template>

utils/constant.js

@@ -1,8 +1,11 @@
 module.exports = {
   arrYear: [{
-      Name: "2023",
-      CSS: "Selected"
-    },
+    Name: "2024",
+    CSS: "Selected"
+  },{
+    Name: "2023",
+    CSS: ""
+  },
     {
       Name: "2022",
       CSS: ""
@@ -226,447 +229,6 @@ module.exports = {
       Count: "8"
     },
   ],
-  arrArticleList: [
-    {
-      ID: 10,
-      Category: "信息整理",
-      Logo: "icon_sys_01.png",
-      Title: "2024年上海闵行、宝山、浦东、松江、青浦5区共新增15所高中介绍",
-      TitleShort: "上海中招分数线等信息查询",
-      TitleImage: "doc_1000.png",
-      Content: [{
-          Name: "doc_1001.png"
-        },
-        {
-          Name: "doc_1002.png",
-          Fun: "goto",
-          Url: "school?ID=849"
-        },
-        {
-          Name: "doc_1003.png",
-          Fun: "goto",
-          Url: "school?ID=850"
-        },
-        {
-          Name: "doc_1004.png",
-          Fun: "goto",
-          Url: "school?ID=851"
-        },
-        {
-          Name: "doc_1005.png",
-          Fun: "goto",
-          Url: "school?ID=852"
-        },
-        {
-          Name: "doc_1006.png",
-          Fun: "goto",
-          Url: "school?ID=853"
-        },
-        {
-          Name: "doc_1007.png",
-          Fun: "goto",
-          Url: "school?ID=854"
-        },
-        {
-          Name: "doc_1008.png",
-          Fun: "goto",
-          Url: "school?ID=855"
-        },
-        {
-          Name: "doc_1009.png",
-          Fun: "goto",
-          Url: "school?ID=856"
-        },
-        {
-          Name: "doc_1010.png",
-          Fun: "goto",
-          Url: "school?ID=857"
-        },
-        {
-          Name: "doc_1011.png",
-          Fun: "goto",
-          Url: "school?ID=858"
-        },
-        {
-          Name: "doc_1012.png",
-          Fun: "goto",
-          Url: "school?ID=859"
-        },
-        {
-          Name: "doc_1013.png",
-          Fun: "goto",
-          Url: "school?ID=860"
-        },
-        {
-          Name: "doc_1014.png",
-          Fun: "goto",
-          Url: "school?ID=861"
-        },
-        {
-          Name: "doc_1015.png",
-          Fun: "goto",
-          Url: "school?ID=862"
-        },
-        {
-          Name: "doc_1016.png",
-          Fun: "goto",
-          Url: "school?ID=863"
-        },
-        {
-          Name: "doc_1017.png",
-          Fun: "goto",
-          Url: "search"
-        },
-      ]
-    },
-    {
-      ID: 1,
-      Category: "信息整理",
-      Logo: "icon_sys_01.png",
-      Title: "填报志愿6组常见名词解释",
-      TitleShort: "上海中招常见名词解释",
-      Content: [{
-          Name: "doc_0101.png"
-        },
-        {
-          Name: "doc_0102.png"
-        },
-        {
-          Name: "doc_0103.png",
-        },
-        {
-          Name: "doc_0104.png",
-          Fun: "reLaunch",
-          Url: "default"
-        },
-        {
-          Name: "doc_0105.png"
-        },
-        {
-          Name: "doc_0106.png",
-          Fun: "reLaunch",
-          Url: "default"
-        },
-        {
-          Name: "doc_0107.png"
-        },
-        {
-          Name: "doc_0108.png"
-        },
-        {
-          Name: "doc_0109.png"
-        },
-        {
-          Name: "doc_0110.png"
-        },
-        {
-          Name: "doc_0111.png"
-        },
-        {
-          Name: "doc_0112.png"
-        },
-        {
-          Name: "doc_0113.png"
-        },
-        {
-          Name: "doc_0114.png"
-        },
-        {
-          Name: "doc_0115.png"
-        }
-      ]
-    },
-    {
-      ID: 2,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "2023年19所市特色普通高中自主招生情况",
-      TitleShort: "上海特色高中自主招生信息",
-      TitleImage: "doc_0200.png",
-      Content: [{
-          Name: "doc_0201.png"
-        },
-        {
-          Name: "doc_0202.png",
-          Fun: "showImage",
-          Url: "post_0201.png"
-        },
-        {
-          Name: "doc_0203.png",
-          Fun: "goto",
-          Url: "school?ID=82"
-        },
-        {
-          Name: "doc_0204.png",
-          Fun: "goto",
-          Url: "school?ID=94"
-        },
-        {
-          Name: "doc_0205.png",
-          Fun: "goto",
-          Url: "school?ID=100"
-        },
-        {
-          Name: "doc_0206.png",
-          Fun: "goto",
-          Url: "school?ID=114"
-        },
-        {
-          Name: "doc_0207.png",
-          Fun: "goto",
-          Url: "school?ID=115"
-        },
-        {
-          Name: "doc_0208.png",
-          Fun: "goto",
-          Url: "school?ID=116"
-        },
-        {
-          Name: "doc_0209.png",
-          Fun: "goto",
-          Url: "school?ID=117"
-        },
-        {
-          Name: "doc_0210.png",
-          Fun: "goto",
-          Url: "school?ID=132"
-        },
-        {
-          Name: "doc_0211.png",
-          Fun: "goto",
-          Url: "school?ID=143"
-        },
-        {
-          Name: "doc_0212.png",
-          Fun: "goto",
-          Url: "school?ID=167"
-        },
-        {
-          Name: "doc_0213.png",
-          Fun: "goto",
-          Url: "school?ID=181"
-        },
-        {
-          Name: "doc_0214.png",
-          Fun: "goto",
-          Url: "school?ID=192"
-        },
-        {
-          Name: "doc_0215.png",
-          Fun: "goto",
-          Url: "school?ID=193"
-        },
-        {
-          Name: "doc_0216.png",
-          Fun: "goto",
-          Url: "school?ID=194"
-        },
-        {
-          Name: "doc_0217.png",
-          Fun: "goto",
-          Url: "school?ID=239"
-        },
-        {
-          Name: "doc_0218.png",
-          Fun: "goto",
-          Url: "school?ID=241"
-        },
-        {
-          Name: "doc_0219.png",
-          Fun: "goto",
-          Url: "school?ID=268"
-        },
-        {
-          Name: "doc_0220.png",
-          Fun: "goto",
-          Url: "school?ID=91"
-        },
-        {
-          Name: "doc_0221.png",
-          Fun: "goto",
-          Url: "school?ID=256"
-        },
-        {
-          Name: "doc_0222.png",
-          Fun: "goto",
-          Url: "search"
-        },
-        {
-          Name: "doc_0223.png"
-        },
-        {
-          Name: "doc_0224.png"
-        },
-      ]
-    },
-    {
-      ID: 3,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "2023年体育“一条龙”市级优秀体育学生招收学校和项目",
-      TitleShort: "上海优秀体育生中招信息",
-      TitleImage: "doc_0300.png",
-      Content: [{
-          Name: "doc_0301.png"
-        },
-        {
-          Name: "doc_0302.png"
-        },
-        {
-          Name: "doc_0303.png",
-          Fun: "showImage",
-          Url: "post_0301.png"
-        },
-        {
-          Name: "doc_0304.png"
-        },
-        {
-          Name: "doc_0305.png"
-        }
-      ]
-    },
-    {
-      ID: 4,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "2023年艺术“一条龙”市级艺术骨干学生招收学校、项目和艺术团汇总",
-      TitleShort: "上海艺术骨干生中招信息",
-      TitleImage: "doc_0400.png",
-      Content: [{
-          Name: "doc_0401.png"
-        },
-        {
-          Name: "doc_0402.png"
-        },
-        {
-          Name: "doc_0403.png",
-          Fun: "showImage",
-          Url: "post_0401.png"
-        },
-        {
-          Name: "doc_0404.png"
-        },
-        {
-          Name: "doc_0405.png",
-          Fun: "showImage",
-          Url: "post_0402.png"
-        }
-      ]
-    },
-    {
-      ID: 5,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "2023年国际课程班和中外合作办学自主招生计划情况",
-      TitleShort: "上海国际班中考招生信息",
-      TitleImage: "doc_0500.png",
-      Content: [{
-          Name: "doc_0501.png"
-        },
-        {
-          Name: "doc_0502.png"
-        },
-        {
-          Name: "doc_0503.png",
-          Fun: "showImage",
-          Url: "post_0501.png"
-        },
-        {
-          Name: "doc_0504.png"
-        },
-        {
-          Name: "doc_0505.png"
-        },
-        {
-          Name: "doc_0506.png"
-        }
-      ]
-    },
-    {
-      ID: 6,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "中考考试科目和分值设置",
-      TitleShort: "上海中考科目和分值设置",
-      TitleImage: "doc_0600.png",
-      Content: [{
-          Name: "doc_0601.png"
-        },
-        {
-          Name: "doc_0602.png",
-          Fun: "showImage",
-          Url: "post_0601.png"
-        },
-        {
-          Name: "doc_0603.png"
-        },
-        {
-          Name: "doc_0604.png"
-        }
-      ]
-    },
-    {
-      ID: 7,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "2023年政策性照顾加分和同分优待情况",
-      TitleShort: "上海中考加分有待信息",
-      TitleImage: "doc_0700.png",
-      Content: [{
-          Name: "doc_0701.png"
-        },
-        {
-          Name: "doc_0702.png"
-        },
-        {
-          Name: "doc_0703.png",
-          Fun: "showImage",
-          Url: "post_0701.png"
-        },
-        {
-          Name: "doc_0704.png"
-        }
-      ]
-    },
-    {
-      ID: 8,
-      Category: "数据图表",
-      Logo: "icon_sys_02.png",
-      Title: "查询录取去向官方网站公众号汇总",
-      TitleShort: "上海中招信息官方渠道汇总",
-      TitleImage: "doc_0800.png",
-      Content: [{
-          Name: "doc_0801.png"
-        },
-        {
-          Name: "doc_0802.png",
-          Fun: "showImage",
-          Url: "post_0801.png"
-        },
-        {
-          Name: "doc_0803.png",
-          Fun: "showImage",
-          Url: "post_0801.png"
-        }
-      ]
-    },
-    {
-      ID: 9,
-      Category: "信息整理",
-      Logo: "icon_sys_01.png",
-      Title: "招生志愿信息样表",
-      TitleShort: "上海中招录取志愿样表",
-      Content: [{
-          Name: "doc_0901.png"
-        },
-        {
-          Name: "doc_0902.png",
-          Fun: "showImage",
-          Url: "post_0901.png"
-        },
-      ]
-    },
-  ],
   arrSchoolSearch: [{
       Name: "上海市上海中学",
       ImageUrl: "0001_01.jpeg",

utils/main.js

@@ -176,6 +176,18 @@ function getCollect(callback) {
   }
 }
 
+function gotoMiniprogram(SourceID){
+  wx.navigateToMiniProgram({
+    appId: "wx84b3feac6069eec3",
+    path: "pages/index/index?SourceID="+SourceID,
+    extraData: {
+    },
+    success(res) {
+      // 打开成功
+    }
+  });
+}
+
 function goto(e) {
   if (app.globalData.IsGoto){
     app.globalData.IsGoto=false;
@@ -199,5 +211,6 @@ module.exports = {
   returnTop:returnTop,
   getBaiduToken: getBaiduToken,
   getCollect: getCollect,
+  gotoMiniprogram:gotoMiniprogram,
   goto:goto,
 }