1.0.12

app.js

@@ -1,13 +1,12 @@
 // app.js
 App({
-
   globalData: {
-    Version: "0.1.1",
+    Version: "1.0.12",
     IsProduction: true,
     //IsProduction: false,
-    ShareTitle: "上海中考信息查询",
+    ShareTitle: "上海中考招生信息查询工具",
     SharePath: "pages/index/index",
-    ShareImage: '../images/program_screenshot_main.png',
+    ShareImage: '../images/fs_a01.png',
     ProgramID: 173,
     ProgramName: "秒过分数线",
     AppID: "wx39bc498e7fdacb6b",
@@ -22,8 +21,12 @@ App({
     IsOppo: false,
     systemInfo: null,
     userInfo: null,
+    Key: "kylx365_chengjie",
+    IV: "kylx365hongliren",
     SourceID: 0,//来源ID
-    
+    IsGoto:true,//可以跳转
+    WebViewUrl:"",//webview的链接
+    PageCount:100,//每一页翻页数
   },
   onLaunch: function (options) {
     this.getSystemInfo();

app.json

@@ -1,15 +1,35 @@
 {
-  "pages":[
+  "pages": [
+    "pages/index/index",
+    "pages/main/webview",
+    "pages/main/docs",
+    "pages/main/search",
+    "pages/main/collect",
+    "pages/main/recruitment",
     "pages/main/default",
-    "pages/index/index"
+    "pages/main/school",
+    "pages/main/scoreline",
+    "pages/main/map",
+    "pages/main/subscribe",
+    "pages/main/feedback",
+    "pages/main/imagelist",
+    "pages/main/district"
+  ],
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的位置信息将用于小程序位置接口的效果展示"
+    }
+  },
+  "requiredPrivateInfos": [
+    "getLocation"
   ],
   "window": {
-    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarBackgroundColor": "#F0F0F0",
     "navigationBarTitleText": "秒过分数线",
     "navigationBarTextStyle": "black",
-    "backgroundColor": "#ffffff",
+    "backgroundColor": "#F0F0F0",
     "enablePullDownRefresh": false
   },
   "style": "v2",
   "sitemapLocation": "sitemap.json"
-}
+}

pages/index/index.js

@@ -1,48 +1,239 @@
-// index.js
-// 获取应用实例
-const app = getApp()
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+var timeout1 = 0, timeout3=0;
+var timeoutRedirect=0;
 
 Page({
   data: {
-    motto: 'Hello World',
-    userInfo: {},
-    hasUserInfo: false,
-    canIUse: wx.canIUse('button.open-type.getUserInfo'),
-    canIUseGetUserProfile: false,
-    canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') // 如需尝试获取用户信息可改为false
-  },
-  // 事件处理函数
-  bindViewTap() {
-    wx.navigateTo({
-      url: '../logs/logs'
-    })
+    Sentence:1,
   },
-  onLoad() {
-    if (wx.getUserProfile) {
-      this.setData({
-        canIUseGetUserProfile: true
-      })
-    }
+  onPullDownRefresh: function () {
+    wx.reLaunch({
+      url: './index',
+    })
   },
-  getUserProfile(e) {
-    // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
-    wx.getUserProfile({
-      desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-      success: (res) => {
-        console.log(res)
+  onLoad: function (options) {
+    console.log("Time1:" + new Date().getTime());
+    if (options) {
+      if (options.UserID) {
+        console.log("UserID:" + options.UserID);
+        app.globalData.introducer = options.UserID;
+      }
+      if (options.SourceID) {
+        console.log("SourceID:" + options.SourceID);
+        app.globalData.SourceID = options.SourceID;
+      }
+      // 扫码介绍人
+      if (options.scene) {
+        var scene = decodeURIComponent(options.scene);
+        console.log("scene:" + scene);
+        if (scene.indexOf("type=article")>=0){
+          app.globalData.SourceID=scene.substr(scene.indexOf("ID=") + 3);
+          this.setData({
+            gotoType: "other",
+            gotoUrl: '../main/docs?ID=' + app.globalData.SourceID,
+          });        
+        }        
+        else if (scene.indexOf("type=web")>=0){
+          app.globalData.SourceID=scene.substr(scene.indexOf("ID=") + 3);
+        }        
+        else{
+          var introducer = 0;
+          if (scene.indexOf("UserID") >= 0)
+            introducer = scene.substr(scene.indexOf("UserID") + 7);
+          console.log("introducer:" + introducer);
+          app.globalData.introducer = scene;
+        }
+      }
+
+      if (options.type == "school") {
         this.setData({
-          userInfo: res.userInfo,
-          hasUserInfo: true
-        })
+          gotoType: "other",
+          gotoUrl: '../main/school?ID=' + options.ID,
+        });
       }
-    })
-  },
-  getUserInfo(e) {
-    // 不推荐使用getUserInfo获取用户信息，预计自2021年4月13日起，getUserInfo将不再弹出弹窗，并直接返回匿名的用户个人信息
-    console.log(e)
+      else if (options.type == "district") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: '../main/district?ID=' + options.ID+'&Name='+options.Name,
+        });
+      }
+      else if (options.type == "recruitment") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: '../main/recruitment?PanelType=' + options.PanelType+'&DistrictID='+options.DistrictID,
+        });
+      }
+      else if (options.type == "scoreline") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: '../main/scoreline?PageType='+options.type+'&ScoreTypeID='+options.ScoreTypeID+'&DistrictID=' + options.ID+"&YearIndex="+options.YearIndex,
+        });
+      }
+      else if (options.type == "docs") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: '../main/docs?ID=' + options.ID,
+        });
+      }
+      
+    }
     this.setData({
-      userInfo: e.detail.userInfo,
-      hasUserInfo: true
-    })
-  }
-})
+      IsRefresh: false,
+      Containnerheight: main.getWindowHeight(),
+      Sentence:common.random(1, 9),
+    });
+
+    this.updateProgram();
+
+    this.getUserInfo();
+
+    var that = this;
+    timeout1 = setTimeout(function () {
+      that.setData({
+        IsRefresh: true,
+      })
+    }, 15000);
+  },
+  //得到用户信息
+  getUserInfo: function (cb) {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        app.globalData.userInfo = {};
+        app.globalData.userInfo.Code = res0.code;
+        console.log("Time2:" + new Date().getTime());
+        app.globalData.userInfo.nickName = "陌生用户";
+        app.globalData.userInfo.language = "";
+        app.globalData.userInfo.gender = "0";
+        app.globalData.userInfo.city = "";
+        app.globalData.userInfo.province = "";
+        app.globalData.userInfo.country = "";
+        app.globalData.userInfo.avatarUrl = "../images/universalpic_face_default_blue_120x120.png";
+        that.login(app.globalData.userInfo);        
+      },
+      fail: function () {}
+    });
+  },
+
+  login: function (param) {
+    var that = this;
+    main.getLocalHost(function () {
+      main.postData('MPSLogin', {
+        Code: param.Code,
+        NickName: param.nickName,
+        Language: param.language,
+        Gender: param.gender,
+        City: param.city,
+        Province: param.province,
+        Country: param.country,
+        AvatarUrl: param.avatarUrl,
+        Introducer: app.globalData.introducer,
+        UserSource: app.globalData.userSource,
+        SourceID: app.globalData.SourceID,
+        LastUserSource: app.globalData.userSource,
+        Brand: app.globalData.systemInfo.brand,
+        Model: app.globalData.systemInfo.model,
+        PixelRatio: app.globalData.systemInfo.pixelRatio,
+        ScreenWidth: app.globalData.systemInfo.screenWidth,
+        ScreenHeight: app.globalData.systemInfo.screenHeight,
+        WindowWidth: app.globalData.systemInfo.windowWidth,
+        WindowHeight: app.globalData.systemInfo.windowHeight,
+        WXLanguage: app.globalData.systemInfo.language,
+        WXVersion: app.globalData.systemInfo.version,
+        System: app.globalData.systemInfo.system,
+        Platform: app.globalData.systemInfo.platform,
+        SDKVersion: app.globalData.systemInfo.SDKVersion,
+        ProgramVersion: app.globalData.Version,
+      }, function (data) {
+        console.log("Time4:" + new Date().getTime());
+        if (!data) {
+          timeout3 = setTimeout(function () {
+            that.getUserInfo();
+            console.log("reboot:" + new Date().getTime());
+          }, 2000);
+        }
+        else {
+          app.globalData.userInfo = data;
+
+          var isShow = data.IsShow;
+          if (isShow == -1) {
+            isShow = 0;
+          }
+          else {
+            var systemInfo = wx.getSystemInfoSync();
+            if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+              isShow = 1;
+            }
+          }
+
+          app.globalData.userInfo.IsShow = isShow;
+          if (app.globalData.userInfo.IsMember == 1)
+            app.globalData.IsLocked = 0;
+
+          wx.removeStorageSync("UserID");
+          wx.removeStorageSync("UserName");
+          wx.removeStorageSync("CollectList");
+
+          if (that.data.gotoType == "other"){
+            app.globalData.GotoUrl = that.data.gotoUrl;
+            var url = '../main/default';
+            wx.redirectTo({
+              url: url,
+            });
+          }
+          else{
+         
+            var url = '../main/default';
+            timeoutRedirect=setTimeout(function () {
+              console.log("Time5:" + new Date().getTime());
+              clearTimeout(timeout1);
+              wx.redirectTo({
+                url: url,
+              });
+            }, 200);
+          }
+                    
+          that.getBaiduToken();
+        }
+      });
+    });
+  },
+  getBaiduToken: function () {
+    main.getBaiduToken();
+  },
+  
+  updateProgram: function () {
+    const updateManager = wx.getUpdateManager();
+
+    updateManager.onCheckForUpdate(function (res) {
+      // 请求完新版本信息的回调
+    });
+
+    updateManager.onUpdateReady(function () {
+      clearTimeout(timeoutRedirect);
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，重启应用',
+        showCancel:false,
+        success: function (res) {
+          wx.removeStorageSync("UserID");
+          wx.removeStorageSync("UserName");
+          updateManager.applyUpdate();
+        }
+      });
+    });
+  },
+  
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/index/index.wxml

@@ -1,23 +1,4 @@
 <!--index.wxml-->
 <view class="container">
-  <view class="userinfo">
-    <block wx:if="{{canIUseOpenData}}">
-      <view class="userinfo-avatar" bindtap="bindViewTap">
-        <open-data type="userAvatarUrl"></open-data>
-      </view>
-      <open-data type="userNickName"></open-data>
-    </block>
-    <block wx:elif="{{!hasUserInfo}}">
-      <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile"> 获取头像昵称 </button>
-      <button wx:elif="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-      <view wx:else> 请使用1.4.4及以上版本基础库 </view>
-    </block>
-    <block wx:else>
-      <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
-      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
-    </block>
-  </view>
-  <view class="usermotto">
-    <text class="user-motto">{{motto}}</text>
-  </view>
+  
 </view>

pages/main/collect.js

@@ -0,0 +1,64 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    SchoolType1:constant.arrSchoolType1,
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      SchoolType1Index:0,
+    });
+  },
+  onShow:function(res){
+    this.init();
+  },
+  init:function(){
+    var that = this;
+    main.getCollect(function(data){
+      if (data){
+        var arr=[data["收藏的高中"],data["收藏的初中"]];
+        that.setData({
+          SchoolCollect:arr,
+          SchoolCurrent: arr[that.data.SchoolType1Index],
+        });
+      }
+    });
+  },
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      if (e.currentTarget.dataset.object=="SchoolType1"){
+        that.setData({
+          SchoolType1Index:e.currentTarget.dataset.index,
+          SchoolCurrent:that.data.SchoolCollect[e.currentTarget.dataset.index],
+        });
+      }
+    });   
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  gotoMap:function(e){
+    if (this.data.SchoolCurrent.length>0){
+      main.goto({currentTarget:{dataset:{url:"map?PageType=3"}}});
+    }
+    else
+      main.goto(e);
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+    }
+  },
+})

pages/main/collect.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "学校收藏"
+}

pages/main/collect.wxml

@@ -0,0 +1,77 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view style="width: 40rpx;"></view>
+    <view class="panelTop1 FlexColumn" wx:for="{{SchoolType1}}" wx:key="index" 
+    bindtap="onSelect" data-object="SchoolType1" data-index="{{index}}" data-clicktype="radio">
+      <view class="panelTop1Text01 panelTop1Text01{{item.CSS}}">收藏的{{item.Name}}</view>
+      <view class="panelTop1Line01 panelTop1Line01{{item.CSS}} panelTop1Line02"></view>
+    </view>
+  </view>
+  <view style="height: 100rpx;"></view>
+  
+  <view class="FlexColumn" wx:if="{{SchoolCurrent.length==0}}">
+    <image class="icon_sys_12" src="../images/icon_sys_12.png"></image>
+    <view class="text02">还没收藏</view>
+    <view class="text03">点击学校名称或搜索，在学校主页中收藏</view>
+  </view>
+  <view class="panelBasicCss FlexColumn" wx:if="{{SchoolCurrent.length>0}}">
+    <view class="panelSchoolList FlexColumn" wx:for="{{SchoolCurrent}}" wx:key="index" bindtap="goto" data-url="school?ID={{item.ID}}">
+      
+      <block wx:if="{{item.Pinyin!=item.Pinyin2}}">
+        <view class="panelSchoolList1 FlexRow" >
+          <view class="panelSchoolList01">{{item.Pinyin}}</view>
+        </view>
+        <view class="panelLine"></view>
+      </block>
+      
+      <view class="panelSchoolList1 FlexRow">
+        <view class="FlexRow">
+          <image class="panelSchoolList1imgLogo" wx:if="{{item.ImageLogo}}" src="{{ImagePath}}web/_School/{{item.ImageLogo}}"></image>
+          <view class="panelSchoolList1imgLogo" wx:if="{{!item.ImageLogo && item.SchoolType1=='高中'}}"></view>
+          <view style="width: 30rpx;" wx:if="{{!item.ImageLogo && item.SchoolType1=='初中'}}"></view>
+          <view class="panelSchoolList11 FlexColumn">
+            <view class="panelSchoolList1Text01">{{item.SchoolFullName}}</view>
+            <view class="panelSchoolList111 FlexRow" wx:if="{{item.SchoolType1=='高中'}}">
+              <view class="panelSchoolList1Text02">{{item.SchoolType2Short}}</view>
+              <view class="panelLine2" wx:if="{{item.PublicOrPrivate}}"></view>
+              <view class="panelSchoolList1Text02">{{item.PublicOrPrivate}}</view>
+              <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>
+          </view>
+        </view>       
+        <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+      </view>
+      <view class="panelLine"></view>
+    </view>
+
+    <view style="height: 60rpx;"></view>  
+  </view>
+  <view style="height: 250rpx;"></view>
+
+  <view class="panelFooterBig FlexColumn">
+    <view class="panelFooterBig1">横向对比收藏的{{SchoolType1[SchoolType1Index].Name}}</view>
+    
+    <block wx:if="{{SchoolType1Index==0}}">
+      <view class="FlexRow">
+        <view class="panelFooterBigBtn panelFooterBigBtn2 FlexRow" catchtap="gotoMap" data-url="scoreline?PageType=collect&DistrictID=-1&SchoolType1={{SchoolType1[SchoolType1Index].Name}}&YearIndex=0">
+          <view>校址地图</view>
+        </view>
+        <view style="width:20rpx;"></view>
+        <view class="panelFooterBigBtn panelFooterBigBtn2 FlexRow" catchtap="goto" data-url="scoreline?PageType=collect&DistrictID=-1&SchoolType1={{SchoolType1[SchoolType1Index].Name}}&YearIndex=0">
+          <image class="icon_compared_01" src="../images/icon_compared_01.png"></image>
+          <view>{{SchoolType1[SchoolType1Index].Remark}}</view>
+        </view>
+      </view>
+      
+    </block>
+    <block wx:if="{{SchoolType1Index==1}}">
+      <view class="panelFooterBigBtn FlexRow" catchtap="goto" data-url="scoreline?PageType=collect&DistrictID=-1&SchoolType1={{SchoolType1[SchoolType1Index].Name}}&YearIndex=0">
+        <image class="icon_compared_01" src="../images/icon_compared_01.png"></image>
+        <view>{{SchoolType1[SchoolType1Index].Remark}}</view>
+      </view>
+    </block>
+  </view>
+</view>

pages/main/collect.wxss

@@ -0,0 +1,57 @@
+
+.icon_sys_12{
+  width:50rpx;
+  height:60rpx;
+  margin-top: 280rpx;
+}
+
+.text02{
+  font-size: 36rpx;
+  margin-top: 30rpx;
+}
+
+.text03{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
+}
+
+.panelFooterBig{
+  width:100%;
+  background-color: #fff;
+  height:210rpx;
+  position: fixed;
+  bottom: 0;
+  z-index: 100;
+  justify-content: flex-start;
+  border-top:2rpx solid #E2E2E2;
+}
+
+.panelFooterBig1{
+  font-size:20rpx;
+  align-self: start;
+  margin: 32rpx 0 0 40rpx;
+}
+.panelFooterBigBtn{
+  background-color: #FCE9E3;
+  width:690rpx;
+  height:90rpx;
+  border: 3rpx solid #EB5C28;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+  color:#EB5C28;
+  font-size: 28rpx;
+}
+
+
+.panelFooterBigBtn2{
+  width:335rpx;
+  height:90rpx;
+}
+
+
+.icon_compared_01{
+  width:24rpx;
+  height:24rpx;
+  margin-right: 20rpx;
+}

pages/main/default.js

