1.1.8

app.js

@@ -1,16 +1,16 @@
 App({
   globalData: {
-    Version: "1.0.39",
-    IsProduction: true,
+    Version: "1.1.8",
+    //IsProduction: true,
     ShareTitle: "上海中考招生信息查询工具",
     SharePath: "pages/index/index",
     ShareImage: '../images/fs_a01.png',
     ProgramID: 173,
     ProgramName: "秒过分数线",
     AppID: "wx39bc498e7fdacb6b",
-    serverUrl: "https://www.kylx365.com/apiData/",
-    serverUrlServer: "https://www.kylx365.com/apiData/",
-    serverUrlLocalhost: "http://localhost:3020/apiData/",
+    serverUrl: "https:/scoreline.kylx365.com/apiData/",
+    serverUrlServer: "https://scoreline.kylx365.com/apiData/",
+    serverUrlLocalhost: "http://localhost:3000/apiData/",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     IsIOS: true,
     IsAndroid: false,
@@ -28,7 +28,8 @@ App({
     TempParam: "", //临时参数
     MyWish: {}, //我的福帖
     FeedbackUrl:"",
-    ArticleList:[]  //文章列表 
+    ArticleList:[],  //文章列表 
+    ArrYear:[],//年份列表
   },
   onLaunch: function (options) {
     this.getSystemInfo();

app.json

@@ -17,6 +17,7 @@
     "pages/main/subscribe",
     "pages/main/feedbackinfo",
     "pages/main/imagelist",
+    "pages/main/feedbackresult",
     "pages/main/district"
   ],
   "permission": {
@@ -46,6 +47,23 @@
     "backgroundColor": "#F0F0F0",
     "enablePullDownRefresh": false
   },
+  "subPackages": [
+    {
+      "root": "packageProduct",
+      "pages": [
+        "main/product",
+        "main/feedbackinfo"
+      ]
+    }
+  ],
+  "preloadRule": {
+    "packageProduct/main/product": {
+      "network": "all",
+      "packages": [
+        "packageProduct"
+      ]
+    }
+  },
   "style": "v2",
   "sitemapLocation": "sitemap.json"
 }

app.wxss

@@ -407,6 +407,7 @@
   font-family: 'Roboto-Black';
   margin-left: 20rpx;
 }
+
 .panelScoreNumber01Null{
   font-size: 24rpx;
   font-weight: 400;
@@ -618,7 +619,7 @@
   right:0;
   border-top-left-radius: 40rpx;
   background-color: #1e1e1e;
-  z-index: 10;
+  z-index: 30;
   color:#fff;
   font-size: 24rpx;
   flex-wrap: wrap;

packageProduct/main/feedbackinfo.js

@@ -0,0 +1,266 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    Feedback:[
+      {
+        Name: "纠错",
+        CSS: "Selected"
+      },
+      {
+        Name: "提供内容",
+        CSS: ""
+      },
+      {
+        Name: "产品建议",
+        CSS: ""
+      },
+    ],
+    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(),
+      IsShow:app.globalData.userInfo.IsShow,
+      Feedback:that.data.Feedback,
+    });
+    main.checkGenerating();
+  },
+  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.ProgramID=186;
+          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;
+
+          param.FeedbackUrl=app.globalData.FeedbackUrl;
+            
+          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,
+    }
+  },
+})

packageProduct/main/feedbackinfo.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "用户反馈",
+  "navigationBarBackgroundColor": "#F0F0F0",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

packageProduct/main/feedbackinfo.wxml

@@ -0,0 +1,46 @@
+<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:#9b9b9b;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" wx:if="{{IsShow}}">
+    <view class="text01">联系方式</view>
+    <view class="panelLine3"></view>
+    <textarea class="text06" bindinput="bindKeyInput2" value="{{InputValue2}}" maxlength="100" placeholder="您的联系方式" placeholder-style="color:#9b9b9b;font-size:28rpx;font-weight:400;" />
+  </view>
+  
+  <view class="btn" bindtap="saveFeedback">提交</view>
+
+  <view style="height:200rpx"></view>
+</view>

packageProduct/main/feedbackinfo.wxss

@@ -0,0 +1,162 @@
+
+.container {
+  width:100%;
+  color: #4D4D4D;
+  justify-content: flex-start;
+  font-weight: 700;
+  background-color: #F2F2F2;
+} 
+
+.panelBasicCss{
+  border-radius: 20rpx;
+  background-color: #fff;
+  width:710rpx;
+  min-height:10rpx;
+  position: relative;
+  margin-top: 30rpx;
+}
+
+
+.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;
+}
+
+
+.panelCheckbox{
+  height:48rpx;
+  background-color: #fff;
+  border:2rpx solid #E8E6E4;
+  border-radius: 10rpx;
+  margin-right: 10rpx;
+  font-size: 20rpx;
+  padding: 0 20rpx;
+}
+.panelCheckboxSelected{
+  background-color: #FCE9E3;
+  color:#EB5C28;
+  border:2rpx solid #FCE9E3;
+}
+.panelCheckboxCircle{
+  border-radius: 50%;
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #E8E6E4;
+  margin-right: 10rpx;
+}
+.panelCheckboxCircleSelected{
+  background-color: #EB5C28;
+  border: 2rpx solid #EB5C28;
+}
+
+.panelCheckbox_icon_check_01{
+  width: 16rpx;
+  height: 12rpx;
+}
+
+
+.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-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;
+}

packageProduct/main/product.js