@@ -6,19 +6,38 @@ const app = getApp();
 
 Page({
   data: {
-    IsSelect: true,
-    District:constant.arrDistrict,
+    ImagePath: app.globalData.uploadImageUrl,
+    ArticleList:constant.arrArticleList,
+    District:constant.arrDistrict,  
+    Version:app.globalData.Version,  
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-    
+
+    if (app.globalData.GotoUrl) {
+      //console.log(app.globalData.GotoUrl);
+      wx.navigateTo({
+        url: app.globalData.GotoUrl,
+      });
+      app.globalData.GotoUrl = "";
+    }
+    else{
+      //获得收藏学校数据
+      main.getCollect();
+    }
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
   },
   onShareAppMessage: function () {
     return {
-      title: app.globalData.ShareTitle,
+      title: "上海中考招生信息查询工具",
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
       imageUrl: app.globalData.ShareImage,
     }

pages/main/default.json

@@ -1,7 +1,7 @@
 {
-  "navigationBarBackgroundColor": "#FFCC00",
+  "navigationBarBackgroundColor": "#F8C324",
   "navigationBarTextStyle": "black",
-  "backgroundColor": "#FFCC00",
-  "backgroundColorTop": "#FFCC00",
-  "backgroundColorBottom": "#FFCC00"
+  "navigationBarTitleText": "",
+  "backgroundColorTop":"#F8C324",
+  "backgroundColorBottom":"#F8C324"
 }

pages/main/default.wxml

@@ -1,17 +1,15 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image class="pic_01" src="../images/pic_01.png"></image>
   <view class="panel1 FlexColumn">
+    <image class="pic_04" src="../images/pic_04.png"></image>
     <view class="panel11 FlexColumn">
-      <view class="panel111 FlexRow">
+      <view class="panel111 FlexRow" bindtap="goto" data-url="search">
         <image class="icon_magnifier_01" src="../images/icon_magnifier_01.png" ></image>
         <view class="text01">搜学校</view>
       </view>
-      <image class="line01" src="../images/line_01.png"></image>
-
-      <view class="text02">选区查志愿</view>
-
+      
       <view class="panel112 FlexRow">
-        <view class="panel1121 FlexRow" wx:for="{{District}}" wx:key="index">
+        <view class="panel1121 FlexRow" wx:for="{{District}}" wx:key="index" bindtap="goto" data-url="district?ID={{item.ID}}&Name={{item.Name}}">
           <view class="panel11211 FlexColumn">
             <view class="text03">{{item.Name}}</view>
             <view class="text04">{{item.Count}}所高中</view>
@@ -19,27 +17,16 @@
           <image class="imgLogo" src="../images/logo_{{item.ID}}s.png"></image>
         </view>
       </view>
-
-      <view class="line02"></view>
-
-      <view class="panel113 FlexRow">
-        <view class="panel1131">
-          <image class="icon_fav_03" src="../images/icon_fav_03.png"></image>
-        </view>
-
-        <view class="panel1132 FlexColumn">
-          <view class="text03">收藏学校</view>
-          <view class="text05">可以对比收藏的学校</view>
+      <view class="panel113 FlexRow" bindtap="goto" data-url="collect">
+        <view class="panel1131 FlexRow">
+          <image class="icon_fav_01" src="../images/icon_fav_01.png"></image>
+          <view class="panel11311 FlexColumn">
+            <view class="text03">收藏学校</view>
+            <view class="text05">制作自己的对比清单</view>
+          </view>
         </view>
         <image class="pic_02" src="../images/pic_02.png"></image>
-       
-      </view>
-
-      <view class="line02"></view>
-
-      <view class="panel1133 FlexRow">
-        <view class="text03">纠错与建议</view>
-        <image class="icon_nextpage_1" src="../images/icon_nextpage_1.png"></image>
+        <view class="panel1132"></view>
       </view>
 
       <view class="line03 FlexColumn">
@@ -50,22 +37,35 @@
   </view>
 
   <view class="panel2 FlexColumn">
-    <image class="toolbook" src="../images/toolbook.png"></image>
-    <view class="line04"></view>
     <view class="text06">参考文章</view>
-
-    <block wx:for="{{[1,2,3,4]}}">
-      <view class="panel21 FlexRow">
-        <view class="panel211 FlexColumn">
-          <view class="text05">数据图表</view>
-          <view class="text07">上海16区2023年统一招生平行志愿各区情况汇总</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="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.TitleImage}}" class="TitleImage" src="{{ImagePath}}web/_ScoreLine/{{item.TitleImage}}"></image>
         </view>
-        <image class="articleImage" src="../images/pic_03.png"></image> 
+        
+        <view class="line04"></view>
       </view>
-      <view class="line04"></view>
-    </block>
-    <view class="footerHeight"></view>
+    </view>
+    <view style="height:30rpx;"></view>
+    <view class="panel1133 FlexRow" bindtap="goto" data-url="feedback">
+      <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="panel2 FlexRow">
+      <text class="text09">
+        <text class="text10">诚恳声明：</text>本产品所有图文内容来自网络，仅供家长对上海地区招生计划有大致了解。由于有可能存在错谬，故不能作为填报志愿的决策依据，请务必以当时当地教育局和学校提供的信息为准。我们将认真对待用户提供的纠错和建议，尽可能刊载正确信息。
+      </text>
+    </view>
+    <text class="text11" bindtap="goto" data-url="webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">©2023 秒过分数线 版本 {{Version}}</text>
+    <view style="height:100rpx;"></view>
   </view>
-
-  
 </view>

pages/main/default.wxss

@@ -1,14 +1,22 @@
 .container{
   width:100%;
-  background-color: #FFCC00;
+  background-color: #F8C324;
 }
 .pic_01{
   width: 100%;
-  height:254rpx;
+  height:234rpx;
 }
 
 .panel1{
   width:100%;
+  position: relative;
+}
+
+.pic_04{
+  width:100%;
+  height:700rpx;
+  position: absolute;
+  bottom:0;
 }
 
 .panel11{
@@ -17,7 +25,7 @@
   border-top-right-radius: 30rpx;
   background-color: #fff;
   min-height: 100rpx;
-  margin-top: 60rpx;
+  margin-top: 40rpx;
   position: relative;
 }
 
@@ -26,7 +34,7 @@
   height:70rpx;
   background-color: #F2F2F2;
   border-radius: 14rpx;
-  margin: 40rpx 0 40rpx 0;
+  margin: 50rpx 0 30rpx 0;
   justify-content: flex-start;
 }
 
@@ -37,8 +45,9 @@
 }
 
 .text01{
-  font-size:28rpx;
-  margin-left: 20rpx;
+  font-size: 24rpx;
+  margin-left: 10rpx;
+  font-weight: 400;
 }
 
 .line01{
@@ -51,12 +60,14 @@
   margin-top: 50rpx;
   align-self: flex-start;
   margin-left:40rpx;
+  font-weight: 700;
 }
 
 .panel112{
-  width: 650rpx;
+  width: 630rpx;
+  margin-left: 20rpx;
   flex-wrap: wrap;
-  margin-top: 30rpx;
+  margin-top: 10rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }
@@ -64,22 +75,24 @@
 .panel1121{
   width:190rpx;
   height:121rpx;
-  border-radius: 10rpx;
-  background-color: #f2f2f2;
-  margin: 0 0 20rpx 20rpx;
+  margin-right: 20rpx;
   align-items: flex-start;
-  justify-content: flex-start;
+  justify-content: space-between;
 }
 
 .panel11211{
   align-items: flex-start;
-  margin-right: 34rpx;
-  margin: 30rpx 34rpx 0 16rpx;
+  margin: 30rpx 0 0 16rpx;
 }
 
 .text03{
   font-size:28rpx;
+  white-space: nowrap;
+}
+.text031{
+  margin-left: 40rpx;
 }
+
 .text04{
   font-size:18rpx;
 }
@@ -87,74 +100,66 @@
 .imgLogo{
   width:34rpx;
   height:34rpx;
-  margin-top: 36rpx;
+  margin: 34rpx 22rpx 0 0;
 }
 
-.line02{
-  width:610rpx;
-  height:1rpx;
-  background-color: #E3E3E3;
-  margin-top: 40rpx;
-}
 
 .panel113{
   width:610rpx;
-  height:180rpx;
-  background-color: #E0E0D8;
-  border-radius: 10rpx;
-  margin-top: 40rpx;
+  height:120rpx;
+  background-color: #f2f2f2;
+  border-radius: 20rpx;
+  margin: 30rpx 0 60rpx 0;
   position: relative;
   overflow: hidden;
 }
 
 .panel1131{
-  width:230rpx;
-  height:250rpx;
-  background-color: #F18B66;
-  border-radius: 68rpx;
   position: absolute;
-  top:-178rpx;
-  left:-120rpx;
+  top:32rpx;
+  left:30rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
 }
 
-.icon_fav_03{
-  width:34rpx;
-  height:34rpx;
+.panel1132{
+  width:265rpx;
+  height:14rpx;
   position: absolute;
-  right:47rpx;
-  bottom:20rpx;
+  bottom:0;
+  left:0;
+  background-color: #F49673;
 }
 
-.panel1132{
-  position: absolute;
-  top:92rpx;
-  left:20rpx;
+.icon_fav_01{
+  width:24rpx;
+  height:24rpx;
+}
+
+.panel11311{
+  margin: -7rpx 0 0 11rpx;
   align-items: flex-start;
 }
 
 .text05{
   font-size: 20rpx;
+  font-weight: 400;
 }
 
 .pic_02{
-  width:300rpx;
-  height:180rpx;
+  width:200rpx;
+  height:120rpx;
   position: absolute;
   right:0;
 }
 
 .panel1133{
-  width:601rpx;
-  height:140rpx;
+  width:100%;
+  height:100rpx;
   justify-content: space-between;
+  background-color: #fff;
 }
 
-.icon_nextpage_1{
-  width:16rpx;
-  height:26rpx;
-}
-
-
 .line03{
   width:750rpx;
   height:20rpx;
@@ -167,44 +172,80 @@
   background-color: #fff;
 }
 
-.toolbook{
-  width:670rpx;
-  height:180rpx;
-  margin: 60rpx 0;
-}
-
-.line04{
-  width:670rpx;
-  height:1rpx;
-  background-color: #E3E3E3;
-}
-
-
 .text06{
   font-size: 36rpx;
-  margin: 60rpx 0 40rpx 0;
+  margin: 60rpx 0 0 0;
   align-self: flex-start;
   margin-left:40rpx;
 }
 
 .panel21{
   width: 670rpx;
-  justify-content: space-between;
-  margin: 30rpx 0;
 }
 .panel211{
+  width: 100%;
+  margin-top: 30rpx;
+}
+.panel2111{
+  width: 100%;
+  justify-content: space-between;
+}
+.panel21111{
+  width: 450rpx;
   align-items: flex-start;
-  width: 440rpx;
 }
 
+.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;
 }
 
-.articleImage{
-  width:180rpx;
-  height:118rpx;
-  border-radius: 6rpx;
+.line04{
+  width:670rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin-top: 30rpx;
+}
+
+.imgLogo2{
+  width:24rpx;
+  height:22rpx;
+}
+
+.TitleImage{
+  width:160rpx;
+  height:84rpx;
+  border:1rpx solid #E3E3E3;
+  border-radius: 10rpx;
+}
+
+.text09{
+  font-size: 20rpx;
+  font-weight: 400;
+  width: 670rpx;
+  margin-top: 30rpx;
 }
 
+.text10{
+  font-weight: 700;
+}
+
+.text11{
+  font-size: 20rpx;
+  margin: 100rpx 50rpx 0 0;
+  align-self:flex-end;
+  font-weight: 400;
+  color:#787878;
+}

pages/main/district.js

@@ -0,0 +1,68 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    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?"},
+    ],
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      DistrictID:options.ID,
+      DistrictName:options.Name,
+    });
+    that.init();
+  },
+  init:function(){
+    var that = this;
+    var id=Number(that.data.DistrictID);
+    main.getData("GetMPSSchool?SelectType=structure&DistrictID="+id, function (data) {
+      if (data) {
+        that.setData({
+          SchoolAll: data,
+          SchoolCurrent:data[0].List
+        });
+      }
+    });
+  },
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      if (e.currentTarget.dataset.object=="SchoolType"){
+        that.setData({
+          SchoolCurrent:that.data.SchoolAll[e.currentTarget.dataset.index].List
+        });
+      }
+    });   
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  returnTop:function(){
+    main.returnTop();
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var url=that.data.ImagePath+"web/_ScoreLine/fs_b"+that.data.DistrictID+".png";
+    
+    return {
+      title: that.data.DistrictName+"中考招生信息",
+      path: app.globalData.SharePath + '?type=district&ID='+that.data.DistrictID+'&Name='+that.data.DistrictName+'&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: url,
+    }
+  },
+})

pages/main/district.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/district.wxml

@@ -0,0 +1,99 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexRow">
+    <view class="text01">{{DistrictName}}</view>
+    <image class="logo_01b" src="../images/logo_{{DistrictID}}b.png"></image>
+  </view>
+  <view class="panelBasicCss panel2 FlexColumn">
+    <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>
+        <view class="text03">名额到区</view>
+      </view>
+      <view class="panel211 FlexColumn" bindtap="goto" data-url="scoreline?PageType=scoreline&ScoreTypeID=3&DistrictID={{DistrictID}}&YearIndex=0">
+        <image class="icon_sys_05" src="../images/icon_sys_07.png"></image>
+        <view class="text03">名额到校</view>
+      </view>
+      <view class="panel211 FlexColumn" bindtap="goto" data-url="scoreline?PageType=scoreline&ScoreTypeID=4&DistrictID={{DistrictID}}&YearIndex=0">
+        <image class="icon_sys_05" src="../images/icon_sys_09.png"></image>
+        <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">
+        <image class="icon_sys_03" src="../images/icon_sys_03.png"></image>
+      </view>
+      <view class="panel222 FlexColumn" >
+        <view class="panel2221 FlexRow">
+          <text class="text05">{{item.Title}}</text>
+          <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+        </view>
+        <view class="line02"></view>
+      </view>
+    </view>
+    <view style="height: 20rpx;"></view>
+  </view>
+
+  <view class="panelBasicCss panel3 FlexRow" bindtap="goto" data-url="map?PageType=2&DistrictID={{DistrictID}}&DistrictName={{DistrictName}}">
+    <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>
+    </view>
+  </view>
+  
+  <view class="panelBasicCss panel3 FlexColumn">
+    <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>
+    </view>
+    <view class="panelSchoolList FlexColumn" wx:for="{{SchoolCurrent}}" wx:key="index" bindtap="goto" data-url="school?ID={{item.ID}}">
+      
+      <block wx:if="{{item.Pinyin!=item.Pinyin2}}">
+        <view class="panelSchoolList1 FlexRow" >
+          <view class="panelSchoolList01">{{item.Pinyin}}</view>
+        </view>
+        <view class="panelLine"></view>
+      </block>
+      
+      <view class="panelSchoolList1 FlexRow">
+        <view class="FlexRow">
+          <image class="panelSchoolList1imgLogo" wx:if="{{item.ImageLogo}}" src="{{ImagePath}}web/_School/{{item.ImageLogo}}"></image>
+          <view class="panelSchoolList1imgLogo" wx:if="{{!item.ImageLogo && item.SchoolType1=='高中'}}"></view>
+          <view style="width: 30rpx;" wx:if="{{!item.ImageLogo && item.SchoolType1=='初中'}}"></view>
+          <view class="panelSchoolList11 FlexColumn">
+            <view class="panelSchoolList1Text01">{{item.SchoolFullName}}</view>
+            <view class="panelSchoolList111 FlexRow" wx:if="{{item.SchoolType1=='高中'}}">
+              <view class="panelSchoolList1Text02">{{item.SchoolType2Short}}</view>
+              <view class="panelLine2" wx:if="{{item.PublicOrPrivate}}"></view>
+              <view class="panelSchoolList1Text02">{{item.PublicOrPrivate}}</view>
+              <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>
+          </view>
+        </view>       
+        <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+      </view>
+      <view class="panelLine"></view>
+    </view>
+    <view style="height: 50rpx;"></view>
+  </view>
+  <view style="height: 210rpx;"></view>
+
+  <view class="panelFooter FlexRow">
+    <view class="panelFooter1 FlexRow">
+      <button open-type='share' class="share FlexRow">
+        <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_share_01.png"></image>
+        <view class="panelFooterBottom">转发</view>
+      </button>
+    </view>
+    <view class="panelFooter3 FlexRow" catchtap="returnTop">
+      <view class="panelFooterLine panelFooterBottom"></view>
+      <image class="panelFooterBottom panelFooter_icon_b2t_01" src="../images/icon_b2t_01.png"></image>
+    </view>
+  </view>
+</view>

pages/main/district.wxss

@@ -0,0 +1,136 @@
+.panel1{
+  width:710rpx;
+  justify-content: space-between;
+  margin-top: 30rpx;
+  align-items: flex-start;
+}
+
+.text01{
+  margin-left: 40rpx;
+  font-size: 72rpx;
+}
+
+.logo_01b{
+  width:140rpx;
+  height:120rpx;
+  margin-right: 40rpx;
+}
+
+.text02{
+  margin: 60rpx 0 0 40rpx;
+  font-size: 36rpx;
+  align-self: flex-start;
+}
+
+.panel2{
+  margin-top: 0;
+}
+
+
+.panel21{
+  margin-top: 40rpx;
+  width: 652rpx;
+  justify-content: space-between;
+}
+
+.panel211{
+  width:204rpx;
+  height:158rpx;
+  border-radius: 10rpx;
+  background-color: #F2F2F2;
+}
+
+.icon_sys_05{
+  width:28rpx;
+  height:28rpx;
+}
+
+.text03{
+  margin: 10rpx 0 0 0;
+  font-size: 28rpx;
+}
+
+.line01{
+  width:650rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin-top: 40rpx;
+}
+
+.text04{
+  margin: 50rpx 0 40rpx 40rpx;
+  font-size: 28rpx;
+  align-self: flex-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;
+}
+
+
+.panel222{
+  width:580rpx;
+  margin-left: 30rpx;
+  align-items: flex-start;
+}
+
+.panel2221{
+  width:100%;
+  height:66rpx;
+  justify-content: space-between;
+}
+
+.text05{
+  font-size: 24rpx;
+  font-weight: 400;
+}
+
+.line02{
+  width:540rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin: 30rpx 0 30rpx 0;
+}
+
+.panel3{  
+  min-height:200rpx;
+  justify-content: space-between;
+}
+
+.text06{
+  font-size: 36rpx;
+  margin-left: 40rpx;
+}
+
+.pic_03{
+  width:100rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+  margin-right: 40rpx;
+}
+
+.text07{
+  font-size: 36rpx;
+  margin:60rpx 0 0 40rpx;
+  align-self: start;
+}
+
+.radio2{
+  margin: 40rpx 0 30rpx 0;
+}
+
+/* ***************** */

pages/main/docs.js

@@ -0,0 +1,65 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    ArticleList:constant.arrArticleList,
+  },
+  onLoad: function (options) {
+    var that = this;
+    var id=options.ID;
+    var arr=[];
+    var title="";
+    for(var i=0;i<that.data.ArticleList.length;i++){
+      if (id==that.data.ArticleList[i].ID){
+        arr=that.data.ArticleList[i].Content;
+        title=that.data.ArticleList[i].TitleShort;
+        break;
+      }
+    }
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ImageArr:arr,
+      ArticleID:options.ID,
+      Title:title,
+    });
+  },
+  showImage: function (e) {
+    var image = e.currentTarget.dataset.url;
+    image=this.data.ImagePath+"web/_ScoreLine/"+image;
+    wx.previewImage({
+      current: image,
+      urls: [image]
+    });    
+  },
+  goto: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  redirectTo: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.redirectTo({
+      url: url,
+    });
+  },
+  reLaunch: function (e) {
+    wx.reLaunch({
+      url: 'default',
+    })
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: this.data.Title,
+      path: app.globalData.SharePath + '?type=docs&ID='+this.data.ArticleID+'&UserID=' + app.globalData.userInfo.UserID,
+    }
+  },
+})

pages/main/docs.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/docs.wxml

@@ -0,0 +1,39 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <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="panel21 FlexColumn" >
+      <view class="panel211 FlexColumn" wx:for="{{ArticleList}}" wx:key="index" bindtap="redirectTo" data-url="docs?ID={{item.ID}}">
+        <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.TitleImage}}" class="TitleImage" src="{{ImagePath}}web/_ScoreLine/{{item.TitleImage}}"></image>
+        </view>
+        
+        <view class="line04"></view>
+      </view>
+      
+    </view>
+    <view style="height:210rpx;"></view>
+  </view>
+
+  <view class="panelFooter FlexRow" >
+    <view class="panelFooter1 FlexRow" wx:if="{{!IsCollect}}" catchtap="collectSchool" data-index="1">
+      <button open-type='share' class="share FlexRow">
+        <image class="icon_share_01" src="../images/icon_share_01.png"></image>
+        <view>转发</view>
+      </button>
+      
+    </view>
+    
+    <view class="panelFooter0 FlexRow" bindtap="reLaunch">
+      <view class="panelFooterLine"></view>
+      <view style="margin-left: 30rpx;">回首页</view>
+    </view>
+  </view>
+</view>

pages/main/docs.wxss

@@ -0,0 +1,74 @@
+.img{
+  width:100%;
+}
+
+
+.panel2{
+  width: 100%;
+  background-color: #f2f2f2;
+}
+
+.text06{
+  font-size: 36rpx;
+  margin: 60rpx 0 0 0;
+  align-self: flex-start;
+  margin-left:40rpx;
+}
+
+.panel21{
+  width: 670rpx;
+}
+.panel211{
+  width: 100%;
+  margin-top: 30rpx;
+}
+.panel2111{
+  width: 100%;
+  justify-content: space-between;
+}
+.panel21111{
+  width: 450rpx;
+  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;
+}
+
+.line04{
+  width:670rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin-top: 30rpx;
+}
+
+.imgLogo2{
+  width:24rpx;
+  height:22rpx;
+}
+
+.TitleImage{
+  width:160rpx;
+  height:84rpx;
+  border:1rpx solid #E3E3E3;
+  border-radius: 10rpx;
+}
+
+.icon_share_01{
+  width:24rpx;
+  height:24rpx;
+  margin-right: 10rpx;
+}

pages/main/feedback.js

@@ -0,0 +1,248 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    Feedback:constant.arrFeedback,
+    ImageArr:[],
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    var feedbackType=0;
+    if (options.type){
+      that.data.Feedback[0].CSS="";
+      that.data.Feedback[options.type].CSS="Selected";
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      Feedback:that.data.Feedback,
+    });
+  },
+  bindKeyInput:function(e){
+    var that=this;
+    that.setData({
+      InputValue:e.detail.value,
+    });
+  },
+  bindKeyInput2:function(e){
+    var that=this;
+    that.setData({
+      InputValue2:e.detail.value,
+    });
+  },
+  saveFeedback:function(){
+    var that=this;
+    if (!that.data.InputValue){
+      wx.showToast({
+        title: '请填写内容',
+      });
+    }
+    else if (that.data.InputValue.length<5){
+      wx.showToast({
+        title: '请多写点内容',
+      });
+    }
+    else{
+
+      wx.showLoading({
+        title: '保存中',
+        mask: true,
+      });
+      
+
+      that.uploadImageAll(that.data.ImageArr,function (success,arrResult) {
+        if (success) {
+          wx.hideLoading();         
+          var param={};
+          param.UserID=app.globalData.userInfo.UserID;
+          param.Content=that.data.InputValue;
+          param.ContactTa=that.data.InputValue2;
+          param.FeedbackType=[];
+          for(var i=0;i<that.data.Feedback.length;i++){
+            if (that.data.Feedback[i].CSS=="Selected")
+              param.FeedbackType.push(that.data.Feedback[i].Name);
+          }
+          param.FeedbackType=param.FeedbackType.join(",");
+          
+          if (arrResult.length>0)
+            param.ImageUrl1=arrResult[0].Target;
+          if (arrResult.length>1)
+            param.ImageUrl2=arrResult[1].Target;
+          if (arrResult.length>2)
+            param.ImageUrl3=arrResult[2].Target;
+          if (arrResult.length>3)
+            param.ImageUrl4=arrResult[3].Target;
+            
+          main.postData('MPSFeedback', param, function (data) {
+            wx.showModal({
+              title: '提醒',
+              content: '您的反馈已经收到，我们会尽快处理。感谢您的支持！',
+              showCancel: false,
+              complete: (res) => {
+                if (res.confirm) {
+                  wx.navigateBack({
+                    delta: 1
+                  });
+                }
+              }
+            });
+          });
+
+        } else {
+          wx.showToast({
+            title: '图片上传失败',
+            image: "../images/universalpic_exclamation_white_120x120.png",
+            mask: true,
+          });
+        }
+      });
+    }
+  },
+  //选择图片上传
+  uploadImageField: function () {
+    //console.log("uploadImageStart");
+    var that = this;
+
+    //若是安卓机
+    if (app.globalData.IsAndroid) {
+      selectImage(that);
+    } else {
+      wx.showActionSheet({
+        itemList: ['拍照', '从手机相册选择'],
+        success(res) {
+          if (res.tapIndex == 0) {
+            wx.chooseImage({
+              count: 1,
+              sizeType: ['compressed'],
+              sourceType: ['camera'],
+              success(res2) {
+                wx.showLoading({
+                  title: '请稍候',
+                  mask: true,
+                });
+                setTimeout(function () {
+                  wx.hideLoading();
+                  selectImage(that);
+                }, 2000);
+              },
+            });
+          } else if (res.tapIndex == 1) {
+            selectImage(that);
+          }
+        },
+        fail(res) {
+          console.log(res.errMsg)
+        }
+      });
+    }
+
+    function selectImage(that) {
+      var sizeType = ['album'];
+      //若是安卓机
+      if (app.globalData.IsAndroid)
+        sizeType = ['album', 'camera'];
+
+      wx.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: sizeType,
+        success(res) {
+          // tempFilePath可以作为img标签的src属性显示图片
+          var tempFilePaths = res.tempFilePaths;
+          //console.log(tempFilePaths[0]);
+          //that.data.FieldContent = that.data.FieldContent + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
+          that.data.ImageArr.push(tempFilePaths[0]);
+          that.setData({
+            ImageArr:that.data.ImageArr,
+          });
+        },
+        fail: function () {
+
+        }
+      });
+    }
+  },
+  uploadFileToServer: function (file, callback) {
+    var url = common.Encrypt("MiaoguoUploadFile2");
+    wx.showLoading({
+      title: '上传中',
+      mask: true,
+    });
+    url=app.globalData.serverUrl + url;
+    wx.uploadFile({
+      url: url,
+      filePath: file,
+      name: 'file',
+      success(res) {
+        var err = JSON.parse(res.data);
+        if (err.errcode == 10000) {
+          wx.hideLoading();
+          callback(err.result);
+        } else {
+          wx.hideLoading();
+          wx.showModal({
+            title: '上传文件失败1',
+            showCancel: false,
+            content: JSON.stringify(err.errMsg),
+          });
+        }
+      },
+      fail: function (err) {
+        wx.hideLoading();
+        wx.showModal({
+          title: '上传文件失败2',
+          showCancel: false,
+          content: JSON.stringify(err)+" url:"+url,
+        });
+      }
+    });
+  },
+
+  uploadImageAll: function (arr, callback) {
+    var that = this;
+    var b = false;
+    var arrResult = [];
+    for (var i = 0; i < arr.length; i++) {
+      var source = arr[i];
+      that.uploadFileToServer(source, function (data) {
+        if (data) {
+          var result = data;
+          result.Target = app.globalData.uploadImageUrl + result.Target;
+          arrResult.push(result);
+        }
+      });
+    }
+
+    //检查是否上传成功
+    setTimeout(function () {
+      if (arrResult.length==arr.length)
+        callback(true, arrResult);
+    }, 2000);
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      if (e.currentTarget.dataset.object=="Feedback"){
+        
+      }
+    });   
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/feedback.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "用户反馈"
+}

pages/main/feedback.wxml

@@ -0,0 +1,47 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelBasicCss panel1 FlexColumn">
+    <view class="text01">本次反馈属于以下哪一种</view>
+    <view class="panel11 FlexRow">
+      <view class="panelCheckbox panelCheckbox{{item.CSS}} FlexRow" wx:for="{{Feedback}}" wx:key="index"
+        bindtap="onSelect" data-object="Feedback" data-index="{{index}}" data-clicktype="checkbox">
+        <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+          <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+        </view>
+        <view>{{item.Name}}</view>
+      </view>
+    </view> 
+  </view>
+  <view class="panelBasicCss panel2 FlexColumn">
+    <view class="text01">留言</view>
+    <view class="panelLine3"></view>
+    <textarea class="text02" bindinput="bindKeyInput" value="{{InputValue}}" maxlength="800" placeholder="请填写至少5个汉字以上内容，以便我们准确理解您的意思。" placeholder-style="color:#787878;font-size:28rpx;font-weight:400;" />
+  </view>
+  <view class="panelBasicCss panel3 FlexColumn">
+    <view class="panel31 FlexRow">
+      <view class="text04">相关截图（选填）</view>
+      <view class="text03 FlexRow">
+        {{ImageArr.length}} / 4
+      </view>
+    </view>
+    <view class="text05">劳烦提供截图，并将错处做个记号。万分感谢。</view>
+    <view class="panel32 FlexRow">
+      <view class="panel311 FlexColumn" wx:for="{{ImageArr}}" wx:key="index">
+        <image class="ImageUpload" mode="aspectFill" src="{{item}}"></image>
+      </view>
+      <view class="panel311 FlexColumn" wx:key="index" wx:if="{{ImageArr.length<4}}" bindtap="uploadImageField">
+        <image class="icon_add_01" src="../images/icon_add_01.png"></image>
+      </view>
+    </view>
+  </view>
+
+  <view class="panelBasicCss panel4 FlexColumn">
+    <view class="text01">联系方式</view>
+    <view class="text05">劳烦提供截图，并将错处做个记号。万分感谢。</view>
+    <view class="panelLine3"></view>
+    <textarea class="text06" bindinput="bindKeyInput2" value="{{InputValue2}}" maxlength="100" placeholder="微信号（首选）、邮箱" placeholder-style="color:#787878;font-size:28rpx;font-weight:400;" />
+  </view>
+  
+  <view class="btn" bindtap="saveFeedback">提交</view>
+
+  <view style="height:200rpx"></view>
+</view>

pages/main/feedback.wxss

@@ -0,0 +1,111 @@
+.panel1{
+  height:223rpx;
+  align-items: flex-start;
+}
+
+.text01{
+  font-size:32rpx;
+  margin:0 0 0 40rpx;
+  align-self: start;
+}
+.panel11{
+  margin:30rpx 0 0 40rpx;
+}
+
+.panel2{
+  height:526rpx;
+}
+
+.panelLine3{
+  width:630rpx;
+  background-color: #d2d2d2;
+  height:1rpx;
+  margin-top: 30rpx;
+}
+
+.text02{
+  width:630rpx;
+  height:320rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  color:#2e2e2e;
+  margin-top: 30rpx;
+}
+
+.text03{
+  font-family: 'Roboto-Black';
+  font-size: 32rpx;
+}
+
+.panel3{
+  justify-content: flex-start;
+}
+
+.panel31{
+  width:630rpx;
+  justify-content: space-between;
+  margin-top: 50rpx;
+}
+
+.text04{
+  font-size:32rpx;
+  align-self: start;
+}
+.text05{
+  font-size:24rpx;
+  font-weight: 400;
+  align-self: start;
+  margin:4rpx 0 0 40rpx;
+}
+
+.panel32{
+  justify-content: flex-start;
+  margin-top: 30rpx;
+  min-width: 630rpx;
+}
+
+.panel311{
+  width:140rpx;
+  height:140rpx;
+  border-radius: 10rpx;
+  background-color: #f0f0f0;
+  border:1rpx solid #d2d2d2;
+  margin: 0 20rpx 50rpx 0;
+}
+
+.ImageUpload{
+  width:140rpx;
+  height:140rpx;
+  border-radius: 10rpx;
+}
+
+.icon_add_01{
+  width:30rpx;
+  height:30rpx;
+}
+
+.panel4{
+  min-height:283rpx;
+}
+
+.text06{
+  width:630rpx;
+  height:50rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  color:#2e2e2e;
+  margin-top: 30rpx;
+}
+
+.btn{
+  width:710rpx;
+  height:110rpx;
+  line-height: 110rpx;
+  text-align: center;
+  border: 3rpx solid #EB5C28;
+  margin-top: 40rpx;
+  border-radius: 20rpx;
+  background-color: #FCE9E3;
+  color:#EB5C28;
+  font-size: 36rpx;
+}

pages/main/imagelist.js

@@ -0,0 +1,39 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: { 
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    var arr=options.ImageOtherStr.split(",");
+
+    var title="校园风光·"+options.SchoolShortName;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      SchoolFullName:options.SchoolFullName,
+      ImageOtherArr:arr,
+      Title:title,
+      ID:options.ID,
+    });
+    wx.setNavigationBarTitle({
+      title: title,
+    });
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var title=that.data.Title;
+    return {
+      title: title,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID+'&type=school&ID='+that.data.ID,
+    }
+  },
+})

pages/main/imagelist.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/imagelist.wxml

@@ -0,0 +1,3 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class="img" mode="widthFix" src="{{ImagePath}}web/_School/{{item}}" wx:for="{{ImageOtherArr}}" wx:key="index"></image>
+</view>

pages/main/imagelist.wxss

@@ -0,0 +1,15 @@
+.container{
+  justify-content: flex-start;
+}
+
+.text01{
+  font-size:48rpx;
+  font-weight: 400;
+  margin: 60rpx 0 50rpx 30rpx;
+  align-self: start;
+}
+
+.img{
+  width: 750rpx;
+  margin-bottom: 20rpx;
+}

pages/main/map.js

@@ -0,0 +1,321 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+var mapSetting = {
+  latitude: 31.232116445550176,
+  longitude: 121.47281159374998,
+  scale: 9,
+};
+
+Page({
+  data: {
+    latitude: mapSetting.latitude,
+    longitude: mapSetting.longitude,
+    scale: mapSetting.scale,
+    markers: [],
+    SchoolType: constant.arrSchoolType,
+  },
+  onReady: function (e) {
+    this.mapCtx = wx.createMapContext('myMap');
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      PageType: options.PageType,
+      SchoolTypeIndex: -1,
+      Options: options,
+      School: [],
+    });
+
+    var title = "";
+    if (options.PageType == 1) {
+      title = "校址·" + options.SchoolShortName;
+      for (var j = 0; j < that.data.SchoolType.length; j++) {
+        that.data.SchoolType[j].CSS = "";
+      }
+      that.setData({
+        SchoolType: that.data.SchoolType,
+        SchoolName:options.SchoolShortName,
+      });
+    } else if (options.PageType == 2) {
+      title = "地图·" + options.DistrictName;
+      that.setData({
+        SchoolTypeIndex: 0,
+        DistrictName:options.DistrictName,
+      });
+    } else if (options.PageType == 3) {
+      for (var j = 0; j < that.data.SchoolType.length; j++) {
+        that.data.SchoolType[j].CSS = "Selected";
+      }
+      that.setData({
+        SchoolType: that.data.SchoolType
+      });
+      title = "高中校址地图";
+      that.setData({
+        SchoolTypeIndex: 0,
+      });
+    }
+
+    wx.setNavigationBarTitle({
+      title: title,
+    });
+
+    that.setMap();
+  },
+  mapChange: function (e) {
+    if (e.type == "end") {
+      mapSetting = {
+        latitude: e.detail.centerLocation.latitude,
+        longitude: e.detail.centerLocation.longitude,
+        scale: e.detail.scale,
+      };
+    }
+  },
+  onSelect: function (event) {
+    var that = this;
+    main.onSelect(that, event, function (obj, e, result) {
+      if (e.currentTarget.dataset.object == "SchoolType") {
+
+        var selectIndex = e.currentTarget.dataset.index;
+        var selectText = that.data.SchoolType[selectIndex].Name;
+        var isSelect = that.data.SchoolType[selectIndex].CSS == "Selected";
+
+        that.setData({
+          SchoolType: that.data.SchoolType,
+          latitude: mapSetting.latitude,
+          longitude: mapSetting.longitude,
+          scale: mapSetting.scale,
+        });
+        that.setMap();
+      }
+    });
+  },
+  setMap: function () {
+    var that = this;
+    var markers = [];
+
+    that.getCurrentPosition(that, markers, function (markers) {
+      that.getCurrentSchoolPosition(that, markers, function (markers) {
+        that.getSchoolPosition(that, markers, function (markers) {
+          that.setData({
+            markers: markers,
+          });
+        });
+      });
+    });
+  },
+
+  getCurrentPosition: function (obj, markers, callback) {
+    var that = this;
+    wx.getLocation({
+      type: 'wgs84',
+      success(res) {
+        var mypos = {
+          id: 9999,
+          latitude: res.latitude,
+          longitude: res.longitude,
+          zIndex: 10,
+          callout: {
+            content: "我的位置",
+            color: '#EB5C28',
+            fontSize: 14,
+            borderWidth: 2,
+            borderRadius: 10,
+            borderColor: '#EB5C28',
+            padding: 5,
+            display: 'ALWAYS',
+            textAlign: 'center'
+          },
+        }
+        markers.push(mypos);
+        callback(markers);
+      },
+      fail(res) {
+        callback(markers);
+      }
+    });
+  },
+  getCurrentSchoolPosition: function (obj, markers, callback) {
+
+    if (obj.data.Options.ID) {
+      var arr1 = obj.data.Options.Coordinates.split(",");
+
+      obj.setData({
+        Address: obj.data.Options.Address,
+      });
+
+      var pos = {
+        id: Number(obj.data.Options.ID),
+        latitude: arr1[0],
+        longitude: arr1[1],
+        zIndex: 9,
+        callout: {
+          content: obj.data.Options.Name,
+          color: '#EB5C28',
+          fontSize: 14,
+          borderWidth: 2,
+          borderRadius: 10,
+          borderColor: '#EB5C28',
+          padding: 5,
+          display: 'ALWAYS',
+          textAlign: 'center'
+        },
+      }
+      markers.push(pos);
+    }
+    callback(markers);
+
+  },
+  getDistrict: function (obj, markers, callback) {
+    var that=this;
+    if (obj.data.School.length > 0)
+      callback(markers);
+    else {
+      var arr=[];
+      if (that.data.PageType == 3) {
+        main.getCollect(function(data){
+          arr=getSchool(data["收藏的高中"]);
+          obj.setData({
+            School: arr,
+          });
+          callback(markers);
+        });
+      } else {
+        wx.showLoading();
+        main.getData("GetMPSSchool?SchoolType1=高中&DistrictID=" + Number(obj.data.Options.DistrictID), function (data) {
+          arr=getSchool(data);
+          obj.setData({
+            School: arr,
+          });
+          callback(markers);
+          setTimeout(function () {
+            wx.hideLoading();
+          }, 800);
+        });
+      }
+      
+    }
+
+    function getSchool(data){
+      var arr = [];
+      for (var i = 0; i < data.length; i++) {
+        var item = data[i];
+        var school = {};
+        school.ID = item.ID;
+        school.Name = item.SchoolShortName;
+        school.IsSchoolType2Short = false;
+        if (item.SchoolType2Short == "市重点")
+          school.IsSchoolType2Short = true;
+        if (item.Coordinates) {
+          var arr1 = item.Coordinates.split(",");
+          school.Latitude = arr1[0];
+          school.Longitude = arr1[1];
+          if (item.SchoolType2Short == "区重点（特色）")
+            item.SchoolType2Short = item.SchoolType2Short.substr(0, 3);
+          school.SchoolType2Short = item.SchoolType2Short;
+          arr.push(school);
+        }
+      }
+      return arr;
+    }
+  },
+  getSchoolPosition: function (obj, markers, callback) {
+    var that = this;
+    obj.getDistrict(obj, markers, function (markers) {
+
+      for (var i = 0; i < obj.data.School.length; i++) {
+        var item = obj.data.School[i];
+
+        item.IsSchoolType2Short = false;
+        for (var j = 0; j < that.data.SchoolType.length; j++) {
+          if (that.data.SchoolType[j].CSS == "Selected" &&
+            item.SchoolType2Short == that.data.SchoolType[j].Name)
+            item.IsSchoolType2Short = true;
+        }
+
+        if (item.IsSchoolType2Short &&
+          (!obj.data.Options.ID || (obj.data.Options.ID && obj.data.Options.ID != item.ID))) {
+          var pos = {
+            id: item.ID,
+            latitude: item.Latitude,
+            longitude: item.Longitude,
+            alpha: 0.8,
+            callout: {
+              content: item.Name,
+              color: '#4D4D4D',
+              fontSize: 14,
+              borderWidth: 2,
+              borderRadius: 10,
+              borderColor: '#4D4D4D',
+              bgColor: '#fff',
+              padding: 5,
+              display: 'ALWAYS',
+              textAlign: 'center'
+            },
+          }
+          markers.push(pos);
+        }
+      }
+      callback(markers);
+    });
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  copyUrl:function(e){
+    var url=e.currentTarget.dataset.url;
+    wx.setClipboardData({
+      data: url,
+      success (res) {
+        wx.showToast({
+          title: '已复制',
+        });
+      }
+    });
+  },
+  onMarkerTap(e) {
+    //console.log('@@ markertap', e)
+    this.gotoSchool(e);
+  },
+  onCalloutTap(e) {
+    //console.log('@@ onCalloutTap', e)
+    this.gotoSchool(e);
+  },
+  onLabelTap(e) {
+    //console.log('@@ labletap', e)
+    this.gotoSchool(e);
+  },
+  gotoSchool(e){
+    var id=e.detail.markerId;
+    if (id<9999)
+      main.goto({currentTarget:{dataset:{url:"school?ID="+id}}});
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var title="上海中招";
+    var path=app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID;
+    if (that.data.PageType == 1) {
+      title+="校址·"+that.data.SchoolName;
+      path+='&type=school&ID='+that.data.Options.ID;
+    }
+    else if (that.data.PageType == 2) {
+      title+="学校地图·"+that.data.DistrictName;
+      path+='&type=district&ID='+that.data.DistriceID+'&Name='+that.data.DistrictName;
+    }
+    else{
+      title=app.globalData.ShareTitle;
+    }
+    debugger;
+    return {
+      title: title,
+      path: path
+    }
+  },
+})