@@ -0,0 +1,72 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsIPhoneX:app.globalData.IsIPhoneX,
+    ProgramName:app.globalData.ProgramName,
+    Version:app.globalData.Version,
+  },
+  onLoad: function (options) {
+    let that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    let bgcolor="",fcolor="";
+    main.getData('GetProgramList', function (data) {
+      if (data) {
+        for(let i=0;i<data.length;i++){
+          if (data[i].ID==app.globalData.ProgramID){
+            wx.setNavigationBarColor({
+              frontColor: data[i].FColor,
+              backgroundColor: data[i].BGColor,
+            });
+            that.setData({
+              BGColor:data[i].BGColor,
+              FColor:data[i].FColor,
+              ProgramList:data,
+            });
+            break;
+          }
+        }
+      }
+    });
+    
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  gotoRedirectTo: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.redirectTo({
+      url: url,
+    });
+  },
+  switchProgram:function(e) {
+    var list = this.data.ProgramList;
+    for(let i=0;i<list.length;i++){
+      if (list[i].ID==e.currentTarget.dataset.id){
+        wx.navigateToMiniProgram({
+          appId: list[i].AppID,
+          path: list[i].PathUrl+"?SourceID="+app.globalData.ProgramID,
+        });
+        break;
+      }
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

packageProduct/main/product.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "秒过系列产品",
+  "usingComponents": {}
+}

packageProduct/main/product.wxml

@@ -0,0 +1,112 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn" style="background-color: {{BGColor}};color:{{FColor}}">
+    <text class="panel1Text" style="color:{{FColor}};">除了{{ProgramName}}，「秒过」团队还为您准备了以下学习工具。点开就能用。</text>
+    <view class="pdt_a06a_triangle" style="border-top-color:{{BGColor}};"></view>
+  </view>
+
+  <view class="panel2 FlexColumn">
+    <view class="panel21 FlexRow">
+      <image src="../images/pdt_a01.png" class="pdt_a01"></image>
+    </view>
+    <view class="panel22 FlexRow">
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="105">
+        <image src="../images/pdt_b01.png" class="pdt_b01"></image>
+        <view class="panel2Text1">数学计算题</view>
+        <view class="panel2Text2">计算题（竖式）出题工具。包含小学阶段全部题型，适合打印卷子做笔算、批改。</view>
+      </view>
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="164">
+        <image src="../images/pdt_b02.png" class="pdt_b01"></image>
+        <view class="panel2Text1">口算星球</view>
+        <view class="panel2Text2">口算心算训练，包含小学全部口算题型，系统性提升效率、准确性和解题思维。</view>
+      </view>
+    </view>
+
+    <view class="panel21 FlexRow">
+      <image src="../images/pdt_a02.png" class="pdt_a01"></image>
+    </view>
+    <view class="panel22 FlexRow">
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="186">
+        <image src="../images/pdt_b03.gif" class="pdt_b01"></image>
+        <view class="panel2Text1">语境背单词</view>
+        <view class="panel2Text3">单词三剑客之一</view>
+        <view class="panel2Text2">在真实语境中理解单词含义和用法，用答题巩固记忆，破解记不牢、不会用难题。</view>
+      </view>
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="99">
+        <image src="../images/pdt_b02.png" class="pdt_b01"></image>
+        <view class="panel2Text1">自然拼读</view>
+        <view class="panel2Text3">单词三剑客之二</view>
+        <view class="panel2Text2">帮助孩子掌握英语单词发音规则，实现看词能读、听音能写的目标。</view>
+      </view>
+    </view>
+    
+    <view class="panel21 FlexRow">
+      <image src="../images/pdt_a03.png" class="pdt_a01"></image>
+    </view>
+    <view class="panel22 FlexRow">
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="98">
+        <image src="../images/pdt_b04.png" class="pdt_b01"></image>
+        <view class="panel2Text1">秒过拼音</view>
+        <view class="panel2Text2">拼音音节认读、声母韵母组合练习、前后鼻音平翘舌音对比练习、诗歌朗读示范。</view>
+      </view>
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="106">
+        <image src="../images/pdt_b05.png" class="pdt_b01"></image>
+        <view class="panel2Text1">秒过识字</view>
+        <view class="panel2Text2">一类字认读和默写工具（小学一到六年级课本同步），含笔顺、解释、发音点读。</view>
+      </view>
+    </view>
+
+    <view class="panel21 FlexRow">
+      <image src="../images/pdt_a04.png" class="pdt_a01 pdt_a04"></image>
+    </view>
+    <view class="panel22 FlexRow">
+      <view class="panel221 panel222 FlexColumn" bind:tap="switchProgram" data-id="166">
+        <image src="../images/pdt_b07.gif" class="pdt_b07"></image>
+        <view class="panel2Text1">秒过-错题记忆卡</view>
+        <view class="panel2Text3">单词三剑客之三</view>
+        <view class="panel2Text2 panel2Text5">基于艾宾浩斯记忆法，管理、练习孩子的所有背记问题。可直接解决语文字词、成语、古诗；英语词汇；数物化公式、定理；史地政等必考要点。</view>
+      </view>
+    </view>
+
+    <view class="panel21 FlexRow">
+      <image src="../images/pdt_a05.png" class="pdt_a01"></image>
+    </view>
+    <view class="panel22 FlexRow">
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="173">
+        <image src="../images/pdt_b08.png" class="pdt_b01"></image>
+        <view class="panel2Text1">秒过分数线</view>
+        <view class="panel2Text2">上海中考招生信息查询，填写志愿的好帮手。包括招生计划、分数线，学校信息。</view>
+      </view>
+      <view class="panel221 FlexColumn" bind:tap="switchProgram" data-id="90">
+        <image src="../images/pdt_b09.png" class="pdt_b01"></image>
+        <view class="panel2Text1">秒过专注力</view>
+        <view class="panel2Text2">心理学常用的注意力训练工具，锻炼集中注意力，提升手眼协调控制水平。</view>
+      </view>
+    </view>
+  </view>
+
+  <view class="panel3 FlexColumn">
+    <view class="panel31 FlexRow" bind:tap="goto" data-url="feedbackinfo">
+      <view class="panel3Text1">纠错与建议</view>
+      <image src="../images/pdt_a07.png" class="pdt_a07"></image>
+    </view>
+    <view class="panel3Line"></view>
+    <text class="panel3Text2"><text class="panel3Text3">诚恳声明：</text>如您发现产品提供的信息存在错误，欢迎您告诉我们，我们会力所能及的范围内持续完善，感谢您的帮助和支持！</text>
+    <text class="panel3Text4">©2025 {{ProgramName}}\n唱意教育微信小程序 版本 {{Version}}</text>
+  </view>
+
+  <view style="height: 200rpx;"></view>
+
+  <view class="panelFooterNav FlexColumn">
+    <view class="panelFooterNav2 FlexRow">
+      <view class="panelFooterNavBtn FlexColumn" bind:tap="goto" data-url="../../pages/main/default">
+        <view>分数线</view>
+        <view class="panelFooterNavLine"></view>
+      </view>
+      <view class="panelFooterNavBtn FlexColumn" >
+        <view>秒过</view>
+        <view class="panelFooterNavLine1"></view>
+      </view>
+    </view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+  </view>
+</view>

packageProduct/main/product.wxss

@@ -0,0 +1,181 @@
+.container{
+  background-color: #E1D2B4;
+}
+.panel1{
+  width:100%;
+  background-color: #004433;
+}
+.panel1Text{
+  width:630rpx;
+  font-size: 28rpx;
+  color: #E9FFDF;
+  margin: 30rpx 0;
+}
+
+.pdt_a06a{
+  width: 54rpx;
+  height:20rpx;
+  position: absolute;
+  top:135rpx;
+  left:62rpx;
+  z-index: 10;
+}
+
+.pdt_a06a_triangle{
+  width: 0;
+  height: 0;
+  border-left: 18rpx solid transparent;
+  border-right: 35rpx solid transparent;
+  border-top: 20rpx solid #004433;
+  position: absolute;
+  top:135rpx;
+  left:62rpx;
+  z-index: 10;
+}
+
+
+.panel2{
+  width: 100%;
+  justify-content: flex-start;
+  margin-top: 20rpx;
+}
+.panel21{
+  width: 100%;
+  justify-content: flex-start;
+}
+.pdt_a01{
+  width:82rpx;
+  height:51rpx;
+  margin: 60rpx 0 40rpx 50rpx;
+}
+
+.panel22{
+  width:100%;
+}
+.panel221{
+  width:340rpx;
+  margin: 0 10rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  color: #464044;
+  position: relative;
+}
+.pdt_b01{
+  width:340rpx;
+  height:280rpx;
+}
+.panel2Text1{
+  font-size: 36rpx;
+  margin: 30rpx 0 10rpx 20rpx;
+}
+.panel2Text2{
+  font-weight: 400;
+  font-size: 24rpx;
+  width: 300rpx;
+  margin: 0 0 0 20rpx;
+}
+.panel2Text3{
+  width: 100rpx;
+  text-align: right;
+  font-size: 20rpx;
+  font-weight: 400;
+  position: absolute;
+  top: 310rpx;
+  right:20rpx;
+}
+.pdt_a04{
+  width: 156rpx;
+}
+.panel222{
+  width: 700rpx;
+}
+.pdt_b07{
+  width: 700rpx;
+  height:280rpx;
+}
+.panel2Text5{
+  width:660rpx;
+}
+
+.panel3{
+  width:100%;
+  margin: 100rpx 0 0 0;
+}
+
+.panel31{
+  width:100%;
+  justify-content: space-between;
+  height:100rpx
+}
+.panel3Text1{
+  font-size: 28rpx;
+  color: #4D4D4D;
+  margin-left: 45rpx;
+}
+.pdt_a07{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 75rpx;
+}
+.panel3Line{
+  width: 660rpx;
+  height:1rpx;
+  background-color: #574E55;
+}
+
+.panel3Text2{
+  width: 660rpx;
+  font-size: 20rpx;
+  color: #4D4D4D;
+  margin-top: 30rpx;
+  font-weight: 400;
+}
+.panel3Text3{
+  font-weight: 700;
+}
+.panel3Text4{
+  width: 660rpx;
+  margin: 50rpx 0 0 0;
+  font-size: 20rpx;
+  color: #464044;
+}
+
+
+.panelFooterNav{
+  width: 100%;
+  background-color: #fff;
+  color: #4D4D4D;
+  position: fixed;
+  bottom: 0;
+  z-index: 100;
+}
+.panelFooterNav2{
+  width:100%;
+  position: relative;
+  z-index: 100;
+}
+
+.panelFooterNavBtn{
+  width: 50%;
+  font-size: 36rpx;
+  height: 100rpx;
+  justify-content: flex-end;
+}
+.panelFooterNavLine{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+  background-color: #fff;
+}
+.panelFooterNavLine1{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+  background-color: #FFC868;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
+}

pages/index/index.js

@@ -179,6 +179,9 @@ Page({
           //debugger;
           app.globalData.userInfo.IsShow = isShow;
 
+          app.globalData.userInfo.ArrYear[0].ShortName=app.globalData.userInfo.ArrYear[0].Name.substr(2);
+          app.globalData.userInfo.ArrYear[1].ShortName=app.globalData.userInfo.ArrYear[1].Name.substr(2);
+
           wx.removeStorageSync("UserID");
           wx.removeStorageSync("UserName");
           wx.removeStorageSync("CollectList");
@@ -202,14 +205,10 @@ Page({
             }, 200);
           }
                     
-          that.getBaiduToken();
         }
       });
     });
   },