pages/main/map.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/map.wxml

@@ -0,0 +1,39 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelMap FlexColumn">
+    <view class="panelMap1 FlexRow" wx:if="{{PageType==1}}" bindtap="copyUrl" data-url="{{Address}}">
+      <image class="icon_loc_01" src="../images/icon_loc_01.png"></image>
+      <text class="panelMapAddress">{{Address}}</text>
+      <view class="panelMapAddress1">复制</view>
+    </view>
+    <view class="panelBasicCss panelMap2 FlexRow">
+      <view class="FlexRow">
+        <image class="panelCheckbox_icon_filter_01" src="../images/icon_filter_01.png"></image>
+        <view class="panelMap21" wx:if="{{PageType==1}}">本区其它高中</view>
+        <view class="panelCheckbox panelCheckbox{{item.CSS}} FlexRow" wx:for="{{SchoolType}}" wx:key="index" wx:if="{{item.SchoolType1=='高中'}}"
+        bindtap="onSelect" data-object="SchoolType" data-index="{{index}}" data-clicktype="checkbox">
+          <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+            <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+          </view>
+          <view>{{item.Name}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <map class="map" style='min-height:{{Containnerheight}}rpx;' 
+    id="myMap" 
+    latitude="{{latitude}}"
+    longitude="{{longitude}}" 
+    markers="{{markers}}" 
+    scale="{{scale}}" 
+    bindregionchange="mapChange"
+    bindmarkertap="onMarkerTap"
+    bindcallouttap="onCalloutTap"
+    bindlabeltap="onLabelTap">
+  </map>
+
+  <view class="panelFooter FlexRow" >
+    <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedback">
+      <view class="panelFooterBottom panelFooter211">纠错</view>
+    </view>
+  </view>
+</view>

pages/main/map.wxss

@@ -0,0 +1,101 @@
+.panelMap{
+  position: fixed;
+  width:100%;
+  top:0rpx;
+  z-index: 10;
+  background-color: #F0F0F0;
+  border-bottom: 2rpx solid #e2e2e2;
+}
+.panelMap1{
+  margin-top: 30rpx;
+  width:100%;
+  justify-content: flex-start;
+}
+
+.icon_loc_01{
+  width:20rpx;
+  height:24rpx;
+  margin-left: 50rpx;
+}
+
+.panelMapAddress{
+  font-size:28rpx;
+  margin-left: 24rpx;
+  font-weight: 400;
+}
+.panelMapAddress1{
+  font-size:28rpx;
+  margin-left: 20rpx;
+  color:#EB5C28;
+}
+
+.panelMap2{
+  margin-top: 30rpx;
+  height: 88rpx;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+}
+
+.panelMap21{
+  font-size: 20rpx;
+  margin-right: 30rpx;
+}
+
+.panelLine3{
+  margin-left: 28rpx;
+  width:2rpx;
+  height:50rpx;
+  background-color: #d2d2d2;
+}
+
+
+.panelMap22{
+  width:116rpx;
+  height:80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  color:#EB5C28;
+  font-size:28rpx;
+}
+
+.panelCheckbox{
+  padding: 0 15rpx;
+}
+
+/* ************ */
+
+.map{
+  width:100%;
+  margin-top: 30rpx;
+}
+
+.customCallout {
+  box-sizing: border-box;
+  background-color: #fff; 
+  border: 1px solid #ccc;
+  border-radius: 30px;
+  width: 150px;
+  height: 40px;
+  display: inline-flex;
+  padding: 5px 20px;
+  justify-content: center;
+  align-items: center;
+}
+
+.circle {
+  width: 20px;
+  height: 20px;
+  border: 1px solid #ccc;
+  border-radius: 50%;
+}
+
+.icon {
+  width: 16px;
+  height: 16px;
+}
+
+.content {
+  flex: 0 1 auto;
+  margin: 0 10px;
+  font-size: 14px;
+}

pages/main/recruitment.js

@@ -0,0 +1,134 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+var DistrictName="";
+Page({
+  data: {
+    Years:constant.arrYear,
+    YearIndex:0,
+    District:[],
+    ListNullData:false,
+    PublicOrPrivate2:constant.arrPublicOrPrivate2,
+    PanelType:1,//1是自主招生，2是国际班
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    var districtID=0;
+
+    var title="自招·市重点和特高";
+    if (Number(options.PanelType)==2){
+      districtID=-1;
+      title="自招·国际和中外合办";
+    }
+    else{
+      districtID=Number(options.DistrictID);
+      var arr=[{ID:0,Name:"委属",CSS:""}];
+      for(var i=0;i<constant.arrDistrict.length;i++){
+        var obj={};
+        obj.ID=Number(constant.arrDistrict[i].ID);
+        obj.Name=constant.arrDistrict[i].Name.substr(0,2);
+        obj.CSS="";
+        arr.push(obj);
+      }
+      arr[districtID].CSS="Selected";
+      DistrictName=arr[districtID].Name;
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      District:arr,
+      PanelType:options.PanelType,
+      DistrictID:districtID,
+      YearIndex:0,
+    });    
+
+    wx.setNavigationBarTitle({
+      title: title,
+    });
+
+    that.init();
+  },
+  init:function(){
+    var that = this;
+    var districtID=Number(that.data.DistrictID);
+    var year=that.data.Years[that.data.YearIndex].Name;
+    var scoreTypeID="自主招生";
+    wx.showLoading();
+    main.getData("GetMPSScore?ScoreYear="+year+"&ScoreType="+scoreTypeID+"&DistrictID="+districtID, function (data) {
+      if (data) {
+        for(var i=0;i<data.length;i++){
+          var item=data[i];
+          item.IsPublicOrPrivate=true;
+        }
+        for(var i=0;i<that.data.PublicOrPrivate2.length;i++){
+          var item=that.data.PublicOrPrivate2[i];
+          item.CSS="Selected";
+        }
+        
+        that.setData({
+          List:data,
+          PublicOrPrivate2:that.data.PublicOrPrivate2,
+        });
+      }
+      setTimeout(function(){
+        wx.hideLoading();
+      },800);
+    });
+  },
+  
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      if (e.currentTarget.dataset.object=="District"){
+        that.setData({
+          DistrictID:e.currentTarget.dataset.index,
+        });
+        that.init();
+      }
+      else if (e.currentTarget.dataset.object=="Years"){
+        that.setData({
+          YearIndex:e.currentTarget.dataset.index,
+        });
+        that.init();
+      }
+      else if (e.currentTarget.dataset.object=="PublicOrPrivate2"){
+        var selectIndex=e.currentTarget.dataset.index;
+        var selectText=that.data.PublicOrPrivate2[selectIndex].Name;
+        var isSelect=that.data.PublicOrPrivate2[selectIndex].CSS=="Selected";
+        
+        var isNull=true;
+        for(var i=0;i<that.data.List.length;i++){
+          var item=that.data.List[i];
+          if (selectText==item.PublicOrPrivate)
+            item.IsPublicOrPrivate=isSelect;   
+            
+          if (item.IsPublicOrPrivate)
+            isNull=false;
+        }
+        that.setData({
+          List:that.data.List,
+          ListNullData:isNull,
+        });
+      }
+    });   
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var title="上海中招自主招生";
+    if (that.data.DistrictID>=0)
+      title="上海中招自主招生·"+DistrictName;
+    return {
+      title: title,
+      path: app.globalData.SharePath + '?type=recruitment&PanelType='+that.data.PanelType+'&DistrictID='+that.data.DistrictID+'&UserID=' + app.globalData.userInfo.UserID,
+    }
+  },
+})

pages/main/recruitment.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/recruitment.wxml

@@ -0,0 +1,173 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view style="width: 40rpx;"></view>
+    <view class="panelTop1 FlexColumn" wx:for="{{Years}}" wx:key="index" bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio">
+      <view class="panelTop1Text01 panelTop1Text01{{item.CSS}}">{{item.Name}}年</view>
+      <view class="panelTop1Line01 panelTop1Line01{{item.CSS}}"></view>
+    </view>
+  </view>
+  <view style="height: 100rpx;"></view>
+
+  <!-- 自主招生 -->
+  <view class="panelBasicCss panelTop0" wx:if="{{PanelType==1}}">
+    <view class="panelTop00 FlexRow">
+      <view class="panelTop01 panelTop01{{item.CSS}}" wx:for="{{District}}" wx:key="index" bindtap="onSelect" data-object="District" data-index="{{index}}" data-clicktype="radio">
+        <view class="panelTop01Text panelTop01Text{{item.CSS}}">{{item.Name}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 国际班招生 -->
+  <view class="panelBasicCss panelTop2 FlexRow" wx:if="{{PanelType==2}}">
+    <image class="panelCheckbox_icon_filter_01 icon_filter_01" src="../images/icon_filter_01.png"></image>
+    <view class="panelTop21 FlexRow">
+      <!-- 公办民办 -->
+      <view class="panelCheckbox checkbox2 panelCheckbox{{item.CSS}} FlexRow" wx:for="{{PublicOrPrivate2}}" wx:key="index" bindtap="onSelect" data-object="PublicOrPrivate2" data-index="{{index}}" data-clicktype="checkbox">
+        <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+          <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+        </view>
+        <view>{{item.Name}}</view>
+      </view>
+    </view>
+  </view>
+
+  <view class="panelBasicCss panelMain FlexColumn">
+    <view style="height:20rpx;"></view>
+
+
+    <view class="panelItem FlexColumn" wx:for="{{List}}" wx:key="index" wx:if="{{((PanelType==1 && item['学科']>0) || (PanelType==2 && item['国际']>0)) && item.IsPublicOrPrivate}}" bindtap="goto" data-url="school?ID={{item.ID}}">
+      <view class="panelItem1 FlexColumn">
+        <view class="panelText01">{{item.SchoolFullName}}</view>
+        <view class="FlexRow">
+          <view class="panelItem11 FlexRow">
+            <view>
+              <block wx:if="{{PanelType==2}}">{{item.DistrictNameArea}}</block> {{item.SchoolType2Short}}
+            </view>
+            <view class="panelLine2"></view>
+            <view>{{item.PublicOrPrivate}}</view>
+            <view class="panelLine2" wx:if="{{item.Accommodation}}"></view>
+            <view>{{item.Accommodation}}</view>
+          </view>
+        </view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <block wx:if="{{PanelType==1}}">
+          <view class="panelItem21 FlexColumn">
+            <view>学科优秀生</view>
+            <view class="panelItem210 FlexRow">
+              <view class="panelText02">{{item['学科']}}</view>
+              <view class="panelItem211 FlexRow" wx:if="{{item['学科差']!==null}}">
+                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item['学科差']>0}}"></image>
+                <view class="panelScoreNumber02" wx:if="{{item['学科差']>0}}">{{item['学科差']}}</view>
+                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item['学科差']<0}}"></image>
+                <view class="panelScoreNumber03" wx:if="{{item['学科差']<0}}">{{-item['学科差']}}</view>
+                <view class="panelScoreText04" wx:if="{{item['学科差']==0}}">平</view>
+              </view>
+            </view>
+          </view>
+          <view class="panelLine4"></view>
+          <view class="panelItem21 FlexColumn">
+            <view>优秀体育生</view>
+            <view class="panelItem210 FlexRow">
+              <view class="panelText02 panelText02{{item['体育']}}">{{item['体育']}}</view>
+              <view class="panelItem211 FlexRow" wx:if="{{item['体育差']!==null}}">
+                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item['体育差']>0}}"></image>
+                <view class="panelScoreNumber02" wx:if="{{item['体育差']>0}}">{{item['体育差']}}</view>
+                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item['体育差']<0}}"></image>
+                <view class="panelScoreNumber03" wx:if="{{item['体育差']<0}}">{{-item['体育差']}}</view>
+                <view class="panelScoreText04" wx:if="{{item['体育差']==0}}">平</view>
+              </view>
+            </view>
+          </view>
+          <view class="panelLine4"></view>
+          <view class="panelItem21 FlexColumn">
+            <view>艺术骨干生</view>
+            <view class="panelItem210 FlexRow">
+              <view class="panelText02 panelText02{{item['艺术']}}">{{item['艺术']}}</view>
+              <view class="panelItem211 FlexRow" wx:if="{{item['艺术差']!==null}}">
+                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item['艺术差']>0}}"></image>
+                <view class="panelScoreNumber02" wx:if="{{item['艺术差']>0}}">{{item['艺术差']}}</view>
+                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item['艺术差']<0}}"></image>
+                <view class="panelScoreNumber03" wx:if="{{item['艺术差']<0}}">{{-item['艺术差']}}</view>
+                <view class="panelScoreText04" wx:if="{{item['艺术差']==0}}">平</view>
+              </view>
+            </view>
+
+          </view>
+        </block>
+        <block wx:if="{{PanelType==2}}">
+
+          <view class="panelItem21 panelItem22 FlexColumn">
+            <view>招生总数</view>
+            <view class="panelItem210 FlexRow">
+              <view class="panelText02">{{item['国际']}}</view>
+              <view class="panelItem211 FlexRow" wx:if="{{item['国际差']!==null}}">
+                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item['国际差']>0}}"></image>
+                <view class="panelScoreNumber02" wx:if="{{item['国际差']>0}}">{{item['国际差']}}</view>
+                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item['国际差']<0}}"></image>
+                <view class="panelScoreNumber03" wx:if="{{item['国际差']<0}}">{{-item['国际差']}}</view>
+                <view class="panelScoreText04" wx:if="{{item['国际差']==0}}">平</view>
+              </view>
+            </view>
+          </view>
+          <view class="panelLine4 panelLine5"></view>
+          <view class="panelItem21 panelItem23 FlexColumn">
+            <view>本市生源</view>
+            <view class="panelItem210 FlexRow">
+              <view class="panelText02 panelText02{{item['国际(本市)']}}">{{item['国际(本市)']}}</view>
+              <view class="panelItem211 FlexRow" wx:if="{{item['国际(本市)差']!==null}}">
+                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item['国际(本市)差']>0}}"></image>
+                <view class="panelScoreNumber02" wx:if="{{item['国际(本市)差']>0}}">{{item['国际(本市)差']}}</view>
+                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item['国际(本市)差']<0}}"></image>
+                <view class="panelScoreNumber03" wx:if="{{item['国际(本市)差']<0}}">{{-item['国际(本市)差']}}</view>
+                <view class="panelScoreText04" wx:if="{{item['国际(本市)差']==0}}">平</view>
+              </view>
+            </view>
+          </view>
+          <view class="panelItem21 panelItem24 FlexColumn">
+            <view>非本市生源</view>
+            <view class="panelItem210 FlexRow">
+              <view class="panelText02 panelText02{{item['国际(非本市)']}}">{{item['国际(非本市)']}}</view>
+              <view class="panelItem211 FlexRow" wx:if="{{item['国际(非本市)差']!==null}}">
+                <image class="icon_up_01" src="../images/icon_up_01.png" wx:if="{{item['国际(非本市)差']>0}}"></image>
+                <view class="panelScoreNumber02" wx:if="{{item['国际(非本市)差']>0}}">{{item['国际(非本市)差']}}</view>
+                <image class="icon_up_01" src="../images/icon_down_01.png" wx:if="{{item['国际(非本市)差']<0}}"></image>
+                <view class="panelScoreNumber03" wx:if="{{item['国际(非本市)差']<0}}">{{-item['国际(非本市)差']}}</view>
+                <view class="panelScoreText04" wx:if="{{item['国际(非本市)差']==0}}">平</view>
+              </view>
+            </view>
+
+          </view>
+        </block>
+      </view>
+
+      <view class="panelLine panelLine3"></view>
+    </view>
+
+    <view class="panelFooter FlexRow">
+      <view class="panelFooter1 FlexRow">
+        <button open-type='share' class="share FlexRow">
+          <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_share_01.png"></image>
+          <view class="panelFooterBottom">转发</view>
+        </button>
+      </view>
+      <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedback">
+        <view class="panelFooterLine panelFooterBottom" wx:if="{{PageType=='scoreline'}}"></view>
+        <view class="panelFooterBottom panelFooter21">纠错</view>
+      </view>
+      <view class="panelFooter3 FlexRow" catchtap="returnTop">
+        <view class="panelFooterLine panelFooterBottom"></view>
+        <image class="panelFooterBottom panelFooter_icon_b2t_01" src="../images/icon_b2t_01.png"></image>
+      </view>
+    </view>
+
+    <block wx:if="{{ListNullData}}">
+      <image class="icon_sys_121" src="../images/icon_sys_12.png"></image>
+      <view class="textNull">没有内容</view>
+    </block>
+
+    <view style="height:50rpx;"></view>
+  </view>
+
+  <view style="height: 210rpx;"></view>
+</view>

pages/main/recruitment.wxss

@@ -0,0 +1,109 @@
+
+.panelTop2{
+  height:88rpx;
+  justify-content: flex-start;
+}
+
+.panelMain{
+
+}
+.panelItem{
+  width:100%;
+  align-items: flex-end;
+}
+
+.panelItem1{
+  width:680rpx;
+  align-items: flex-start;
+  margin-top: 30rpx;
+}
+
+.panelText01{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-bottom: 10rpx;
+}
+.panelText03{
+  width:200rpx;
+}
+.panelItem11{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-right: 30rpx;
+  color:#787878;
+}
+
+
+.panelItem2{
+  width:680rpx;
+  justify-content: flex-start;
+  font-size: 20rpx;
+  font-weight: 400;
+  margin-top: 30rpx;
+  color:#787878;
+  position: relative;
+}
+
+
+.panelText02{
+  font-size:32rpx;
+  font-family: 'Roboto-Black';
+  color:#2E2E2E;
+}
+.panelText020{
+  color:#9B9B9B;
+}
+
+.panelItem21{
+  width:190rpx;
+  align-items: flex-start;
+}
+
+.panelItem210{
+  margin-top: 4rpx;
+}
+
+.panelItem22{
+  width: 410rpx;
+}
+
+.panelItem23{
+  position: absolute;
+  left:360rpx;
+}
+
+.panelItem24{
+  position: absolute;
+  left:540rpx;
+}
+
+.panelItem211{
+  margin-left: 10rpx;
+}
+
+.icon_sys_121{
+  width:50rpx;
+  height:60rpx;
+  margin-top: 120rpx;
+}
+
+.textNull{
+  font-size: 36rpx;
+  margin: 30rpx 0 110rpx 0;
+}
+
+.panelLine4{
+  width:2rpx;
+  height:30rpx;
+  background-color: #d2d2d2;
+  margin-right: 88rpx;
+}
+
+.panelLine5{
+  position: absolute;
+  left:290rpx;
+}
+
+.panelLine3{
+  margin-top:30rpx;
+}