-  getBaiduToken: function () {
-    main.getBaiduToken();
-  },
   
   updateProgram: function () {
     const updateManager = wx.getUpdateManager();

pages/main/default.js

@@ -6,28 +6,20 @@ const app = getApp();
 
 Page({
   data: {
+    IsIPhoneX:app.globalData.IsIPhoneX,
     ImagePath: app.globalData.uploadImageUrl,
     ArticleList:[],
     District:constant.arrDistrict,  
     Version:app.globalData.Version,
-    Years:constant.arrYear,
     YearIndex:0,
     HideAddProgram:1,
   },
-  adLoad() {
-    console.log('原生模板广告加载成功')
-  },
-  adError(err) {
-    console.error('原生模板广告加载失败', err)
-  },
-  adClose() {
-    console.log('原生模板广告关闭')
-  },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsShow:app.globalData.userInfo.IsShow,
+      Years:app.globalData.userInfo.ArrYear,
     });
 
     if (app.globalData.GotoUrl) {
@@ -149,8 +141,8 @@ Page({
     return this.onShareAppMessage();
   },
   gotoMiniprogram:function(e){
-    var appid=e.currentTarget.dataset.appid;
-    var path=e.currentTarget.dataset.path;
+    var appid=e.currentTarget.dataset.appid || "wx80059777521b897c";
+    var path=e.currentTarget.dataset.path || "pages/index/index?SourceID="+app.globalData.ProgramID;
     
     main.gotoMiniprogram(appid,path);
   },

pages/main/default.json

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

pages/main/default.wxml

@@ -4,10 +4,10 @@
   
   <view class="panel0 FlexRow" wx:if="{{Notice.IsShow}}">
     <view class="panel01 FlexColumn">
-      <view class="panel011">{{Notice.Content}}</view>
+      <text class="panel011">{{Notice.Content}}</text>
       <view class="panel012">{{Notice.Title}}</view>
-      <view class="panel013 FlexRow" bindtap="goto" data-url="{{Notice.ButtonUrl}}" wx:if="{{Notice.ButtonTitle}}">
-        <image class="{{Notice.ButtonIcon}}" src="../images/{{Notice.ButtonIcon}}"></image>
+      <view class="panel013 FlexRow" bindtap="{{Notice.BottonClick}}" data-url="{{Notice.ButtonUrl}}" wx:if="{{Notice.ButtonTitle}}">
+        <image class="{{Notice.ButtonIcon}}" src="../images/{{Notice.ButtonIcon}}.png"></image>
         <view>{{Notice.ButtonTitle}}</view>
       </view>
     </view>
@@ -45,8 +45,13 @@
 
       
     </view>
-    <ad-custom class="ad_02" unit-id="adunit-5f05097bf0921da7" bindload="adLoad" binderror="adError" bindclose="adClose"></ad-custom>
-
+    <!-- <ad-custom class="ad_02" unit-id="adunit-5f05097bf0921da7" ></ad-custom> -->
+    <block wx:if="{{IsShow}}">
+      <view class="panelYJBDC FlexColumn">
+        <image class="yjbdc1" src="../images/yjbdc1.gif" bindtap="gotoMiniprogram" data-appid="wx80059777521b897c" data-path="pages/index/index?SourceID=173"></image>
+      </view>
+    </block>
+    
     <view class="panel114 FlexColumn" wx:if="{{IsShow}}">
       <view class="panel1141 FlexColumn">
         <view class="text12">中考祝福</view>
@@ -114,10 +119,11 @@
 
       <view class="panel4line03"></view>
     </view>
+
     
     <block wx:if="{{IsShow}}">
       <view class="panelRadio2 panelMarginTop FlexRow" style="margin: 80rpx 0 30rpx 40rpx;">
-      <view class="text14">详细文章</view><view class="panelRadio21 panelRadio21{{item.CSS}}" wx:for="{{Years}}" wx:key="index" bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio" wx:if="{{index<2}}">{{item.Name}}年</view>
+      <view class="text14">详细文章</view><view class="panelRadio21 panelRadio21{{item.CSS}}" wx:for="{{Years}}" wx:key="index" bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio" wx:if="{{index<3}}">{{item.Name}}年</view>
     </view>
     <view class="panel21 FlexColumn" >
       <view class="panel211 FlexRow" wx:for="{{ArticleList}}" wx:key="index" bindtap="goto" data-url="docs?ID={{item.ID}}" wx:if="{{item.Category==Years[YearIndex].Name && item.IsPageShow>=Page1}}">
@@ -156,14 +162,15 @@
     </view>
     </block>
     
-    <block wx:if="{{IsShow}}">
+    <!-- <block wx:if="{{IsShow}}">
       <view class="panelScroll FlexRow" >
         <scroll-view class="scroll-view_H" scroll-x>
           <image class="adProgram" src="{{item.ImageUrl}}" bindtap="gotoMiniprogram" data-appid="{{item.AppID}}" data-path="{{item.Path}}" wx:for="{{ProgramList}}" wx:key="*this"/>
           <view style="width: 30rpx;height:100rpx;display: inline-block;"></view>
         </scroll-view>
       </view>
-    </block>
+    </block> -->
+
     <image class="line_05" src="../images/line_03.png"></image>
     <block wx:if="{{IsShow}}">
       <view style="height:50rpx;"></view>
@@ -176,15 +183,34 @@
         <view class="text03 text031">纠错与建议</view>
         <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
       </view>
+      <view class="line07" style="margin-top: 0;"></view>
+      <view class="panel1133 FlexRow" bindtap="goto" data-url="feedbackresult">
+        <view class="text03 text031">用户感谢与处理结果</view>
+        <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+      </view>
     </block>
     
     <view class="line07" style="margin-top: 0;"></view>
     <view class="panel2 FlexRow">
       <text class="text09">
-        <text class="text10">诚恳声明：</text>本产品所有图文内容来自网络，仅供家长对上海地区招生计划有大致了解。由于有可能存在错谬，故不能作为填报志愿的决策依据，请务必以当时当地教育局和学校提供的信息为准。我们将认真对待用户提供的纠错和建议，尽可能刊载正确信息。
+        <text class="text10">诚恳声明：</text>本产品核心数据来自「上海市教育考试院-上海招考热线」官方文件，其他信息参考学校官网、校友提供或其它公开渠道，仅供上海中考生及家长参考。因信息可能存在疏漏，请务必以教育局及学校最新发布为准。我们持续完善数据，欢迎指正！
       </text>
     </view>
-    <text class="text11" bindtap="goto" data-url="webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">©2023-2024 秒过分数线 版本 {{Version}}</text>
+    <text class="text11" bindtap="goto" data-url="webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">©2023-2025 秒过分数线 版本 {{Version}}</text>
     <view style="height:100rpx;"></view>
   </view>
+
+  <view class="panelFooterNav FlexColumn">
+    <view class="panelFooterNav2 FlexRow">
+      <view class="panelFooterNavBtn FlexColumn" >
+        <view>分数线</view>
+        <view class="panelFooterNavLine1"></view>
+      </view>
+      <view class="panelFooterNavBtn FlexColumn" bind:tap="goto" data-url="../../packageProduct/main/product">
+        <view>秒过</view>
+        <view class="panelFooterNavLine"></view>
+      </view>
+    </view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+  </view>
 </view>

pages/main/default.wxss

@@ -1,6 +1,6 @@
 .container{
   width:100%;
-  background-color: #F8C324;
+  background-color: #FFC868;
 }
 .pic_01{
   width: 100%;
@@ -9,14 +9,14 @@
 .info_01{
   width: 300rpx;
   height:126rpx;
-  position: absolute;
+  position: fixed;
   right:10rpx;
   z-index: 10;
 }
 
 .panel0{
   width:100%;
-  background-color: #F8C324;
+  background-color: #FFC868;
 }
 
 .panel01{
@@ -51,7 +51,7 @@
 .panel1{
   width:100%;
   position: relative;
-  background-color: #F8C324;
+  background-color: #FFC868;
 }
 
 .pic_04{
@@ -370,7 +370,7 @@
 }
 
 .text09{
-  font-size: 20rpx;
+  font-size: 24rpx;
   font-weight: 400;
   width: 670rpx;
   margin-top: 30rpx;
@@ -570,4 +570,60 @@
   height:370rpx;
   margin: 0 0 0 30rpx;
   display: inline-block;
+}
+
+.panelYJBDC{
+  width:100%;
+  margin-top: 40rpx;
+  z-index: 20;
+}
+.panelYJBDC1{
+  font-size: 24rpx;
+  color: #2E2E2E;
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.yjbdc1{
+  width: 670rpx;
+  height:360rpx;
+}
+
+
+.panelFooterNav{
+  width: 100%;
+  background-color: #fff;
+  color: #4D4D4D;
+  position: fixed;
+  bottom: 0;
+  z-index: 100;
+}
+.panelFooterNav2{
+  width:100%;
+  position: relative;
+  z-index: 100;
+}
+
+.panelFooterNavBtn{
+  width: 50%;
+  font-size: 36rpx;
+  height: 100rpx;
+  justify-content: flex-end;
+}
+.panelFooterNavLine{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+  background-color: #fff;
+}
+.panelFooterNavLine1{
+  width: 108rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+  background-color: #FFC868;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
 }

pages/main/district.js

@@ -21,6 +21,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
       DistrictID:options.ID,
       DistrictName:options.Name,
+      IsShow:app.globalData.userInfo.IsShow,
     });
     
     wx.setNavigationBarTitle({
@@ -30,6 +31,9 @@ Page({
     that.init();
   },
   init:function(){
+    wx.showLoading({
+      title: '请稍等',
+    })
     var that = this;
     var id=Number(that.data.DistrictID);
     main.getData("GetMPSDistrictPersonNum?DistrictID="+id, function (data) {
@@ -43,10 +47,17 @@ Page({
               SchoolAll: data,
               SchoolCurrent:data[0].List
             });
+            setTimeout(function(){
+              wx.hideLoading();
+            },200);
+          }
+          else{
+            wx.hideLoading();
           }
         });
-        
       }
+      else
+        wx.hideLoading();
     });
   },
   onSelect:function(event){
@@ -68,14 +79,11 @@ Page({
   onShareTimeline: function () {
     return this.onShareAppMessage();
   },
-  adLoad() {
-    console.log('原生模板广告加载成功')
-  },
-  adError(err) {
-    console.error('原生模板广告加载失败', err)
-  },
-  adClose() {
-    console.log('原生模板广告关闭')
+  gotoMiniprogram:function(e){
+    var appid=e.currentTarget.dataset.appid || "wx80059777521b897c";
+    var path=e.currentTarget.dataset.path || "pages/index/index?SourceID="+app.globalData.ProgramID;
+    
+    main.gotoMiniprogram(appid,path);
   },
   onShareAppMessage: function () {
     var that=this;

pages/main/district.wxml

@@ -39,10 +39,6 @@
       </view>
     </view>
   </view>
-  <ad-custom class="ad_02" unit-id="adunit-91d2fe8025ce6c2b" bindload="adLoad" binderror="adError" bindclose="adClose"></ad-custom>
-
-
-  
   <view class="panelBasicCss panel2 FlexColumn">
     <view class="text02">招生查询</view>
     <view class="panel21 FlexRow">
@@ -75,7 +71,9 @@
     </view>
     <view style="height: 20rpx;"></view>
   </view>
-
+  
+  <ad-custom class="ad_02" unit-id="adunit-91d2fe8025ce6c2b" ></ad-custom>
+  
   <view class="panelBasicCss panel3 FlexRow" bindtap="goto" data-url="map?PageType=2&DistrictID={{DistrictID}}&DistrictName={{DistrictName}}">
     <view class="text06">校址地图</view>
     <view class="panel31 FlexRow">

pages/main/district.wxss

@@ -232,3 +232,21 @@
   border-radius: 10rpx;
 }
 /* ***************** */
+
+.panelYJBDC{
+  width:100%;
+  margin-top: 30rpx;
+  margin-bottom: 10rpx;
+  z-index: 20;
+}
+.panelYJBDC1{
+  font-size: 24rpx;
+  color: #2E2E2E;
+  text-align: center;
+  margin-bottom: 20rpx;
+
+}
+.yjbdc2{
+  width: 710rpx;
+  height:360rpx;
+}

pages/main/feedbackinfo.js

@@ -60,6 +60,7 @@ Page({
         if (success) {
           wx.hideLoading();         
           var param={};
+          param.ProgramID=173;
           param.UserID=app.globalData.userInfo.UserID;
           param.Content=that.data.InputValue;
           param.ContactTa=that.data.InputValue2;

pages/main/feedbackresult.js

@@ -0,0 +1,29 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    main.getData("GetMPSFeedbackList?UserID="+app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          List:data,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/feedbackresult.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "处理结果"
+}

pages/main/feedbackresult.wxml

@@ -0,0 +1,11 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="text01">感谢用户的大力帮助</view>
+  <view class="text02">以下是部分用户的帮助和处理结果，团队在此表示感谢。</view>
+
+  <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="index">
+    <view class="text03">感谢 {{item.CreateTime}} 提供帮助的用户</view>
+    <view class="text04">{{item.Content}}</view>
+    <view class="panel11 FlexRow">已处理</view>
+  </view>
+  <view style="height:100rpx;"></view>
+</view>

pages/main/feedbackresult.wxss

@@ -0,0 +1,43 @@
+.text01{
+  align-self: start;
+  font-size: 36rpx;
+  margin: 50rpx 0 0 40rpx;
+}
+.text02{
+  align-self: start;
+  font-size: 24rpx;
+  font-weight: 400;
+  margin: 10rpx 0 40rpx 40rpx;
+}
+
+.panel1{
+  width:710rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 20rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  position: relative;
+}
+.text03{
+  font-size: 28rpx;
+  margin: 42rpx 0 0 40rpx;
+}
+.text04{
+  margin: 10rpx 0 40rpx 40rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  overflow-x: hidden;
+  width:630rpx;
+  white-space: nowrap;
+}
+.panel11{
+  width: 120rpx;
+  height: 70rpx;
+  background: #D2D2D2;
+  border-radius: 0 20rpx 0 30rpx;
+  position: absolute;
+  top:0;
+  right:0;
+  font-size:24rpx;
+}

pages/main/recruitment.js

@@ -6,7 +6,6 @@ const app = getApp();
 var DistrictName="";
 Page({
   data: {
-    Years:constant.arrYear,
     YearIndex:0,
     District:[],
     ListNullData:false,
@@ -39,6 +38,7 @@ Page({
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      Years:app.globalData.userInfo.ArrYear,
       IsShow:app.globalData.userInfo.IsShow,
       District:arr,
       PanelType:options.PanelType,

pages/main/school.js

@@ -9,7 +9,6 @@ Page({
     PageType:"school",
     ScoreTypeID:1,//四种得分类型
     IsFold:false,
-    Years:constant.arrYear,
     YearIndex:0,
     ImagePath: app.globalData.uploadImageUrl,
     ScoreType:constant.arrScoreType,
@@ -22,6 +21,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsShow:app.globalData.userInfo.IsShow,
+      Years:app.globalData.userInfo.ArrYear,
       SchoolID:options.ID,
       IsCollect:false,
       HasWish:false,
@@ -247,7 +247,7 @@ Page({
     });
   },
   gotoMiniprogram:function(){
-    var appid="wx84b3feac6069eec3";
+    var appid="wx80059777521b897c";
     var path='pages/index/index?SourceID=' + app.globalData.ProgramID;
     main.gotoMiniprogram(appid,path);
   },

pages/main/school.wxml

@@ -101,9 +101,6 @@
     </view>
     <view style="height:10rpx;"></view>
   </view>
-  
-  <ad-custom class="ad_02" unit-id="adunit-02744b3b3498643c" bindload="adLoad" binderror="adError" bindclose="adClose"></ad-custom>
-
   <view class="panelBasicCss panelMain FlexColumn" wx:if="{{Info.HasData}}">
     <block wx:if="{{Info['自主招生']}}">
       <view class="panelSchoolText20 FlexRow">
@@ -205,12 +202,12 @@
         </block>
 
         <!-- 国际 -->
-        <block wx:if="{{Info['自主招生'][0].List[3].PlanNum || Info['自主招生'][0].List[4].PlanNum}}">
+        <block wx:if="{{Info['自主招生'][0].List[3].PlanNum || Info['自主招生'][0].List[4].PlanNum || Info['自主招生'][1].List[3].PlanNum || Info['自主招生'][1].List[4].PlanNum}}">
           <view class="panelSchoolText13 panelSchoolIndependent4">国际课程班和中外合作办学高中</view>
           <view class="panelSchoolIndependent3 FlexRow">
             <view class="panelSchoolIndependentText2 panelSchoolText13">本市生源</view>
-            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][0].List[3].PlanNum}}</view>
-            <view class="panelSchoolText11 ">{{Info['自主招生'][1].List[3].PlanNum}}</view>
+            <view class="panelSchoolText11 panelSchoolText112"><block wx:if="{{!Info['自主招生'][0].List[3].PlanNum}}">0</block>{{Info['自主招生'][0].List[3].PlanNum}}</view>
+            <view class="panelSchoolText11 "><block wx:if="{{!Info['自主招生'][1].List[3].PlanNum}}">0</block>{{Info['自主招生'][1].List[3].PlanNum}}</view>
           </view>
           <view class="panelSchoolIndependent3 FlexRow">
             <view class="panelSchoolIndependentText2 panelSchoolText13">非本市生源</view>
@@ -256,9 +253,9 @@
       <view class="panelMarginTop panelLine"></view>
       
       <!-- 有计划但没有出分数时使用 -->
-      <view class="panelTemp" wx:if="{{false}}">注意：以下是2025年招生计划数量+2024年最低分信息。教育局一般在7月公布2025年最低分信息，故此处配以2024年最低分以供参考。</view>
+      <view class="panelTemp" wx:if="{{Years[0].IsNullScoreLine && YearIndex==0}}">注意：以下是{{Years[0].Name}}年招生计划数量+{{Years[1].Name}}年最低分信息。教育局一般在7月公布{{Years[0].Name}}年最低分信息，故此处配以{{Years[1].Name}}年最低分以供参考。</view>
     
-      <template is="componentList" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:Info.SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull,YearIndex:YearIndex}}" />
+      <template is="componentList" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:Info.SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull,YearIndex:YearIndex,Years:Years}}" />
 
     </block>
 
@@ -274,12 +271,9 @@
 
     <view style="height:50rpx;"></view>
   </view>
-
-  <view class="panelAD FlexColumn" bindtap="gotoMiniprogram">
-    <view class="panelAD01">秒过其它产品介绍</view>
-    <image src="../images/ad_01.png" class="ad_01"></image>
-  </view>
-
+  
+  <ad-custom class="ad_02" unit-id="adunit-02744b3b3498643c"></ad-custom>
+  
   <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}}">
@@ -317,12 +311,12 @@
       <text class="panelContent">{{Info.Fees}}</text>
     </block>
     
-    <block wx:if="{{Info.SchoolType2Short=='区重点（特色）'}}">
+    <block wx:if="{{Info.SchoolType2Short=='区重点（特色）' || Info.SchoolType2Short=='一般高中（特色）'}}">
       <view class="panelSchoolText082">特色高中办校重点</view>
       <view class="panelSchoolText08 panelSchoolText084">美育特色</view>
       <text class="panelContent">{{Info.Introduction2}}</text>
-      <view class="panelSchool22 FlexRow" bindtap="goto" data-url="docs?ID=2">
-        <view>上海市19所特色高中情況汇总</view>
+      <view class="panelSchool22 FlexRow" bindtap="goto" data-url="docs?ID=25">
+        <view>上海市20所特色高中情況汇总</view>
         <image class="icon_nextpage_4" src="../images/icon_nextpage_4.png"></image>
       </view>
     </block>
@@ -387,7 +381,7 @@
   <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">
+      <view class="panelSchool41_1 FlexRow">
         <image class="icon_sys_09" src="../images/icon_sys_09.png"></image>
         <view>查询所在区1-15志愿</view>
       </view>
@@ -395,7 +389,7 @@
     </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">
+      <view class="panelSchool41_1 FlexRow">
         <image class="icon_sys_09" src="../images/icon_sys_05.png"></image>
         <view>查询所在区名额分配到区</view>
       </view>

pages/main/school.wxss

@@ -335,6 +335,10 @@
   margin-top: 50rpx;
   font-weight: 700;
 }
+.panelSchool41_1{
+  margin-left: 40rpx;
+  font-weight: 700;
+}
 
 .panelSchool410{
   margin-left: 40rpx;
@@ -737,23 +741,6 @@
   line-height: 110rpx;
 }
 
-
-.panelAd{
-  width:100%;
-}
-
-.panelAD01{
-  font-size:20rpx;
-  color:#787878;
-  width:690rpx;
-  margin-top: 30rpx;
-}
-
-.ad_01{
-  width:710rpx;
-  margin-top: 20rpx;
-}
-
 .panelTemp{
   width:650rpx;
   margin: 30rpx 0 0 0;
@@ -788,4 +775,23 @@
   width:710rpx;
   margin: 30rpx 0 0 0;
   border-radius: 10rpx;
+}
+
+
+.panelYJBDC{
+  width:100%;
+  margin-top: 30rpx;
+  margin-bottom: 10rpx;
+  z-index: 20;
+}
+.panelYJBDC1{
+  font-size: 24rpx;
+  color: #2E2E2E;
+  text-align: center;
+  margin-bottom: 20rpx;
+
+}
+.yjbdc2{
+  width: 710rpx;
+  height:360rpx;
 }

pages/main/scoreline.js

@@ -10,7 +10,6 @@ Page({
     PageType:"scoreline",
     DistrictID:1,
     ScoreTypeID:1,
-    Years:constant.arrYear,
     YearIndex:0,
     IsSearch:false,
     Accommodation:constant.arrAccommodation,
@@ -23,6 +22,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsShow:app.globalData.userInfo.IsShow,
+      Years:app.globalData.userInfo.ArrYear,
       ScoreTypeID:options.ScoreTypeID,
       DistrictID:options.DistrictID,
       YearIndex:options.YearIndex,
@@ -136,6 +136,18 @@ Page({
       main.getData(url, function (data) {
         if (data) {
           
+          if (data.length==0){
+            wx.showModal({
+              title: '提醒',
+              content: '当前年份没有数据,请选择其他年份。',
+              showCancel: false,
+              complete: (res) => {
+                wx.hideLoading();
+              }
+            });
+            return;
+          }
+
           for(var i=0;i<data.length;i++){
             var item=data[i];
             item.IsAccommodation=true;

pages/main/scoreline.wxml

@@ -64,7 +64,7 @@
     </view>
     
     <!-- 有计划但没有出分数时使用 -->
-    <view class="panelTemp" wx:if="{{false}}">注意：以下是2025年招生计划数量+2024年最低分信息。教育局一般在7月公布2025年最低分信息，故此处配以2024年最低分以供参考。</view>
+    <view class="panelTemp" wx:if="{{Years[0].IsNullScoreLine && YearIndex==0}}">注意：以下是{{Years[0].Name}}年招生计划数量+{{Years[1].Name}}年最低分信息。教育局一般在7月公布{{Years[0].Name}}年最低分信息，故此处配以{{Years[1].Name}}年最低分以供参考。</view>
     
     <view class="panelBasicCss panelScore FlexColumn" >
       <view style="height:20rpx"></view>
@@ -99,7 +99,7 @@
         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,YearIndex:YearIndex}}" />
+      <template is="componentList" wx:if="{{!(IsSearch && !InputValue)}}" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull,PageCount:PageCount,PageFilterCount:PageFilterCount,ContrastNull:ContrastNull,YearIndex:YearIndex,Years:Years}}" />
       
       <view style="height: 50rpx;"></view>
     </view>

pages/main/userinfo.js

@@ -54,7 +54,6 @@ Page({
       var param = {};
       param.NickName = app.globalData.userInfo.NickName;
       param.AvatarUrl = app.globalData.userInfo.AvatarUrl;
-      //debugger;
       main.postData('UpdateMPSUserNickNameAndAvatar?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
         that.setData({
           ReturnCount:1,

pages/main/userinfo.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "用户登录",
-  "navigationBarBackgroundColor": "#F8C324",
+  "navigationBarBackgroundColor": "#FFC868",
   "navigationBarTextStyle": "black",
-  "backgroundColor": "#F8C324"
+  "backgroundColor": "#FFC868"
 }

pages/main/userinfo.wxml

@@ -8,7 +8,7 @@
   <view class="line1"></view>
   <view class="panel2 panel1 FlexRow">
     <view class="text3">用户昵称</view>
-    <input type="nickname" onBlur="" bindinput="onKeyInput" class="weui-input" placeholder-class="placeholder" placeholder="填写昵称" value="{{NickName}}" />
+    <input type="nickname" onBlur="" bindinput="onKeyInput" bindfocus="onKeyInput" class="weui-input" placeholder-class="placeholder" placeholder="填写昵称" value="{{NickName}}" />
   </view>
   <view class="line2 line1"></view>
 

pages/main/userinfo.wxss

@@ -1,5 +1,5 @@
 .container {
-  background-color: #F8C324;
+  background-color: #FFC868;
 }
 
 .panel1{
@@ -23,7 +23,7 @@
   width: 500rpx;
   margin: 0rpx;
   padding: 0rpx;
-  background-color: #F8C324;
+  background-color: #FFC868;
   justify-content: flex-end;
 }
 
@@ -75,7 +75,7 @@ button:not([size=mini]) {
   width:630rpx;
   height:110rpx;
   background: #8E6011;
-  color:#F8C324;
+  color:#FFC868;
   border-radius: 14rpx;
   font-size: 36rpx;
   text-align: center;
@@ -86,7 +86,7 @@ button:not([size=mini]) {
 .btn2{
   width:630rpx;
   height:80rpx;
-  background: #F8C324;
+  background: #FFC868;
   color:#8E6011;
   font-size: 28rpx;
   text-align: center;

pages/template/componentList.wxml

@@ -1,11 +1,11 @@
 <template name="componentList">
   <!-- 有计划但没有出分数时使用 -->
-  <block wx:if="{{false}}">
+  <block wx:if="{{YearIndex==0 && Years[0].IsNullScoreLine}}">
     <!-- 显示全部表头 -->
     <view class="panelScoreHeader0 panelScoreHeader FlexRow" wx:if="{{IsListAll}}">
       <view class="panelScoreHeaderTd1"></view>
-      <view class="panelScoreHeaderTd2">24年计划</view>
-      <view class="panelScoreHeaderTd3" style="text-align: right;">23年最低分</view>
+      <view class="panelScoreHeaderTd2">{{Years[0].ShortName}}年计划</view>
+      <view class="panelScoreHeaderTd3" style="text-align: right;">{{Years[1].ShortName}}年最低分</view>
       <view class="panelScoreHeaderTd4"><view class="MarginLeft30">语数外</view></view>
       <view class="panelScoreHeaderTd5">数学</view>
       <view class="panelScoreHeaderTd5">语文</view>
@@ -15,12 +15,12 @@
     <!-- 显示大字表头 -->
     <view class="panelScoreHeader FlexRow" wx:if="{{!IsListAll}}">
       <view class="panelScoreHeaderTd6"></view>
-      <view class="panelScoreHeaderTd7">24年计划</view>
-      <view class="panelScoreHeaderTd8">23年最低分</view>
+      <view class="panelScoreHeaderTd7">{{Years[0].Name}}年计划</view>
+      <view class="panelScoreHeaderTd8">{{Years[1].Name}}年最低分</view>
     </view>
   </block>
   <!-- 有计划有出分数时使用 -->
-  <block wx:if="{{true}}">
+  <block wx:if="{{YearIndex>0 || (YearIndex==0 && !Years[0].IsNullScoreLine)}}">
     <!-- 显示全部表头 -->
     <view class="panelScoreHeader FlexRow" wx:if="{{IsListAll}}">
       <view class="panelScoreHeaderTd1"></view>

utils/constant.js

@@ -1,15 +1,4 @@
 module.exports = {
-  arrYear: [{
-    Name: "2024",
-    CSS: "Selected"
-  },{
-    Name: "2023",
-    CSS: ""
-  },{
-    Name: "2022",
-    CSS: ""
-  },
-  ],
   arrPublicOrPrivate: [{
       Name: "公办",
       CSS: "Selected"

utils/main.js

@@ -139,21 +139,6 @@ function returnTop() {
   }
 }
 
-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");
@@ -263,7 +248,6 @@ module.exports = {
   getWindowHeight: getWindowHeight,
   onSelect: onSelect,
   returnTop:returnTop,
-  getBaiduToken: getBaiduToken,
   getCollect: getCollect,
   gotoMiniprogram:gotoMiniprogram,
   getProgramList:getProgramList,