pages/main/school.js

@@ -0,0 +1,215 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    PageType:"school",
+    ScoreTypeID:1,//四种得分类型
+    IsFold:false,
+    Years:constant.arrYear,
+    YearIndex:0,
+    ImagePath: app.globalData.uploadImageUrl,
+    ScoreType:constant.arrScoreType,
+    TailScore:constant.arrTailScore,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      SchoolID:options.ID,
+      IsCollect:false,
+    });
+    if (!options.ID){
+      wx.navigateBack({
+        delta: 1,
+      });
+    }
+    else
+      that.init();
+
+  },
+  init:function(){
+    var that = this;
+    wx.showLoading({title:"加载中"});
+    main.getData("GetMPSSchoolInfo?SchoolID="+that.data.SchoolID, function (data) {
+      if (data) {
+        var list=[];
+        that.data.ScoreTypeID=1;
+        if (data['1-15志愿'] && !(data['自主招生'])){
+          that.data.ScoreTypeID=4;
+          var name=that.data.ScoreType[that.data.ScoreTypeID-1].Name;
+          list=data[name][that.data.YearIndex].List;
+        }
+        else if (data['名额到校'] && data.SchoolType1=='初中'){
+          that.data.ScoreTypeID=3;
+          var name=that.data.ScoreType[that.data.ScoreTypeID-1].Name;
+          list=data[name][that.data.YearIndex].List;
+        }
+
+        wx.setNavigationBarTitle({
+          title: data.SchoolType1,
+        });
+
+        var schoolList=wx.getStorageSync('CollectList');
+        if (schoolList && schoolList["收藏的"+data.SchoolType1]){
+          schoolList=schoolList["收藏的"+data.SchoolType1];
+          for(var i=0;i<schoolList.length;i++){
+            
+            if (that.data.SchoolID==schoolList[i].ID){
+              that.setData({
+                IsCollect:true,
+              });
+              break;
+            }
+          }
+        }
+
+        //data.Website="http://www.gezhi.sh.cn/infoweb/index.aspx?wzid=2";
+        
+        if (data.Website && data.Website.length>26){
+          var str1=data.Website.substr(0,26);
+          var str2=data.Website.substr(26);
+          data.WebsiteStr=str1+"\n"+str2;
+        }
+        else
+          data.WebsiteStr=data.Website;
+        
+        if (data.ImageOther)
+          data.ImageOtherStr=data.ImageOther.join(",");
+
+        //将保存的用户习惯（显示列表样式）提取出来
+        var isListAll=wx.getStorageSync('TailScore');
+        if (isListAll){
+          that.data.TailScore[0].CSS="Selected";
+        }
+
+        that.setData({
+          Info:data,
+          ScoreTypeID:that.data.ScoreTypeID,
+          List:list,
+          IsListAll:isListAll,
+          TailScore:that.data.TailScore,
+          Title:data.SchoolType1,
+        });
+      }
+      setTimeout(function(){
+        wx.hideLoading();
+      },800);
+    });
+  },
+  collectSchool:function(e){
+    var that=this;
+    var IsCollect=Number(e.currentTarget.dataset.index);
+    main.getData("UpdateMPSSchoolCollect?SchoolID="+that.data.SchoolID+"&UserID="+app.globalData.userInfo.UserID+"&IsCollect="+IsCollect, function (data) {
+      
+      var title="收藏完成";
+      if (!IsCollect)
+        title="取消收藏完成";
+      wx.showToast({
+        title: title,
+      });
+      that.setData({
+        IsCollect:IsCollect,
+      });
+      wx.removeStorageSync('CollectList');
+      //获得收藏学校数据
+      main.getCollect();
+    });
+  },
+  goto: function (e) {
+    // var url=e.currentTarget.dataset.url;
+    // if (url.indexOf("PageType=school")>0){
+    //   url=url.replace("PageType=school&","");
+    //   if (url.substr(url.length-3)!="ID="){
+    //     wx.redirectTo({
+    //       url: url,
+    //     });
+    //   }
+    // }
+    // else{    
+    //   var b=true;
+    //   if (e.currentTarget.dataset.url.substr(0,3)=="map" && !e.currentTarget.dataset.isgoto)
+    //     b=false;
+    //   if (b)
+    //     main.goto(e);
+    // }
+
+    main.goto(e);
+  },
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      if (e.currentTarget.dataset.object=="TailScore"){
+        that.setData({
+          IsListAll: result,
+        });
+        wx.setStorageSync('TailScore', result);
+      }
+      else if (e.currentTarget.dataset.object=="ScoreType"){
+        var name=that.data.ScoreType[e.currentTarget.dataset.index].Name;
+        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,
+        });
+      }
+      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;
+        that.setData({
+          List:list,
+          YearIndex:e.currentTarget.dataset.index
+        });
+      }
+    });   
+  },
+  onFold:function(e){
+    var that=this;
+    that.setData({
+      IsFold: !that.data.IsFold,
+    });
+  },
+  copyUrl:function(e){
+    var url=e.currentTarget.dataset.url;
+    wx.setClipboardData({
+      data: url,
+      success (res) {
+        wx.showToast({
+          title: '已复制',
+        });
+      }
+    });
+  },
+  returnTop:function(){
+    main.returnTop();
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onUpdateTitle:function(){
+    if (app.globalData.userInfo.UserID<6){
+      wx.setNavigationBarTitle({
+        title: "秒过分数线·小程序",
+      });
+    }
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var name="中考招生信息：";
+    if (that.data.Info.SchoolType1=="初中")
+      name+=that.data.Info.SchoolFullName;
+    else
+      name+=that.data.Info.SchoolShortName;
+    
+    return {
+      title: name,
+      path: app.globalData.SharePath+'?UserID=' + app.globalData.userInfo.UserID+'&type=school&ID=' + that.data.Info.ID,
+    }
+  },
+})

pages/main/school.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/school.wxml

@@ -0,0 +1,326 @@
+<import src="../template/componentList.wxml" />
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelSchool1 panelBasicCss FlexColumn">
+    
+    <image wx:if="{{Info.ImageUrl && Info.SchoolType1=='高中'}}" class="panelSchoolImage" src="{{ImagePath}}web/_School/{{Info.ImageUrl}}"></image>
+    <image wx:if="{{Info.ImageLogo && Info.SchoolType1=='高中'}}" class="panelSchoolLogo" src="{{ImagePath}}web/_School/{{Info.ImageLogo}}"></image>
+    
+    <view wx:if="{{!Info.ImageUrl && Info.SchoolType1=='高中'}}" class="panelNullImage FlexColumn">
+      <image class="icon_sys_13" src="../images/icon_sys_13.png"></image>
+      <view class="">暂无学校图片</view>
+
+      <view class="btnHelp" bindtap="goto" data-url="feedback?type=1">帮忙补充</view>
+    </view>
+    <view class="panelSchoolText01">{{Info.SchoolFullName}}</view>
+    <view class="panelSchool11 FlexRow">
+      <view class="panelSchoolText02">{{Info.District}}</view>
+      <block wx:if="{{Info.PublicOrPrivate}}">
+        <view class="panelLine2"></view>
+        <view class="panelSchoolText02">{{Info.PublicOrPrivate}}</view>
+      </block>
+      <block wx:if="{{Info.SchoolType1=='初中'}}">
+        <view class="panelLine2"></view>
+        <view class="panelSchoolText02">{{Info.SchoolType1}}</view>
+      </block>
+    </view>
+    <view wx:if="{{Info.SchoolType2}}" class="panelSchoolText03">{{Info.SchoolType2}}<block wx:if="{{Info.SchoolType2Short!='一般高中'}}">（{{Info.SchoolType2Short}}）</block></view>
+    <view wx:if="{{Info.SchoolType1=='高中'}}" class="panelSchool12 FlexRow">
+      <view class="panelSchool121 FlexColumn">
+        <view class="panelSchoolText04">学校简称</view>
+        <text class="panelSchoolText05">{{Info.SchoolShortName}}
+        <block wx:if="{{0}}">\n{{Info.SchoolOtherName}}</block></text>
+      </view>
+      <view class="FlexColumn">
+        <view class="panelSchoolText04">招生代码</view>
+        <view class="panelSchoolText06">{{Info.SchoolNumber}}</view>
+      </view>
+      <view class="panelSchool122 FlexColumn">
+        <view class="panelSchoolText04">寄宿条件</view>
+        <view class="panelSchoolText05">{{Info.Accommodation}}</view>
+      </view>
+    </view>
+
+    <view wx:if="{{!Info.HasSameName}}" style="height: 30rpx;"></view>
+    <view wx:if="{{Info.HasSameName}}" class="panelMarginTop panelLine"></view>
+    <view wx:if="{{Info.HasSameName}}" class="panelSchool13 FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{Info.HasSameName}}">
+      <view class="panelSchool41">同校<block wx:if="{{Info.SchoolType1=='高中'}}">初中</block><block wx:if="{{Info.SchoolType1=='初中'}}">高中</block>部主页</view>
+      <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+    </view>
+    <view style="height: 20rpx;"></view>
+  </view>
+
+  <view class="panelBasicCss panelMain FlexColumn" wx:if="{{Info.HasData}}">
+    <block wx:if="{{Info['自主招生']}}">
+      <view class="panelSchoolText08">招生计划{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}</view>
+      <view class="panelSchool31 FlexRow">
+        <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>
+          <view class="panelSchoolText061" wx:if="{{!Info[item.Name][Info[item.Name].length-2].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>
+          </view>
+        </view>
+      </view>
+      <view class="panelSchoolLine02"></view>
+      <view class="panelSchoolText04 panelSchoolText10">{{Info['自主招生'][Info['自主招生'].length-1].ScoreYear}}年计划</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>
+          <view class="panelSchoolText11 panelSchoolText111 panelSchoolText1111" wx:if="{{!Info[item.Name][Info[item.Name].length-1].Total}}">
+            无
+          </view>
+        </block>
+      </view>
+      <image class="line_02" src="../images/line_02.png"></image>
+
+      <view class="panelRadio radio2 FlexRow">
+        <view class="panelRadio1 radio21 panelRadio1{{item.CSS}}" wx:for="{{ScoreType}}" wx:key="index"
+        bindtap="onSelect" data-object="ScoreType" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
+      </view>
+
+      <!-- 自主招生 -->
+      <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>
+        <view class="panelLine"></view>
+        
+        <!-- 学科 -->
+        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].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>
+        <view class="panelLine"></view>
+        </block>
+        
+        <!-- 体育 -->
+        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].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>
+        <view class="panelSchoolIndependent2 FlexColumn">
+          <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[1].SchoolTargetRemark2}}</text>
+        </view>
+        <view class="panelLine"></view>
+        </block>
+        
+        <!-- 艺术 -->
+        <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].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>
+        <view class="panelSchoolIndependent2 FlexColumn">
+          <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].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}}">
+        <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>
+        <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}}</view>
+          <view class="panelSchoolText11 ">
+          <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}</view>
+        </view>
+        <view class="panelLine"></view>
+        </block>
+      </view>
+    </block>
+
+    <block wx:if="{{Info['1-15志愿'] && !Info['自主招生']}}">
+      <view class="panelSchoolText17">统一招生</view>
+      <view class="panelSchoolText18">1至15志愿（平行志愿）</view>
+    </block>
+    
+    <block wx:if="{{Info['名额到校'] && Info.SchoolType1=='初中'}}">
+      <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">
+        <view class="panelCheckbox panelCheckbox{{item.CSS}} checkMarginTop FlexRow" wx:for="{{TailScore}}" wx:key="index" 
+        bindtap="onSelect" data-object="TailScore" data-index="0" data-clicktype="checkbox">
+          <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+            <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+          </view>
+          <view>{{item.Name}}</view>
+        </view>
+      </view>
+      <view class="panelMarginTop panelLine"></view>
+    
+      <view class="panelRadio2 panelMarginTop FlexRow">
+        <view class="panelRadio21 panelRadio21{{item.CSS}}" wx:for="{{Years}}" wx:key="index"
+        bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
+      </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}}" />
+      
+    </block>
+
+    <!-- 名额到区、名额到校、1-15志愿 -->
+    <block wx:if="{{ScoreTypeID!=1 && !Info[ScoreType[ScoreTypeID-1].Name]}}" >
+      <view class="panelSchoolText19">该校不属于“{{ScoreType[ScoreTypeID-1].Name}}”可填报的学校。</view>
+      <view class="panelLine"></view>
+      <view class="panelSchool22 panelSchool221 FlexRow" bindtap="goto" data-url="docs?ID=1">
+        <text class="panelSchoolText07">哪类学校属于“名额分配”可填报学校？</text>
+        <image class="icon_nextpage_4" src="../images/icon_nextpage_4.png"></image>
+      </view>
+    </block>
+    
+    <view style="height:50rpx;"></view>
+  </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}}">
+      <image lazy-load="true" mode="aspectFill" class="scrollItem" src="{{ImagePath}}web/_School/{{item}}" wx:for="{{Info.ImageOther}}" wx:key="index" wx:if="{{index<9}}" />
+    </view>   
+  </view>
+  
+  <view class="panelBasicCss panelSchool5 FlexRow" bindtap="goto" data-url="map?PageType=1&ID={{Info.ID}}&Name={{Info.SchoolShortName}}&Coordinates={{Info.Coordinates}}&SchoolType2Short={{Info.SchoolType2Short}}&SchoolShortName={{Info.SchoolShortName}}&Address={{Info.Address}}&DistrictID={{Info.District2}}" data-isgoto="{{Info.Coordinates}}"  wx:if="{{Info.Address || Info.Coordinates}}">
+    <view class="panelSchool51 FlexColumn">
+      <view class="panelSchool411">校址</view>
+      <view class="panelSchool512 FlexRow">
+        <image class="icon_loc_01" src="../images/icon_loc_01.png"></image>
+        <text class="panelSchoolText09"><block wx:if="{{Info.Address}}">{{Info.Address}}</block></text>
+      </view>
+    </view>
+    <view class="panelSchool52 FlexRow">
+      <block wx:if="{{Info.Coordinates}}">
+        <image class="pic_03" src="../images/pic_03.png"></image>
+        <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+      </block>
+    </view>
+  </view>
+
+  <view class="panelBasicCss FlexColumn" wx:if="{{Info.SchoolType1=='高中'}}">
+    <block wx:if="{{Info.SchoolType2Short=='区重点（特色）'}}">
+      <view class="panelSchoolText082">特色高中办校重点</view>    
+      <view class="panelSchoolText08 panelSchoolText083">美育特色</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="panelSchoolText081">
+      <block wx:if="{{Info.SchoolType2Short=='区重点（特色）'}}">更多</block>简介
+      <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>
+          <image wx:if="{{IsFold}}" class="icon_fold_04" src="../images/icon_fold_04.png"></image>
+        </view>
+      </view>
+    </view>
+    
+    <text class="panelContent"  wx:if="{{IsFold}}"><block wx:if="{{Info.Introduction}}">{{Info.Introduction}}</block>
+    </text>
+  </view>
+
+  <view class="panelBasicCss panelSchool4 FlexColumn" wx:if="{{Info.Website || Info.ImageQRCode}}">
+    <view class="panelSchool40 FlexRow">
+      <view class="panelSchool41 FlexColumn">
+        <view class="panelSchool411">学校官媒</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>      
+      </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>
+
+  <view class="panelBasicCss FlexColumn" wx:if="{{Info.SchoolType1=='初中'}}">
+    <view style="height: 20rpx;"></view>
+    <view class="panelSchool13 FlexRow" bindtap="goto" data-url="scoreline?PageType=scoreline&ScoreTypeID=4&DistrictID={{Info.District2}}&YearIndex=0">
+      <view class="panelSchool41 FlexRow">
+        <image class="icon_sys_09" src="../images/icon_sys_09.png"></image>
+        <view>查询所在区1-15志愿</view>
+      </view>
+      <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+    </view>
+    <view class="panelLine"></view>
+    <view class="panelSchool13 FlexRow" bindtap="goto" data-url="scoreline?PageType=scoreline&ScoreTypeID=2&DistrictID={{Info.District2}}&YearIndex=0">
+      <view class="panelSchool41 FlexRow">
+        <image class="icon_sys_09" src="../images/icon_sys_05.png"></image>
+        <view>查询所在区名额分配到区</view>
+      </view>
+      <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+    </view>
+    <view style="height: 20rpx;"></view>
+  </view>
+
+  <view class="panelSchoolText14" catchtap="goto" data-url="feedback">
+    本页内容来自学校官网、官方公众号、微博等网络资料的整理，整理过程中可能会有偏差，如您发现错误，欢迎协助<text class="panelSchoolText15">纠正</text>。
+  </view>
+
+  <view style="height: 210rpx;"></view>
+
+  <view style="width: 100%;height:100rpx;z-index: 5; position: fixed;bottom:0;" bindtap="onUpdateTitle"></view>
+
+  <view class="panelFooter FlexRow" >
+    <view class="panelFooter1 FlexRow" wx:if="{{!IsCollect}}" catchtap="collectSchool" data-index="1">
+      <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_fav_02.png"></image>
+      <view class="panelFooterBottom">收藏</view>
+    </view>
+    <view class="panelFooter1 panelFooter1Collect FlexRow" wx:if="{{IsCollect}}" catchtap="collectSchool" data-index="0">
+      <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_fav_03.png"></image>
+      <view class="panelFooterBottom">已收藏</view>
+    </view>
+    
+    <view class="panelFooter0 FlexRow">
+      <view class="panelFooterLine panelFooterBottom"></view>
+      <button open-type='share' class="share FlexRow">
+        <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_share_01.png"></image>
+        <view class="panelFooterBottom">转发</view>
+      </button>
+    </view>
+    <view class="panelFooter2 FlexRow" catchtap="goto" data-url="feedback">
+      <view class="panelFooterLine panelFooterBottom"></view>
+      <view  class="panelFooter21 panelFooterBottom">纠错</view>
+    </view>
+    <view class="panelFooter3 FlexRow" catchtap="returnTop">
+      <view class="panelFooterLine panelFooterBottom"></view>
+      <image class="panelFooter_icon_b2t_01 panelFooterBottom" src="../images/icon_b2t_01.png"></image>
+    </view>
+  </view>
+</view>

pages/main/school.wxss

@@ -0,0 +1,466 @@
+.panelSchool1{
+  margin-top: 35rpx;
+}
+
+.panelNullImage{
+  width:710rpx;
+  height:380rpx;
+  background-color: #E3E3E3;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  color:#9B9B9B;
+  font-size:28rpx;
+  position: relative;
+}
+
+.icon_sys_13{
+  width: 60rpx;
+  height:60rpx;
+  margin-bottom: 20rpx;
+}
+
+.btnHelp{
+  width:100rpx;
+  height:40rpx;
+  line-height: 40rpx;
+  background-color: #fff;
+  color:#EB5C28;
+  font-size:20rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  position: absolute;
+  right:40rpx;
+  bottom:40rpx;
+}
+
+.panelSchoolImage{
+  width:100%;
+  height:380rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+
+.panelSchoolLogo{
+  width:120rpx;
+  height:120rpx;
+  border-radius: 50%;
+  position: absolute;
+  left:60rpx;
+  top:290rpx;
+}
+
+.panelSchoolText01{
+  font-size: 48rpx;
+  font-weight: 700rpx;
+  align-self: start;
+  margin:50rpx 0 0 40rpx;
+}
+
+.panelSchool11{
+  align-self: start;
+  margin:20rpx 0 0 40rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color:#787878;
+  justify-content: flex-start;
+}
+
+
+.panelSchoolText03{
+  font-size: 24rpx;
+  font-weight: 400;
+  align-self: start;
+  margin:10rpx 0 0 40rpx;
+}
+
+.panelSchool12{
+  width:630rpx;
+  justify-content: space-between;
+  margin: 60rpx 0 0 0;
+}
+
+.panelSchool121{
+  align-items: flex-start;
+}
+.panelSchool122{
+  align-items: flex-end;
+}
+
+.panelSchoolText04{
+  color:#9B9B9B;
+  margin-bottom: 4rpx;
+  font-size: 20rpx;
+}
+.panelSchoolText05{
+  font-size: 28rpx;
+  height:40rpx;
+}
+.panelSchoolText06{
+  font-size: 34rpx;
+  font-family: 'Roboto-Black';
+}
+.panelSchoolText061{
+  font-size: 28rpx;
+  font-weight: 400;
+}
+
+.panelSchool13{
+  width:100%;
+  height:93rpx;
+  justify-content: space-between;
+  font-size: 24rpx;
+  font-weight: 400;
+}
+
+.panelMarginTop{
+  margin-top: 30rpx;
+}
+
+.icon_nextpage_4{
+  width:12rpx;
+  height:18rpx;
+  margin-left: 10rpx;
+}
+
+.panelSchool21{
+  width:630rpx;
+  height:152rpx;
+  align-items: flex-start;
+}
+.panelSchool22{
+  width:630rpx;
+  height:93rpx;
+  justify-content: flex-start;
+  font-size: 24rpx;
+  color:#EB5C28;
+  margin: -40rpx 0 20rpx 0;
+}
+
+.panelSchoolText08{
+  align-self: start;
+  margin: 50rpx 0 40rpx 40rpx;
+}
+
+.panelSchoolText081{
+  width: 670rpx;
+  align-self: start;
+  margin: 50rpx 0 40rpx 40rpx;
+  position: relative;
+}
+.panelSchoolText082{
+  align-self: start;
+  margin: 50rpx 0 0 40rpx;
+  color:#9B9B9B;
+  font-size:20rpx;
+}
+.panelSchoolText083{
+  margin: 4rpx 0 30rpx 40rpx;
+}
+.panelSchool31{
+  width: 100%;
+}
+.panelSchool311{
+  width:176rpx;
+  height:187rpx;
+  justify-content: flex-start;
+}
+
+.panelSchool3111{
+  width: 100%;
+}
+
+.icon_sys_04{
+  width: 28rpx;
+  height: 28rpx;
+  margin: 20rpx 0 10rpx 0;
+}
+.icon_sys_09{
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 20rpx;
+}
+
+
+.panelSchoolText09{
+  font-size: 24rpx;
+  font-weight: 400;
+}
+
+.panelSchoolText090{
+  font-size: 24rpx;
+  color:#FE6659;  
+  font-family: 'Roboto-Black';
+}
+.panelSchoolText091{
+  font-size: 24rpx;
+  color:#03AF69;
+  font-family: 'Roboto-Black';
+}
+.panelSchoolText092{
+  font-size: 20rpx;
+  color:#4D4D4D;
+}
+
+.panelSchoolLine02{
+  width:630rpx;
+  height: 1rpx;
+  background-color: #E3E3E3;
+}
+
+.panelSchoolText10{
+  font-size: 20rpx;
+  align-self: start;
+  margin:30rpx 0 0 40rpx;
+}
+
+.panelSchoolText11{
+  font-size: 32rpx;
+  font-family: 'Roboto-Black';
+}
+
+.panelSchoolText111{
+  width:176rpx;
+  margin: 30rpx 0 50rpx 0;
+  text-align: center;
+}
+.panelSchoolText1111{
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.panelSchoolText112{
+  width:162rpx;
+}
+
+.line_02{
+  width: 710rpx;
+  height: 6rpx;
+}
+
+.radio2{
+  margin: 60rpx 0 20rpx 0;
+}
+.radio21{
+  margin: 0 10rpx;
+}
+
+.panelSchoolIndependent{
+  width:100%;
+  margin-top: 20rpx;
+  align-items: flex-start;
+}
+.panelSchoolIndependent1{
+  justify-content: flex-start;
+}
+
+.panelSchoolIndependentText1{
+  width:360rpx;
+  height:98rpx;
+  line-height: 98rpx;
+  margin-left: 40rpx;
+}
+.panelSchoolIndependent2{
+  width:670rpx;
+  height:124rpx;
+  border-radius: 10rpx;
+  background-color: #f8f8f8;
+  margin:0 0 30rpx 20rpx;
+  align-items: flex-start;
+}
+
+.panelSchoolIndependent3{
+  justify-content: flex-start;
+  margin-bottom: 30rpx;
+}
+
+.panelSchoolIndependentText2{
+  width:360rpx;
+  margin-left: 40rpx;
+}
+
+.panelSchoolText16{
+  font-size:20rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+  width:610rpx;
+}
+
+.panelSchoolIndependent4{
+  margin: 30rpx 0 13rpx 40rpx;
+}
+
+.panelTool1{
+  width:418rpx;
+  margin: 40rpx 0 0 30rpx;
+  align-self: start;
+}
+
+.panelTool1_1{
+  margin-left: 20rpx;
+}
+
+.panelSchool4{
+  height:300rpx;
+  justify-content: flex-start;
+}
+
+.panelSchool40{
+  width: 100%;
+  justify-content: space-between;
+}
+.panelSchool41{
+  align-items: flex-start;
+  margin-left: 40rpx;
+}
+
+.panelSchool411{
+  font-size: 36rpx;
+}
+
+.panelSchool412{
+  margin: 30rpx 0 20rpx 0;
+  align-items: flex-start;
+}
+
+.panelSchool413{
+  align-items: flex-start;
+}
+
+.icon_web_01{
+  margin-top: 6rpx;
+  width:24rpx;
+  height:24rpx;
+  margin-right: 20rpx;
+}
+
+.panelSchoolText12{
+  font-size: 28rpx;
+  font-family: 'Roboto-Black';
+  width:360rpx;
+}
+.panelSchoolText13{
+  font-size: 24rpx;
+  font-weight: 400;
+}
+.panelSchoolText131{
+  line-height: 40rpx;
+  height:126rpx;
+  align-items: flex-start;
+}
+
+.panelSchoolText17{
+  font-size: 24rpx;
+  margin: 50rpx 0 0 40rpx;
+  font-weight: 400;
+  align-self: start;
+}
+.panelSchoolText18{
+  font-size: 36rpx;
+  margin: 0 0 0 40rpx;
+  align-self: start;
+}
+
+.panelSchoolQRCode{
+  width:200rpx;
+  height:200rpx;
+  margin: 50rpx 40rpx 50rpx 0;
+}
+
+.panelScrollView{
+  margin: -10rpx 0 30rpx 0;
+  width: 666rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.scrollItem{
+  width:210rpx;
+  height:210rpx;
+  border-radius: 10rpx;
+  margin: 0 5rpx;
+  border:1rpx solid #d2d2d2;
+}
+
+
+.panelSchool5{
+  justify-content: space-between;
+  height:220rpx;
+}
+
+.panelSchool51{
+  align-items: flex-start;
+  margin-left: 40rpx;
+}
+
+.panelSchool512{
+  margin-top: 30rpx;
+}
+
+.panelSchool52{
+  width:213rpx;
+  justify-content: flex-start;
+}
+
+.icon_loc_01{
+  width:20rpx;
+  height:24rpx;
+  margin-right: 20rpx;
+}
+.pic_03{
+  width:120rpx;
+  height:120rpx;
+  margin-right: 37rpx;
+  border-radius: 20rpx;
+}
+
+.panelFold{
+  width:154rpx;
+  height:100rpx;
+  position: absolute;
+  right:0rpx;
+  top:-30rpx;
+}
+
+.panelFold1{
+  width:34rpx;
+  height:34rpx;
+  background-color: #EB5C28;
+  border-radius: 50%;
+}
+
+.icon_fold_04{
+  width:18rpx;
+  height:10rpx;
+}
+
+.panelContent{
+  width:630rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-bottom: 50rpx;
+}
+
+.panelSchoolText14{
+  width:630rpx;
+  font-size:20rpx;
+  font-weight: 400;
+  margin-top: 60rpx;
+}
+
+.panelSchoolText15{
+  font-size:20rpx;
+  font-weight: 700;
+  color:#EB5C28;
+  text-decoration: underline;
+}
+
+.panelSchoolText19{
+  margin: 60rpx 0 30rpx 40rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  align-self: start;
+}
+.panelSchool221{
+  margin: 30rpx 0 0 0;
+  height:43rpx;
+}

pages/main/scoreline.js

@@ -0,0 +1,439 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+var canPage=true;
+
+Page({
+  data: {
+    PageType:"scoreline",
+    DistrictID:1,
+    ScoreTypeID:1,
+    Years:constant.arrYear,
+    YearIndex:0,
+    IsSearch:false,
+    Accommodation:constant.arrAccommodation,
+    TailScore:constant.arrTailScore,
+    PublicOrPrivate:constant.arrPublicOrPrivate,
+    LocalOrNolocal:constant.arrLocalOrNolocal,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ScoreTypeID:options.ScoreTypeID,
+      DistrictID:options.DistrictID,
+      YearIndex:options.YearIndex,
+      PageType:options.PageType,
+      SchoolType1:options.SchoolType1,
+      IsSearch:false,
+      IsFocus:false,
+      PageCount:app.globalData.PageCount,//翻页数
+    });
+
+    var b=true;
+    var title="";
+    if (options.PageType=="collect"){
+
+      var collectSchool=wx.getStorageSync('CollectList');
+      var schoolCount=0;
+      if (options.SchoolType1=="高中")
+        schoolCount=collectSchool.收藏的高中.length;
+      else 
+        schoolCount=collectSchool.收藏的初中.length;
+      that.setData({
+        SchoolCount:schoolCount,
+      });
+
+      if (schoolCount==0){
+        that.setData({
+          List:[],
+        });
+        b=false;
+      }
+      else{
+        var arr=[];
+      
+        var name="";
+        for(var i=0;i<constant.arrDistrict.length;i++){
+          var obj={};
+          obj.ID=Number(constant.arrDistrict[i].ID);
+          obj.Name=constant.arrDistrict[i].Name.substr(0,2);
+          obj.CSS="";
+          arr.push(obj);
+        }
+        that.setData({
+          SchoolType1:options.SchoolType1,
+          District:arr,
+          DistrictName:name,
+        });
+      }
+      title="对比·"+options.SchoolType1;
+    }
+    else{
+      title=constant.arrScoreType[that.data.ScoreTypeID-1].Name+'·'+constant.arrDistrict[that.data.DistrictID-1].Name;
+    }
+
+    wx.setNavigationBarTitle({
+      title: title,
+    });
+
+    that.setData({
+      Title: title,
+    });
+    
+    if (b)
+      that.init();
+    
+  },
+  onPullDownRefresh: function () {
+    var that=this;
+    //debugger;
+    wx.redirectTo({
+      url: 'scoreline?PageType='+that.data.PageType+'&ScoreTypeID='+that.data.ScoreTypeID+'&SchoolType1='+that.data.SchoolType1+'&DistrictID='+that.data.DistrictID+"&YearIndex="+that.data.YearIndex,
+    })
+    wx.stopPullDownRefresh();
+  },
+  init:function(){
+    var that = this;
+    var districtID=Number(that.data.DistrictID);
+    var year=that.data.Years[that.data.YearIndex].Name;
+    for(var i=0;i<that.data.Years.length;i++){
+      that.data.Years[i].CSS="";
+    }
+    that.data.Years[that.data.YearIndex].CSS="Selected";
+
+    that.setData({
+      IsSearch:false,
+      IsFocus:false,
+      SearchNull:false,
+      ContrastNull:false,
+      InputValue:"",
+      Years:that.data.Years,
+    });
+    
+    var url="";
+    var canSelect=true;
+    if (that.data.PageType=="collect"){
+      if (districtID==-1 && that.data.SchoolType1=="高中")
+        canSelect=false;
+      url="GetMPSScoreByCollect?SchoolType1="+that.data.SchoolType1+"&UserID="+app.globalData.userInfo.UserID+"&ScoreYear="+year+"&DistrictID="+districtID;
+    }
+    else{
+      canSelect=true;
+      var scoreTypeID=constant.arrScoreType[that.data.ScoreTypeID-1].Name;
+      url="GetMPSScore?ScoreYear="+year+"&ScoreType="+scoreTypeID+"&DistrictID="+districtID;
+    }
+
+    if (canSelect){
+      wx.showLoading({
+        title: '加载中',
+      });
+      main.getData(url, function (data) {
+        if (data) {
+          
+          for(var i=0;i<data.length;i++){
+            var item=data[i];
+            item.IsAccommodation=true;
+            item.IsPublicOrPrivate=true;
+            item.IsLocalOrNolocal=true;
+            item.IsSearchResult=true;
+          }
+  
+          // 是否住宿全部选中
+          for(var i=0;i<constant.arrAccommodation.length;i++)
+            constant.arrAccommodation[i].CSS="Selected";
+  
+          //若是高中收藏对比
+          data=realData2(that,data);
+          //名额到校将收藏初中提前显示
+          data=realData(that,data);
+  
+          //将保存的用户习惯（显示列表样式）提取出来
+          var isListAll=wx.getStorageSync('TailScore');
+          if (isListAll){
+            that.data.TailScore[0].CSS="Selected";
+          }
+  
+          var pageCount=data.length;
+          if (that.data.ScoreTypeID==3)
+            pageCount=app.globalData.PageCount;
+          
+          //debugger;
+
+          var isContrastNull=false;
+          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,
+          });
+  
+        }
+
+        var timeTimeout=2000;
+        if (that.data.ScoreTypeID==3 && that.data.DistrictID==11){
+          timeTimeout=3000;
+          if (app.globalData.IsAndroid)
+            timeTimeout=4000;
+        }
+
+        setTimeout(function(){
+          wx.hideLoading();
+        },timeTimeout);
+      });
+    }
+    
+
+    function realData(obj,data){
+      //名额到校将收藏初中提前显示
+      if (obj.data.ScoreTypeID==3){
+        //debugger;
+        var schoolList=wx.getStorageSync('CollectList')["收藏的初中"];
+        if (schoolList && schoolList.length>0){
+          var arr=[];
+          for(var i=0;i<data.length;i++){
+            var item=data[i];            
+            for(var j=0;j<schoolList.length;j++){
+              if (item.SchoolOfGraduation==schoolList[j].ID){
+                item.IsCollect=true;
+                arr.push(item);
+                data.splice(i,1);
+                i--;
+                break;
+              }
+            }
+          }
+          if (arr.length>0){
+            for(var i=arr.length-1;i>=0;i--){
+              data.unshift(arr[i]);
+            }
+          }
+        }
+      }
+      return data;
+    }
+
+    function realData2(obj,data){
+      //若是高中收藏对比
+      if (obj.data.SchoolType1=='高中' && obj.data.PageType=="collect"){
+        var schoolList=wx.getStorageSync('CollectList')["收藏的高中"];
+        for(var i=0;i<data.length;i++){
+          var item=data[i];            
+          for(var j=0;j<schoolList.length;j++){
+            if (item.ID==schoolList[j].ID){
+              item.SchoolFullName=schoolList[j].SchoolFullName;
+              item.District=schoolList[j].District;
+              item.SchoolType2Short=schoolList[j].SchoolType2Short;
+              item.PublicOrPrivate=schoolList[j].PublicOrPrivate;
+              schoolList[j].IsExist=true;
+            }
+          }
+        }
+
+        var arr=[];
+        for(var i=0;i<schoolList.length;i++){
+          if (!schoolList[i].IsExist)
+            arr.push(schoolList[i]);
+        }
+        
+        obj.setData({
+          ListNullData:arr,
+        });
+      }
+      return data;
+    }
+  },
+  onPage: function (e) {
+    var that=this;
+    var count=that.data.PageCount;
+    if (canPage && count<that.data.List.length){
+      canPage=false
+      count+=app.globalData.PageCount;
+      that.setData({
+        PageCount:count,
+      });
+      setTimeout(function(){
+        canPage=true;
+      },2000);
+    }
+  },
+  onSelect:function(event){
+    var that=this;
+    main.onSelect(that,event,function(obj,e,result){
+      //显示大图列表还是全部列表
+      if (e.currentTarget.dataset.object=="TailScore"){
+        wx.showLoading({
+          title:"加载中",
+          mask:true,
+        });
+        that.setData({
+          IsListAll: result,
+        });
+        setTimeout(function(){
+          wx.hideLoading();
+        },2000);
+        wx.setStorageSync('TailScore', result);
+      }
+      //选择年份
+      else if (e.currentTarget.dataset.object=="Years"){
+        if (that.data.PageType=="collect")
+          that.data.DistrictID=-1;
+        wx.redirectTo({
+          url: 'scoreline?PageType='+that.data.PageType+'&SchoolType1='+that.data.SchoolType1+'&ScoreTypeID='+that.data.ScoreTypeID+'&DistrictID='+that.data.DistrictID+"&YearIndex="+e.currentTarget.dataset.index,
+        });
+      }
+      //选择公办和民办
+      else if (e.currentTarget.dataset.object=="PublicOrPrivate"){
+        var selectIndex=e.currentTarget.dataset.index;
+        var selectText=that.data.PublicOrPrivate[selectIndex].Name;
+        var isSelect=that.data.PublicOrPrivate[selectIndex].CSS=="Selected";
+        
+        
+        var isNull=true;
+        for(var i=0;i<that.data.List.length;i++){
+          var item=that.data.List[i];
+          if (selectText==item.PublicOrPrivate)
+            item.IsPublicOrPrivate=isSelect;
+          if (item.IsPublicOrPrivate)
+            isNull=false;     
+        }
+        that.setData({
+          List:that.data.List,
+          SearchNull:isNull,
+        });
+      }
+      //选择本地和非本地
+      else if (e.currentTarget.dataset.object=="LocalOrNolocal"){
+        var selectIndex=e.currentTarget.dataset.index;
+        var isNull=true;
+        for(var i=0;i<that.data.List.length;i++){
+          var item=that.data.List[i];
+          item.IsLocalOrNolocal=false; 
+          if (selectIndex==0)
+            item.IsLocalOrNolocal=true;
+          else if (selectIndex==1 && item.DistrictNameArea==constant.arrDistrict[that.data.DistrictID-1].Name)
+            item.IsLocalOrNolocal=true;   
+          else if (selectIndex==2 && item.DistrictNameArea!=constant.arrDistrict[that.data.DistrictID-1].Name)
+            item.IsLocalOrNolocal=true;   
+        }
+        that.setData({
+          List:that.data.List,
+        });
+      }
+      //选择寄宿
+      else if (e.currentTarget.dataset.object=="Accommodation"){
+        var selectIndex=e.currentTarget.dataset.index;
+        var selectText=that.data.Accommodation[selectIndex].Name;
+        var isSelect=that.data.Accommodation[selectIndex].CSS=="Selected";
+        var isNull=true;
+        for(var i=0;i<that.data.List.length;i++){
+          var item=that.data.List[i];
+          if (selectText==item.Accommodation)
+            item.IsAccommodation=isSelect;  
+          
+          if (item.IsAccommodation)
+            isNull=false;
+        }
+        
+        that.setData({
+          List:that.data.List,
+          SearchNull:isNull,
+        });
+      }
+      //选择区
+      else if (e.currentTarget.dataset.object=="District"){
+
+        that.setData({
+          DistrictID:e.currentTarget.dataset.index+1,
+          DistrictName:constant.arrDistrict[e.currentTarget.dataset.index].Name,
+        });
+        that.init();
+      }
+    });   
+  },
+  showSearch:function(){
+    var that=this;
+    that.setData({
+      IsSearch:true,
+      IsFocus:true,
+    });
+  },
+  clearInput:function(){
+    var that=this;
+    that.bindKeyInput({detail:{value:""}});
+    that.setData({
+      IsSearch:false,
+      IsFocus:false,
+      SearchNull:false,
+      ContrastNull:false,
+    });
+  },
+  clearInput2:function(){
+    var that=this;
+    that.bindKeyInput({detail:{value:""}});
+    that.setData({
+      IsSearch:true,
+      IsFocus:true,
+    });
+  },
+  bindKeyInput:function(e){
+    var inputValue=e.detail.value;
+    var that=this;
+    var isNull=true;
+    var count=0;
+    for(var i=0;i<that.data.List.length;i++){
+      var item=that.data.List[i];
+      if (inputValue){
+        if (item.SchoolFullNameJunior.indexOf(e.detail.value)>=0){
+          item.IsSearchResult=true;
+          count++;
+          isNull=false;
+        }
+        else
+          item.IsSearchResult=false;
+      }
+      else{
+        item.IsSearchResult=true;
+        count++;
+      }
+    }
+    
+    that.setData({
+      List:that.data.List,
+      SearchNull:isNull,
+      InputValue:inputValue,
+      PageFilterCount:count,
+    });
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  returnTop:function(){
+    main.returnTop();
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var title="上海中招"+that.data.Title;
+    var path=app.globalData.SharePath+'?UserID=' + app.globalData.userInfo.UserID+'&type=scoreline&ScoreTypeID='+that.data.ScoreTypeID+'&ID=' + that.data.DistrictID+"&YearIndex="+that.data.YearIndex;
+    if (that.data.PageType=="collect"){
+      title=app.globalData.ShareTitle;
+      path=app.globalData.SharePath+'?UserID=' + app.globalData.userInfo.UserID;
+    }
+    return {
+      title: title,
+      path: path,
+    }
+  }
+})

pages/main/scoreline.json

@@ -0,0 +1,3 @@
+{
+  "enablePullDownRefresh": true
+}

pages/main/scoreline.wxml

@@ -0,0 +1,145 @@
+<import src="../template/componentList.wxml" />
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow" wx:if="{{SchoolCount!='0'}}">
+    <view style="width: 40rpx;"></view>
+    <view class="panelTop1 FlexColumn" wx:for="{{Years}}" wx:key="index" 
+    bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio">
+      <view class="panelTop1Text01 panelTop1Text01{{item.CSS}}">{{item.Name}}年</view>
+      <view class="panelTop1Line01 panelTop1Line01{{item.CSS}}"></view>
+    </view>
+  </view>
+  <view style="height: 100rpx;"></view>
+  
+  <block wx:if="{{PageType=='collect' && SchoolCount!='0'}}">
+    <text class="panelTitle FlexRow" wx:if="{{SchoolType1=='高中'}}">
+      选一个区
+    </text>
+    <text class="panelTitle FlexRow" style="margin-top: 50rpx;" wx:if="{{SchoolType1=='初中'}}">对比名额分配到校</text>
+    
+    <view class="panelBasicCss panelTop0" wx:if="{{SchoolType1=='高中'}}" >
+      <view class="panelTop00 FlexRow">
+        <view class="panelTop01 panelTop01{{item.CSS}}" wx:for="{{District}}" wx:key="index" 
+        bindtap="onSelect" data-object="District" data-index="{{index}}" data-clicktype="radio">
+          <view class="panelTop01Text panelTop01Text{{item.CSS}}">{{item.Name}}</view>
+        </view>
+      </view>
+    </view>
+
+    <text class="panelTitle FlexRow" wx:if="{{(ContrastNull || List.length>0) && SchoolType1=='高中'}}">
+      对比结果
+    </text>
+  </block>
+
+  <block wx:if="{{List.length>0 || ContrastNull}}">
+    <view class="panelBasicCss panelTop2 FlexRow">
+      <image class="panelCheckbox_icon_filter_01 icon_filter_01" src="../images/icon_filter_01.png"></image>
+      <view class="panelTop21 FlexRow">
+        <view class="panelCheckbox panelCheckbox{{item.CSS}} checkMarginTop FlexRow" wx:for="{{TailScore}}" wx:key="index" 
+        bindtap="onSelect" data-object="TailScore" data-index="0" data-clicktype="checkbox">
+          <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+            <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+          </view>
+          <view>{{item.Name}}</view>
+        </view>
+        <view style="width:100rpx;"></view>
+        <!-- 住宿 -->
+        <view wx:if="{{ScoreTypeID==2}}" class="panelCheckbox checkbox2 panelCheckbox{{item.CSS}} FlexRow" wx:for="{{Accommodation}}" wx:key="index" 
+        bindtap="onSelect" data-object="Accommodation" data-index="{{index}}" data-clicktype="checkbox">
+          <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+            <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+          </view>
+          <view>{{item.Name}}</view>
+        </view>
+
+        <!-- 公办民办 -->
+        <view wx:if="{{ScoreTypeID==4}}" class="panelCheckbox checkbox2 panelCheckbox{{item.CSS}} FlexRow" wx:for="{{PublicOrPrivate}}" wx:key="index" 
+        bindtap="onSelect" data-object="PublicOrPrivate" data-index="{{index}}" data-clicktype="checkbox">
+          <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
+            <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
+          </view>
+          <view>{{item.Name}}</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="panelBasicCss panelScore FlexColumn" >
+      <view style="height:20rpx"></view>
+      <!-- 名额到校 -->
+      <view class="panelScoreSearch FlexColumn" wx:if="{{ScoreTypeID==3}}">
+        <view class="panelScoreSearch1 FlexRow" wx:if="{{!IsSearch}}" bindtap="showSearch">
+          <image class="panelScoreSearch_icon_magnifier_01" src="../images/icon_filter_02.png"></image>
+          <view class="panelScoreSearch11">筛选初中</view>
+        </view>
+        <view class="panelScoreSearch1 FlexRow" wx:if="{{IsSearch}}">
+          <input class="Input" value="{{InputValue}}" focus="{{IsFocus}}" placeholder="输入校名，限本区初中" confirm-type="search" bindinput="bindKeyInput" />
+          <view class="btnCancel" wx:if="{{!InputValue}}"></view>
+          <view class="btnCancel FlexColumn" wx:if="{{InputValue}}" bindtap="clearInput2">
+            <view class="circle FlexColumn">
+              <image class="icon_del_02" src="../images/icon_del_02.png"></image>
+            </view>
+          </view>
+          <view class="panelLine3"></view>
+          <view class="btnCancel" bindtap="clearInput">取消</view>
+        </view>
+        <view class="panelWhite" wx:if="{{IsSearch && !InputValue}}"></view>
+        
+        <view class="panelScoreText031" wx:if="{{IsSearch && InputValue}}">筛选结果</view>
+        <view class="panelScoreText03" wx:if="{{IsSearch && InputValue}}">技巧：点击校名可收藏学校，收藏的学校在下次排列位置会置顶。</view>
+        <view style="height:50rpx;" wx:if="{{!IsSearch}}"></view>
+        <view class="panelLine"></view>
+      </view>
+      
+      <!-- 1-15志愿 -->
+      <view class="panelRadio radio1 FlexRow" wx:if="{{ScoreTypeID==4}}">
+        <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}}" />
+      
+      <view style="height: 50rpx;"></view>
+    </view>
+
+    <block wx:if="{{ListNullData && ListNullData.length>0 && !ContrastNull}}">
+      <view class="panelBasicCss FlexColumn">
+        <view class="text04">以下学校不招收本区学生</view>
+        <view class="panelLine"></view>
+        <view style="height:15rpx;"></view>
+        <view class="panelListNull FlexRow" wx:for="{{ListNullData}}" wx:key="index" bindtap="goto" data-url="school?PageType=collect&ID={{item.ID}}" >
+          <view class="text05">{{item.SchoolFullName}}</view>
+          <view class="panelScoreJunior2 FlexRow">
+            {{item.District}} {{item.SchoolType2Short}} <view class="panelLine2"></view> {{item.PublicOrPrivate}}
+          </view>
+        </view>
+        <view style="height:30rpx;"></view>
+      </view>
+    </block>
+
+    <view style="height: 210rpx;"></view>
+
+  </block>
+
+  <block wx:if="{{List.length==0 && SchoolCount=='0'}}">
+    <image class="icon_sys_12" src="../images/icon_sys_12.png"></image>
+    <view class="text02">没有可对比的学校</view>
+    <view class="text03">请先收藏几所学校</view>
+  </block>
+
+  <view class="panelFooter FlexRow">
+    <view class="panelFooter1 FlexRow" wx:if="{{PageType=='scoreline'}}">
+      <button open-type='share' class="share FlexRow">
+        <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_share_01.png"></image>
+        <view class="panelFooterBottom">转发</view>
+      </button>
+    </view>
+    <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedback">
+      <view class="panelFooterLine panelFooterBottom" wx:if="{{PageType=='scoreline'}}"></view>
+      <view class="panelFooterBottom panelFooter21">纠错</view>
+    </view>
+    <view class="panelFooter3 FlexRow" catchtap="returnTop">
+      <view class="panelFooterLine panelFooterBottom"></view>
+      <image class="panelFooterBottom panelFooter_icon_b2t_01" src="../images/icon_b2t_01.png"></image>
+    </view>
+  </view>
+</view>

pages/main/scoreline.wxss

@@ -0,0 +1,225 @@
+.panelTitle{
+  margin: 0 0 10rpx 40rpx;
+  align-self: start;
+  font-size: 36rpx;
+}
+
+.panelTop2{
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelTop21{
+  width:530rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+
+.icon_filter_01{ 
+  margin: 32rpx 26rpx 0 30rpx;
+}
+
+.checkMarginTop{
+  margin: 20rpx 0 15rpx 0;
+}
+
+.checkbox2{
+  margin-bottom: 20rpx;
+}
+
+.radio1{
+  margin: 40rpx 0 30rpx 0;
+}
+
+.radio2{
+  width:210rpx;
+  text-align: center;
+}
+
+
+.Input{
+  margin: 0 0 0 30rpx;
+  width:444rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.circle{
+  width:40rpx;
+  height:40rpx;
+  border-radius: 50%;
+  background-color: #fff;
+}
+.icon_del_02{
+  width:16rpx;
+  height:16rpx;
+}
+
+.panelLine3{
+  width:2rpx;
+  height:50rpx;
+  background-color: #d2d2d2;
+}
+
+.btnCancel{
+  width:116rpx;
+  height:80rpx;
+  color:#EB5C28;
+  line-height: 80rpx;
+  text-align: center;
+  font-size:28rpx;
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
+.btnSearch{
+  width:116rpx;
+  height:80rpx;
+  background-color: #f0f0f0;
+  color:#EB5C28;
+  line-height: 80rpx;
+  text-align: center;
+  font-size:28rpx;
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
+.panelWhite{
+  width:100%;
+  height:1000rpx;
+  background-color: #fff;
+}
+
+/* ************** */
+.panelScore{
+  min-height: 100rpx;
+}
+
+.panelScoreSearch{
+  width:100%;
+  justify-content: flex-start;
+}
+
+.panelScoreSearch1{
+  width:650rpx;
+  height:80rpx;
+  background-color: #f0f0f0;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  justify-content: flex-start;
+  margin-top: 30rpx;
+}
+
+
+.panelScoreSearch11{
+  font-weight: 400;
+}
+
+.panelScoreSearch_icon_magnifier_01{
+  width:18rpx;
+  height:20rpx;
+  margin: 0 10rpx 0 30rpx;
+}
+
+.panelScoreText031{
+  font-size: 36rpx;
+  margin: 50rpx 0 0 40rpx;
+  align-self: start;
+}
+.panelScoreText03{
+  font-size: 20rpx;
+  margin: 30rpx 0 40rpx 40rpx;
+  align-self: start;
+  color:#787878;
+}
+
+/* **************** */
+
+.icon_sys_12{
+  width:50rpx;
+  height:60rpx;
+  margin-top: 350rpx;
+}
+.icon_sys_121{
+  width:50rpx;
+  height:60rpx;
+  margin-top: 100rpx;
+}
+
+.text02{
+  font-size: 36rpx;
+  margin-top: 30rpx;
+}
+
+.text03{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin: 10rpx 0 180rpx 0;
+}
+
+.text04{
+  align-self: start;
+  margin: 50rpx 0 30rpx 30rpx;
+  font-size: 28rpx;
+}
+.panelListNull{
+  width: 100%;
+  justify-content: space-between;
+}
+.text05{
+  align-self: start;
+  margin: 15rpx 0 15rpx 30rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+
+.panelPage{
+  margin-left: 30rpx;
+  width:680rpx;
+  height:195rpx;
+  justify-content: flex-start;
+  border-bottom: 1rpx solid #e3e3e3;
+}
+.panelPage1{
+  font-size:24rpx;
+  color:#EB5C28;
+  margin-right: 20rpx;
+}
+
+.panelFold1{
+  width:34rpx;
+  height:34rpx;
+  background-color: #EB5C28;
+  border-radius: 50%;
+}
+
+.icon_fold_04{
+  width:18rpx;
+  height:10rpx;
+}
+
+.panelRecruitment{
+  width:650rpx;
+  height:96rpx;
+  border-radius: 10rpx;
+  background-color: #f8f8f8;
+  justify-content: space-between;
+}
+
+.panelRecruitmentTest01{
+  font-size:20rpx; 
+  margin-left: 20rpx;
+}
+.panelRecruitmentTest02{
+  font-weight: 400;  
+}
+.panelRecruitment1{
+  margin-right: 20rpx;
+  font-size:20rpx; 
+  font-weight: 400;
+}
+
+.panelRecruitmentTest03{
+  font-size:32rpx; 
+  font-family: 'Roboto-Black';
+}

pages/main/search.js

@@ -0,0 +1,147 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    SchoolSearch:constant.arrSchoolSearch,
+    SearchList:[],
+    IsFocus:true,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsSearchFinish:false,
+      IsSample:true,
+    });
+    that.getKey();
+  },
+  bindKeyInput:function(e){
+    var that=this;
+    var isExist=true;
+    if (!e.detail.value)
+      isExist=false;
+    
+    that.setData({
+      InputValue:e.detail.value,
+      IsSearchFinish:isExist,
+    });
+    if (e.detail.value)
+      that.searchData();
+    
+  },
+  searchKey:function(e){
+    var that=this;
+    that.setData({
+      InputValue:e.currentTarget.dataset.key,
+    });
+    that.searchData({currentTarget:{dataset:{rowcount:-1}}});
+  },
+  clearInput:function(){
+    var that=this;
+    that.setData({
+      InputValue:"",
+      IsSearchFinish:false,
+      IsFocus:true,
+      List:[],
+    });
+  },
+  bindConfirm:function(){
+    this.searchData({currentTarget:{dataset:{rowcount:-1}}});
+  },
+  onBlur:function(){
+    var that=this;
+    that.setData({
+      IsFocus:false,
+    });
+  },
+  removeSearchData:function(){
+    wx.removeStorageSync('SearchKey');
+    this.getKey();
+  },
+  searchData:function(e){
+    var that=this;
+    var rowcount=4;
+    if (e && e.currentTarget.dataset.rowcount){
+      that.getKey();
+      rowcount=e.currentTarget.dataset.rowcount;
+    }
+    var key=that.data.InputValue;
+    wx.showLoading({title:"加载中"});
+    main.getData("GetMPSSchool?Key="+key+"&RowCount="+rowcount, function (data) {
+      if (data) {
+        var isSample=true;
+        if (rowcount==-1)
+          isSample=false;
+        that.setData({
+          List:data,
+          IsSearchFinish:true,
+          IsSample:isSample,
+        });
+      }
+      switch(key){
+        case "上":
+        case "学":
+        case "中":
+        case "初":
+        case "上海":
+        case "上海市":
+        case "学校":
+        case "中学":
+        case "初级":
+          setTimeout(function(){
+            wx.hideLoading();
+          },3000);
+          break;
+        default:
+          wx.hideLoading();
+          break;
+      }
+        
+    });
+  },
+  goto: function (e) {
+    this.getKey();
+    main.goto(e);
+  },
+  close: function (e) {
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  getKey:function(e){
+    var that=this;
+    var arr=wx.getStorageSync('SearchKey');
+    if (!arr)
+      arr=[];
+    //去重
+    for(var i=0;i<arr.length;i++){
+      if (arr[i]==that.data.InputValue){
+        arr.splice(i,1);
+        break;
+      }
+    }
+    if (that.data.InputValue)
+      arr.unshift(that.data.InputValue);
+    if (arr.length>10)
+      arr.pop();
+    that.setData({
+      SearchList:arr,
+    });
+    wx.setStorageSync('SearchKey', arr);
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/search.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "搜学校"
+}

pages/main/search.wxml

@@ -0,0 +1,100 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn">
+    <view class="panelSearch1 FlexRow" >
+      <input class="Input" focus="{{IsFocus}}" bindblur="onBlur" confirm-type="search" value="{{InputValue}}"
+       placeholder="可输入校名、简称、高中招生代码" placeholder-style="color:#9b9b9b;" bindinput="bindKeyInput" bindconfirm="bindConfirm" />
+      <view class="btnCancel" wx:if="{{!InputValue}}"></view>
+      <view class="btnCancel FlexColumn" wx:if="{{InputValue}}">
+        <view class="circle FlexColumn" bindtap="clearInput">
+          <image class="icon_del_02" src="../images/icon_del_02.png"></image>
+        </view>
+      </view>
+      <view class="panelLine3"></view>
+      <view class="btnCancel" bindtap="close">取消</view>
+    </view>
+  </view>
+  <view style="height: 150rpx;"></view>
+  <block wx:if="{{!IsSearchFinish}}">
+    <view class="panel2 FlexColumn">
+      <view class="panel21 FlexRow">
+        <view>搜索记录</view>
+        <image bindtap="removeSearchData" class="universalpic_dustbin_black_24x30" src="../images/universalpic_dustbin_black_24x30.png" ></image>
+      </view>
+      <view class="panel22 FlexRow">
+        <view class="panelSearchItem FlexRow" wx:if="{{SearchList.length>0}}" wx:for="{{SearchList}}" wx:key="index" bindtap="searchKey" data-key="{{item}}">
+          <image class="icon_sys_12" src="../images/icon_sys_12.png" ></image>
+          <view class="text02">{{item}}</view>
+        </view>
+        <view class="panelSearchItem FlexRow" wx:if="{{SearchList.length==0}}">
+          <view class="text02 text05">无记录</view>
+        </view>
+        <view style="width: 100%;height:30rpx;"></view>
+      </view>
+    </view>
+  </block>
+  <block wx:if="{{IsSearchFinish}}">
+    <view class="panelSchoolSample FlexColumn" wx:if="{{List.length>0 && IsSample}}">
+      <view style="height:30rpx;"></view>
+      <view class="panelSchool FlexColumn" wx:if="{{index<3}}" wx:for="{{List}}" wx:key="index" bindtap="goto" data-url="school?ID={{item.ID}}">
+        <view class="panelSchool1 FlexRow">
+          <view class="schoolName">{{item.SchoolFullName}}</view>
+          <view class="FlexRow">
+            <view class="text03">{{item.SchoolType1}}</view>
+            <view class="text04" wx:if="{{item.SchoolNumber}}">{{item.SchoolNumber}}</view>
+            <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+          </view>
+        </view>
+        <view class="panelLine"></view>
+      </view>
+      <view class="panelSchool FlexColumn" wx:if="{{List.length>3}}" bindtap="searchData" data-rowcount="-1">
+        <view class="panelSchool1 panelSchool11 FlexRow">
+          <view class="schoolName schoolName2">查看更多学校</view>
+          <view class="panelFold1 FlexColumn">
+            <image class="icon_fold_04" src="../images/icon_fold_03.png"></image>
+          </view>
+        </view>
+        <view class="panelLine"></view>
+      </view>
+      <view style="height:30rpx;"></view>
+    </view>
+
+    <block wx:if="{{List.length>0 && !IsSample}}">
+    <view class="text01">搜索结果</view>
+    <view class="panelBasicCss panelSearch2 FlexColumn" >
+      <view style="height:30rpx;"></view>
+      <view class="panelSchool FlexColumn" wx:for="{{List}}" wx:key="index" bindtap="goto" data-url="school?ID={{item.ID}}">
+        <view class="panelSchool1 FlexRow">
+          <view class="schoolName">{{item.SchoolFullName}}</view>
+          <view class="FlexRow">
+            <view class="text03">{{item.SchoolType1}}</view>
+            <view class="text04" wx:if="{{item.SchoolNumber}}">{{item.SchoolNumber}}</view>
+            <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+          </view>
+        </view>
+        <view class="panelLine"></view>
+      </view>
+      <view style="height:50rpx;"></view>
+    </view>
+    </block>
+
+    <block wx:if="{{List.length==0 && !IsSample}}">
+      <image class="icon_sys_121" src="../images/icon_sys_12.png"></image>
+      <view class="text06">没有内容</view>
+      <view class="panelLine4"></view>
+      <view class="panel3 FlexColumn" wx:if="{{List.length==0}}">
+        <view class="panel21 FlexRow">
+          <view>热搜</view>
+        </view>
+        <view class="panel32 FlexRow">
+          <view class="panel321 FlexColumn" wx:for="{{SchoolSearch}}" wx:key="index" bindtap="goto" data-url="school?ID={{item.ID}}">
+            <image class="imageSchool" src="{{ImagePath}}/web/_School/{{item.ImageUrl}}" ></image>
+            <image class="imageSchool imageSchoolMask" src="../images/mask_01.png" ></image>
+            <view class="panel3211">{{item.Name}}</view>
+          </view>
+        </view>
+      </view>
+    </block>
+  </block>
+  
+  <view style="height: 100rpx;"></view>
+</view>

pages/main/search.wxss

@@ -0,0 +1,215 @@
+.panel1{
+  width:100%;
+  height:150rpx;
+  background-color: #f0f0f0;
+  position: fixed;
+  top:0;
+  z-index: 10;
+}
+
+.panelSearch1{
+  width:710rpx;
+  height:90rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin-top: 30rpx;
+}
+
+.Input{
+  margin: 0 0 0 30rpx;
+  width:444rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.circle{
+  width:40rpx;
+  height:40rpx;
+  border-radius: 50%;
+  background-color: #e3e3e3;
+}
+.icon_del_02{
+  width:16rpx;
+  height:16rpx;
+}
+
+.panelLine3{
+  width:2rpx;
+  height:50rpx;
+  background-color: #d2d2d2;
+}
+
+.btnCancel{
+  width:116rpx;
+  height:80rpx;
+  background-color: #fff;
+  color:#EB5C28;
+  line-height: 80rpx;
+  text-align: center;
+  font-size:28rpx;
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
+.panel2{
+  width:650rpx;
+  margin-top: 30rpx;
+  height: 380rpx;
+  justify-content: flex-start;
+}
+
+.panel21{
+  justify-content: space-between;
+  width:100%;
+}
+
+.universalpic_dustbin_black_24x30{
+  width:24rpx;
+  height:30rpx;
+}
+
+.panel22{
+  width:100%;
+  border-top:1rpx solid #d2d2d2;
+  margin-top: 30rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelSearchItem{
+  width: 280rpx;
+  margin: 30rpx 30rpx 0 0;
+  justify-content: flex-start;
+}
+
+.icon_sys_12{
+  width:20rpx;
+  height:24rpx;
+  margin-right: 20rpx;
+}
+.text02{
+  font-size: 28rpx;
+  font-weight: 400;
+}
+.text05{
+  min-height:100rpx;
+}
+
+.panel3{
+  width:650rpx;
+  margin-top: 50rpx;
+}
+
+.panel32{
+  width:690rpx;
+  margin-top: 40rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.imageSchool{
+  width:325rpx;
+  height:210rpx;
+  border-radius: 10rpx;
+  margin: 0 10rpx 20rpx 10rpx;
+}
+
+.imageSchoolMask{
+  margin: 0;
+  position: absolute;
+  top:0;
+}
+.panel321{
+  position: relative;
+}
+.panel3211{
+  position: absolute;
+  font-size: 20rpx;
+  color:#fff;
+  left:30rpx;
+  top:162rpx;
+  z-index: 10;
+}
+
+.panelSchool{
+  width:100%;
+}
+
+.panelSchoolSample{
+  width:710rpx;
+}
+
+.panelSchool1{
+  width:100%;
+  justify-content: space-between;
+}
+.schoolName{
+  margin:30rpx 0 30rpx 30rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  width: 400rpx;
+}
+
+.schoolName2{
+  font-size: 24rpx;
+  color:#EB5C28;
+  font-weight: 700;
+  width:144rpx;
+  margin-right: 20rpx;
+}
+.text03{
+  font-size:24rpx;
+  color:#787878;
+  margin-right: 30rpx;
+}
+.text04{
+  font-size:24rpx;
+  color:#989898;
+  font-family: 'Roboto-Black';
+  margin: 0 30rpx 0 -10rpx;
+}
+
+
+.icon_sys_121{
+  width:50rpx;
+  height:60rpx;
+  margin-top: 210rpx;
+}
+
+.text06{
+  font-size: 36rpx;
+  margin: 30rpx 0 150rpx 0;
+}
+
+.text01{
+  font-size:36rpx;
+  align-self: start;
+  margin: 50rpx 0 0 40rpx;
+}
+
+.panelLine4{
+  width:650rpx;
+  height:1rpx;
+  background-color: #d2d2d2;
+}
+
+.panelSearch2{
+  margin-top: 40rpx;
+}
+.panelSchool11{
+  justify-content: flex-start;
+}
+
+.panelFold1{
+  width:34rpx;
+  height:34rpx;
+  background-color: #EB5C28;
+  border-radius: 50%;
+}
+
+.icon_fold_04{
+  width:18rpx;
+  height:10rpx;
+}

pages/main/subscribe.js

@@ -0,0 +1,36 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  goto: function (e) {
+    main.goto(e);
+  },
+  setSubscribe:function(){
+    main.getData("SubscribeMessage?UserID="+app.globalData.userInfo.UserID, function (data) {
+      wx.showToast({
+        title: '订阅成功',
+      });
+    });
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/subscribe.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "自招·中职校"
+}

pages/main/subscribe.wxml

@@ -0,0 +1,8 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class="icon_sys_11" src="../images/icon_sys_11.png"></image>
+  <view class="text01">资料维护中</view>
+  <view class="panel1 FlexColumn">
+    <view class="text02">完工后可发送小程序通知给您</view>
+    <view class="btn" bindtap="setSubscribe">订阅通知</view>
+  </view>
+</view>

pages/main/subscribe.wxss

@@ -0,0 +1,38 @@
+.icon_sys_11{
+  width:120rpx;
+  height:120rpx;
+  margin-top: 200rpx;
+}
+
+.text01{
+  font-size: 36rpx;
+  margin-top: 30rpx;
+}
+
+.panel1{
+  width:600rpx;
+  height:350rpx;
+  background-color: #fff;
+  margin-top: 100rpx;
+  border-radius: 20rpx;
+  justify-content: flex-start;
+}
+
+.text02{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-top: 80rpx;
+}
+
+.btn{
+  width:360rpx;
+  height:110rpx;
+  line-height: 110rpx;
+  text-align: center;
+  border: 3rpx solid #EB5C28;
+  margin-top: 40rpx;
+  border-radius: 20rpx;
+  background-color: #FCE9E3;
+  color:#EB5C28;
+  font-size: 36rpx;
+}

pages/main/webview.js

@@ -0,0 +1,28 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+
+  },
+  onLoad: function (options) {
+    var that = this;
+    if (options.url){
+      that.setData({
+        Url:options.url,
+      });
+    }
+  },
+  onShareTimeline: function () {
+    return this.onShareAppMessage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: "上海中考招生信息查询工具",
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/webview.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/main/webview.wxml

@@ -0,0 +1 @@
+<web-view src="{{Url}}"></web-view>

pages/main/webview.wxss

@@ -0,0 +1 @@
+/* pages/main/webview.wxss */

pages/template/componentList.wxml

@@ -0,0 +1,191 @@
+<template name="componentList">
+    <!-- 显示全部表头 -->
+    <view class="panelScoreHeader FlexRow" wx:if="{{IsListAll}}">
+      <view class="panelScoreHeaderTd1"></view>
+      <view class="panelScoreHeaderTd2"><view class="MarginLeft20">计划</view></view>
+      <view class="panelScoreHeaderTd3"><view class="MarginLeft20">最低分</view></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">计划</view>
+      <view class="panelScoreHeaderTd8">最低分</view>
+    </view>
+
+    
+    <block wx:if="{{!ContrastNull}}">
+
+      <block wx:for="{{List}}" wx:key="index">
+      
+        <!-- 名额到校校名，收藏学校 -->
+        <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: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>
+        
+        <!-- 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>
+
+        <!-- 自主招生 -->
+        <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>
+          <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="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>
+            <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>
+            <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="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>
+            <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>
+          </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 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>

project.private.config.json

@@ -2,6 +2,8 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "%E7%A7%92%E8%BF%87%E5%88%86%E6%95%B0%E7%BA%BF",
   "setting": {
-    "compileHotReLoad": true
-  }
+    "compileHotReLoad": true,
+    "urlCheck": true
+  },
+  "libVersion": "2.30.4"
 }

utils/constant.js

@@ -1,20 +1,580 @@
 module.exports = {
-  arrDistrict:[
-    {ID:"01",Name:"黄浦区",Count:"17"},
-    {ID:"02",Name:"徐汇区",Count:"18"},
-    {ID:"03",Name:"长宁区",Count:"9"},
-    {ID:"04",Name:"静安区",Count:"21"},
-    {ID:"05",Name:"普陀区",Count:"13"},
-    {ID:"06",Name:"虹口区",Count:"11"},
-    {ID:"07",Name:"杨浦区",Count:"14"},
-    {ID:"08",Name:"闵行区",Count:"29"},
-    {ID:"09",Name:"宝山区",Count:"19"},
-    {ID:"10",Name:"嘉定区",Count:"12"},
-    {ID:"11",Name:"浦东新区",Count:"55"},
-    {ID:"12",Name:"金山区",Count:"10"},
-    {ID:"13",Name:"松江区",Count:"13"},
-    {ID:"14",Name:"青浦区",Count:"8"},
-    {ID:"15",Name:"奉贤区",Count:"9"},
-    {ID:"16",Name:"崇明区",Count:"8"},
+  arrYear: [{
+      Name: "2023",
+      CSS: "Selected"
+    },
+    {
+      Name: "2022",
+      CSS: ""
+    },
+  ],
+  arrPublicOrPrivate: [{
+      Name: "公办",
+      CSS: "Selected"
+    },
+    {
+      Name: "民办",
+      CSS: "Selected"
+    },
+  ],
+  arrPublicOrPrivate2: [{
+      Name: "公办",
+      CSS: "Selected"
+    },
+    {
+      Name: "民办",
+      CSS: "Selected"
+    },
+    {
+      Name: "中外合作",
+      CSS: "Selected"
+    },
+  ],
+  arrLocalOrNolocal: [{
+      Name: "全部",
+      CSS: "Selected"
+    },
+    {
+      Name: "本区高中",
+      CSS: ""
+    },
+    {
+      Name: "外区高中",
+      CSS: ""
+    },
+  ],
+  arrSchoolType1: [{
+      Name: "高中",
+      CSS: "Selected",
+      Remark: "对比招生计划"
+    },
+    {
+      Name: "初中",
+      CSS: "",
+      Remark: "对比名额分配到校"
+    },
+  ],
+  arrScoreType: [{
+      Name: "自主招生",
+      ID: "1",
+      Icon: "icon_sys_04",
+      CSS: "Selected"
+    },
+    {
+      Name: "名额到区",
+      ID: "2",
+      Icon: "icon_sys_06"
+    },
+    {
+      Name: "名额到校",
+      ID: "3",
+      Icon: "icon_sys_08"
+    },
+    {
+      Name: "1-15志愿",
+      ID: "4",
+      Icon: "icon_sys_10"
+    },
+  ],
+  arrTailScore: [{
+    Name: "显示末位录取考生成绩（分科分数）",
+    CSS: ""
+  }, ],
+  arrAccommodation: [{
+      Name: "全部寄宿",
+      CSS: "Selected"
+    },
+    {
+      Name: "部分寄宿",
+      CSS: "Selected"
+    },
+    {
+      Name: "无寄宿",
+      CSS: "Selected"
+    },
+  ],
+  arrSchoolType: [{
+      Name: "市重点",
+      CSS: "Selected",
+      SchoolType1: "高中"
+    },
+    {
+      Name: "区重点",
+      CSS: "",
+      SchoolType1: "高中"
+    },
+    {
+      Name: "一般高中",
+      CSS: "",
+      SchoolType1: "高中"
+    },
+    {
+      Name: "初中",
+      CSS: "",
+      SchoolType1: "初中"
+    },
+  ],
+  arrFeedback: [{
+      Name: "纠错",
+      CSS: "Selected"
+    },
+    {
+      Name: "提供内容",
+      CSS: ""
+    },
+    {
+      Name: "产品建议",
+      CSS: ""
+    },
+  ],
+  arrDistrict: [{
+      ID: "01",
+      Name: "黄浦区",
+      Count: "17"
+    },
+    {
+      ID: "02",
+      Name: "徐汇区",
+      Count: "19"
+    },
+    {
+      ID: "03",
+      Name: "长宁区",
+      Count: "9"
+    },
+    {
+      ID: "04",
+      Name: "静安区",
+      Count: "21"
+    },
+    {
+      ID: "05",
+      Name: "普陀区",
+      Count: "13"
+    },
+    {
+      ID: "06",
+      Name: "虹口区",
+      Count: "12"
+    },
+    {
+      ID: "07",
+      Name: "杨浦区",
+      Count: "16"
+    },
+    {
+      ID: "08",
+      Name: "闵行区",
+      Count: "29"
+    },
+    {
+      ID: "09",
+      Name: "宝山区",
+      Count: "19"
+    },
+    {
+      ID: "10",
+      Name: "嘉定区",
+      Count: "12"
+    },
+    {
+      ID: "11",
+      Name: "浦东新区",
+      Count: "60"
+    },
+    {
+      ID: "12",
+      Name: "金山区",
+      Count: "10"
+    },
+    {
+      ID: "13",
+      Name: "松江区",
+      Count: "13"
+    },
+    {
+      ID: "14",
+      Name: "青浦区",
+      Count: "8"
+    },
+    {
+      ID: "15",
+      Name: "奉贤区",
+      Count: "9"
+    },
+    {
+      ID: "16",
+      Name: "崇明区",
+      Count: "8"
+    },
+  ],
+  arrArticleList: [{
+      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: "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: "体育“一条龙”市级优秀体育学生招收学校和项目",
+      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: "艺术“一条龙”市级艺术骨干学生招收学校、项目和艺术团汇总",
+      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: "国际课程班和中外合作办学自主招生计划情况",
+      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: "政策性照顾加分和同分优待情况",
+      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",
+      ID: 1
+    },
+    {
+      Name: "上海交通大学附属中学",
+      ImageUrl: "0002_01.jpeg",
+      ID: 2
+    },
+    {
+      Name: "复旦大学附属中学",
+      ImageUrl: "0003_01.jpeg",
+      ID: 3
+    },
+    {
+      Name: "华东师范大学第二附属中学",
+      ImageUrl: "0004_01.jpeg",
+      ID: 4
+    },
   ],
 }

utils/main.js

@@ -103,9 +103,101 @@ function getWindowHeight() {
   return height;
 }
 
+function onSelect(obj,event,callback){
+  var result=false;
+  var str=event.currentTarget.dataset.object;
+  var index=event.currentTarget.dataset.index;
+  var clickType=event.currentTarget.dataset.clicktype;
+
+  if (clickType=="checkbox"){
+    if (obj.data[str][index].CSS)
+      obj.data[str][index].CSS="";
+    else{
+      obj.data[str][index].CSS="Selected";
+      result=true;
+    }
+  }
+  else{
+    for(var i=0;i<obj.data[str].length;i++){
+      if (i==index){
+        obj.data[str][i].CSS="Selected";
+      }
+      else{
+        obj.data[str][i].CSS="";
+      }
+    }
+  }
+  obj.setData(obj.data);
+  callback(obj,event,result);
+}
+
+function returnTop() {
+  if (wx.canIUse('pageScrollTo')) {
+    wx.pageScrollTo({
+      scrollTop: 0
+    });
+  }
+}
+
+function getBaiduToken() {
+  var that = this
+  //调用登录接口
+  wx.login({
+    success: function (res0) {
+      getData('GetBaiduToken20220922?ProgramID='+app.globalData.ProgramID+'&Code='+res0.code, function (data) {
+        if (data) {
+          app.globalData.BaiduToken = data;
+          //console.log(app.globalData.BaiduToken);
+        }
+      });
+    }
+  });
+}
+
+function getCollect(callback) {
+  var that = this;
+  var list=wx.getStorageSync("CollectList");
+  if (list){
+    if (callback)
+      callback(list);
+  }
+  else{
+    var id=app.globalData.userInfo.UserID;
+    getData("GetMPSSchoolCollect?UserID="+id, function (data) {
+      if (data) {
+        wx.setStorageSync('CollectList', data);
+        if (callback)
+          callback(data);
+      }
+      else
+        if (callback)
+          callback(null);
+    });
+  }
+}
+
+function goto(e) {
+  if (app.globalData.IsGoto){
+    app.globalData.IsGoto=false;
+    setTimeout(function(){
+      app.globalData.IsGoto=true;
+    },1000);
+    var url = e.currentTarget.dataset.url;
+    
+    wx.navigateTo({
+      url: './' + url,
+    });
+  }
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
   getLocalHost: getLocalHost,
   getWindowHeight: getWindowHeight,
+  onSelect: onSelect,
+  returnTop:returnTop,
+  getBaiduToken: getBaiduToken,
+  getCollect: getCollect,
+  goto:goto,
 }