1.0.20

app.js

@@ -1,7 +1,7 @@
 // app.js
 App({
   globalData: {
-    Version: "1.0.16",
+    Version: "1.0.20",
     IsProduction: true,
     ShareTitle: "上海中考招生信息查询工具",
     SharePath: "pages/index/index",

app.json

@@ -15,7 +15,7 @@
     "pages/main/scoreline",
     "pages/main/map",
     "pages/main/subscribe",
-    "pages/main/feedback",
+    "pages/main/feedbackinfo",
     "pages/main/imagelist",
     "pages/main/district"
   ],

pages/main/default.wxml

@@ -77,23 +77,26 @@
         <view class="line04"></view>
       </view>
     </view>
-    <view style="height:30rpx;"></view>
-    <view class="panel1133 FlexRow" bindtap="goto" data-url="userinfo?ReturnCount=1">
-      <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="panel1133 FlexRow" bindtap="goto" data-url="feedback">
-      <view class="text03 text031">纠错与建议</view>
-      <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
-    </view>
+    <block wx:if="{{IsShow}}">
+      <view style="height:30rpx;"></view>
+      <view class="panel1133 FlexRow" bindtap="goto" data-url="userinfo?ReturnCount=1">
+        <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="panel1133 FlexRow" bindtap="goto" data-url="feedbackinfo">
+        <view class="text03 text031">纠错与建议</view>
+        <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
+      </view>
+    </block>
+    
     <view class="line04" style="margin-top: 0;"></view>
     <view class="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">©2024 秒过分数线 版本 {{Version}}</text>
+    <text class="text11" bindtap="goto" data-url="webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">©2023-2024 秒过分数线 版本 {{Version}}</text>
     <view style="height:100rpx;"></view>
   </view>
 </view>

pages/main/feedback.js

@@ -20,6 +20,7 @@ Page({
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
       Feedback:that.data.Feedback,
     });
   },

pages/main/feedback.wxml

@@ -34,11 +34,10 @@
     </view>
   </view>
 
-  <view class="panelBasicCss panel4 FlexColumn">
+  <view class="panelBasicCss panel4 FlexColumn" wx:if="{{IsShow}}">
     <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:#9b9b9b;font-size:28rpx;font-weight:400;" />
+    <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>

pages/main/map.js

@@ -25,6 +25,7 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
       PageType: options.PageType,
       SchoolTypeIndex: -1,
       Options: options,

pages/main/map.wxml

@@ -3,7 +3,7 @@
     <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 class="panelMapAddress1">复制地址</view>
     </view>
     <view class="panelBasicCss panelMap2 FlexRow">
       <view class="FlexRow">
@@ -31,8 +31,8 @@
     bindlabeltap="onLabelTap">
   </map>
 
-  <view class="panelFooter FlexRow" >
-    <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedback">
+  <view class="panelFooter FlexRow"  wx:if="{{IsShow}}">
+    <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedbackinfo">
       <view class="panelFooterBottom panelFooter211">纠错</view>
     </view>
   </view>

pages/main/map.wxss

@@ -10,21 +10,23 @@
   margin-top: 30rpx;
   width:100%;
   justify-content: flex-start;
+  align-items: flex-start;
 }
 
 .icon_loc_01{
   width:20rpx;
-  height:24rpx;
+  height:33rpx;
   margin-left: 50rpx;
 }
 
 .panelMapAddress{
-  font-size:28rpx;
+  font-size:24rpx;
   margin-left: 24rpx;
   font-weight: 400;
+  width:480rpx;
 }
 .panelMapAddress1{
-  font-size:28rpx;
+  font-size:24rpx;
   margin-left: 20rpx;
   color:#EB5C28;
 }

pages/main/recruitment.js

@@ -39,6 +39,7 @@ Page({
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
       District:arr,
       PanelType:options.PanelType,
       DistrictID:districtID,

pages/main/recruitment.wxml

@@ -151,7 +151,7 @@
           <view class="panelFooterBottom">转发</view>
         </button>
       </view>
-      <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedback">
+      <view  wx:if="{{IsShow}}" class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedbackinfo">
         <view class="panelFooterLine panelFooterBottom" wx:if="{{PageType=='scoreline'}}"></view>
         <view class="panelFooterBottom panelFooter21">纠错</view>
       </view>

pages/main/school.js

@@ -14,6 +14,7 @@ Page({
     ImagePath: app.globalData.uploadImageUrl,
     ScoreType:constant.arrScoreType,
     TailScore:constant.arrTailScore,
+    IsShowClickLike:false,
   },
   onLoad: function (options) {
     var that = this;
@@ -35,6 +36,7 @@ Page({
   },
   onShow:function(){
     this.getWish();
+
   },
   init:function(){
     var that = this;
@@ -91,6 +93,17 @@ Page({
           that.data.TailScore[0].CSS="Selected";
         }
 
+        data.PersonCount1=0;
+        data.PersonCount2=0;
+        for(var i=0;i<that.data.ScoreType.length;i++){
+          if (data[that.data.ScoreType[i].Name] && data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-2].Total)
+            data.PersonCount1+=data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-2].Total;
+          if (data[that.data.ScoreType[i].Name] && data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-1].Total)
+            data.PersonCount2+=data[that.data.ScoreType[i].Name][data[that.data.ScoreType[i].Name].length-1].Total;
+        }
+        
+        
+        //debugger;
         that.setData({
           Info:data,
           ScoreTypeID:that.data.ScoreTypeID,
@@ -125,23 +138,6 @@ Page({
     });
   },
   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){
@@ -224,10 +220,64 @@ Page({
               HasWish: false,
             });
           }
+          that.getSchoolClickLike();
         });
       }
     });
   },
+  getSchoolClickLike:function(){
+    var that = this;
+    var arr2=[];
+    var arr=constant.arrUserSchoolClickLike;
+    for(var j=0;j<arr.length;j++){
+      arr[j].Count=0;  
+    }
+    main.getData("GetMPSSchoolLikeNum?SchoolID="+that.data.SchoolID+"&UserID="+app.globalData.userInfo.UserID, function (data3) {
+      
+      if (data3 && data3.length>0) {
+        
+        for(var j=0;j<arr.length;j++){
+          arr[j].Count=0;    
+          for(var i=0;i<data3.length;i++){
+            if (arr[j].ID==data3[i].ClickLikeID){
+              arr[j].Count=data3[i].Count;
+             
+              if (data3[i].Show==1)
+                arr2.push(arr[j]);
+              break;
+            }
+          }
+        }
+
+        arr2 = common.sort(arr2,"DESC", "Count","Int");
+      }
+
+      that.setData({
+        UserSchoolClickLike: arr,
+        UserSchoolClickLike2: arr2,
+      });
+    });
+  },
+  clickLikeSchool:function(){
+    this.setData({
+      IsShowClickLike:true,
+    });
+  },
+  cancelLikeSchool:function(){
+    this.setData({
+      IsShowClickLike:false,
+    });
+  },
+  saveUserSchoolClickLike:function(event){
+    var that=this;
+    var id=event.currentTarget.dataset.id;
+    main.getData("UpdateMPSUserSchoolLikeNum?UserID="+app.globalData.userInfo.UserID+"&SchoolID="+that.data.SchoolID+"&ClickLikeID="+id, function (data2) {
+      that.getSchoolClickLike();
+      that.setData({
+        IsShowClickLike:false,
+      });
+    });
+  },
   onShareAppMessage: function () {
     var that=this;
     var name="中考招生信息：";

pages/main/school.wxml

@@ -9,7 +9,7 @@
       <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 class="btnHelp" bindtap="goto" data-url="feedbackinfo?type=1">帮忙补充</view>
     </view>
     <image wx:if="{{Info.ImageLogo && Info.SchoolType1=='高中'}}" class="panelSchoolLogo" src="{{ImagePath}}web/_School/{{Info.ImageLogo}}"></image>
 
@@ -44,13 +44,25 @@
       </view>
     </view>
 
-    <view wx:if="{{!Info.HasSameName}}" style="height: 30rpx;"></view>
-    <view wx:if="{{Info.HasSameName}}" class="panelMarginTop panelLine"></view>
+    <!-- 为学校喊赞 -->
+    <view class="panelSchool14 FlexRow" bindtap="clickLikeSchool">
+      <view class="panelSchool141">为学校喊赞</view>
+      <view class="panelSchool142 FlexRow">
+        <image class="face_hs_0" src="../images/face_hs_0.png" wx:if="{{UserSchoolClickLike2.length==0}}"></image>
+        <view wx:if="{{UserSchoolClickLike2[0]}}" class="panelSchool1422 panelSchool1421">{{UserSchoolClickLike2[0].Count}}</view>
+        <image wx:if="{{UserSchoolClickLike2[0]}}" class="face_hs_1" src="../images/face_hs_{{UserSchoolClickLike2[0].ID}}s.png"></image>
+        <image wx:if="{{UserSchoolClickLike2[1]}}" class="face_hs_2 face_hs_1" src="../images/face_hs_{{UserSchoolClickLike2[1].ID}}s.png"></image>
+        <view class="panelSchool1421" wx:if="{{UserSchoolClickLike2[1]}}">{{UserSchoolClickLike2[1].Count}}</view>
+      </view>
+    </view>
+
+    <!-- 同初中学校 -->
+    <view wx:if="{{Info.HasSameName}}" class="panelSchoolLine03 panelSchoolLine02"></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>
+      <view class="panelSchool410 FlexRow">同校<block wx:if="{{Info.SchoolType1=='高中'}}">初中</block>
         <block wx:if="{{Info.SchoolType1=='初中'}}">高中</block>部主页
+        <image class="icon_nextpage_4" src="../images/icon_nextpage_4.png"></image>
       </view>
-      <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
     </view>
     <view style="height: 20rpx;"></view>
   </view>
@@ -92,7 +104,13 @@
 
   <view class="panelBasicCss panelMain FlexColumn" wx:if="{{Info.HasData}}">
     <block wx:if="{{Info['自主招生']}}">
-      <view class="panelSchoolText08">招生计划{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}</view>
+      <view class="panelSchoolText20 FlexRow">
+        <view>招生计划{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}</view>
+        <view class="panelSchoolText201 FlexRow">
+          <view>总数</view>
+          <view class="panelSchoolText2011">{{Info.PersonCount1}}</view>
+        </view>
+      </view>
       <view class="panelSchool31 FlexRow">
         <view class="panelSchool311 FlexColumn" wx:for="{{ScoreType}}" wx:key="index">
           <view class="panelSchoolText04">{{item.Name}}</view>
@@ -113,7 +131,13 @@
         </view>
       </view>
       <view class="panelSchoolLine02"></view>
-      <view class="panelSchoolText04 panelSchoolText10">{{Info['自主招生'][Info['自主招生'].length-1].ScoreYear}}年计划</view>
+      <view class="panelSchoolText04 panelSchoolText10 FlexRow">
+        <view>{{Info['自主招生'][Info['自主招生'].length-1].ScoreYear}}年计划</view>
+        <view class="panelSchoolText201 FlexRow">
+          <view>总数</view>
+          <view class="panelSchoolText2011">{{Info.PersonCount2}}</view>
+        </view>
+      </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}}">
@@ -299,7 +323,8 @@
   <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="panelSchool411" wx:if="{{Info.ImageQRCode}}">学校官媒</view>
+        <view class="panelSchool4110" wx:if="{{!Info.ImageQRCode}}">学校官媒</view>
         <view class="panelSchool412 FlexRow" wx:if="{{Info.Website}}" bindtap="copyUrl" data-url="{{Info.Website}}">
           <image class="icon_web_01" src="../images/icon_web_01.png"></image>
           <text user-select="true" class="panelSchoolText12">{{Info.WebsiteStr}}</text>
@@ -333,7 +358,7 @@
     <view style="height: 20rpx;"></view>
   </view>
 
-  <view class="panelSchoolText14" catchtap="goto" data-url="feedback">
+  <view  wx:if="{{IsShow}}" class="panelSchoolText14" catchtap="goto" data-url="feedbackinfo">
     本页内容来自学校官网、官方公众号、微博等网络资料的整理，整理过程中可能会有偏差，如您发现错误，欢迎协助<text class="panelSchoolText15">纠正</text>。
   </view>
 
@@ -358,7 +383,7 @@
         <view class="panelFooterBottom">转发</view>
       </button>
     </view>
-    <view class="panelFooter2 FlexRow" catchtap="goto" data-url="feedback">
+    <view  wx:if="{{IsShow}}" class="panelFooter2 FlexRow" catchtap="goto" data-url="feedbackinfo">
       <view class="panelFooterLine panelFooterBottom"></view>
       <view class="panelFooter21 panelFooterBottom">纠错</view>
     </view>
@@ -367,4 +392,18 @@
       <image class="panelFooter_icon_b2t_01 panelFooterBottom" src="../images/icon_b2t_01.png"></image>
     </view>
   </view>
+</view>
+
+<view class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{IsShowClickLike}}">
+  <view class="panelSchool6 panelBasicCss FlexColumn">
+    <view class="panelSchoolText08">选一个代表您想法的表情</view>
+    <view class="panelSchool61 FlexRow">
+      <view class="panelSchool611 FlexColumn" wx:for="{{UserSchoolClickLike}}" wx:key="*this" catchtap="saveUserSchoolClickLike" data-id="{{item.ID}}">
+        <view class="panelSchool6111">{{item.Name}}</view>
+        <image class="face_hs_10" src="../images/face_hs_{{item.ID}}.png"></image>
+        <view class="panelSchool1421" style="margin:0;">{{item.Count}}</view>
+      </view>
+    </view>
+    <view class="panelSchool62" capture-catch:tap="cancelLikeSchool">取消</view>
+  </view>
 </view>

pages/main/school.wxss

@@ -106,10 +106,9 @@
 
 .panelSchool13{
   width:100%;
-  height:93rpx;
+  height:94rpx;
   justify-content: space-between;
   font-size: 24rpx;
-  font-weight: 400;
 }
 
 .panelMarginTop{
@@ -184,6 +183,7 @@
 .panelSchoolText09{
   font-size: 24rpx;
   font-weight: 400;
+  width:390rpx;
 }
 
 .panelSchoolText090{
@@ -210,8 +210,9 @@
 
 .panelSchoolText10{
   font-size: 20rpx;
-  align-self: start;
-  margin:30rpx 0 0 40rpx;
+  width:620rpx;
+  margin:30rpx 0 0 0;
+  justify-content: space-between;
 }
 
 .panelSchoolText11{
@@ -312,11 +313,22 @@
 .panelSchool41{
   align-items: flex-start;
   margin-left: 40rpx;
+  font-weight: 700;
+}
+
+.panelSchool410{
+  margin-left: 40rpx;
+  color:#EB5C28;
+  font-weight: 700;
 }
 
 .panelSchool411{
   font-size: 36rpx;
 }
+.panelSchool4110{
+  font-size: 36rpx;
+  margin-top: 50rpx;
+}
 
 .panelSchool412{
   margin: 30rpx 0 20rpx 0;
@@ -395,6 +407,7 @@
 
 .panelSchool512{
   margin-top: 30rpx;
+  align-items: flex-start;
 }
 
 .panelSchool52{
@@ -404,7 +417,7 @@
 
 .icon_loc_01{
   width:20rpx;
-  height:24rpx;
+  height:33rpx;
   margin-right: 20rpx;
 }
 .pic_03{
@@ -586,4 +599,108 @@
   width:12rpx;
   height:18rpx;
   margin-left: 10rpx;
+}
+
+
+.panelSchoolText20{
+  width: 620rpx;
+  margin: 50rpx 0 40rpx 0;
+  justify-content: space-between;
+}
+.panelSchoolText201{
+  font-size:20rpx;
+  color:#787878;
+}
+.panelSchoolText2011{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  text-align: right;
+  margin-left: 10rpx;
+}
+
+.panelSchool14{
+  width:100%;
+  justify-content: space-between;
+  height:140rpx;
+  margin-top: 30rpx;
+}
+
+.panelSchool141{
+  font-size:24rpx;
+  margin-left: 40rpx;
+}
+
+.panelSchool142{
+  margin-right: 50rpx;
+}
+
+.face_hs_0{
+  width:266rpx;
+  height:66rpx;
+}
+
+.panelSchool1421{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin: 0 0 0 20rpx;
+}
+.panelSchool1422{
+  margin: 0 20rpx 0 0;
+}
+
+.face_hs_1{
+  width:66rpx;
+  height:66rpx;
+}
+
+.face_hs_2{
+  margin-left: -5rpx;
+}
+
+.face_hs_10{
+  width:110rpx;
+  height:110rpx;
+  margin: 20rpx 0;
+}
+
+.panelSchoolLine03{
+  margin-top: 0rpx;
+}
+
+.container2{
+  position: fixed;
+  top:0;
+  background-color: rgba(0,0,0,0.66);
+  z-index: 100;
+}
+
+.panelSchool6{
+  width:730rpx;
+  height:596rpx;
+  justify-content: flex-start;
+  margin-top: 400rpx;  
+}
+
+.panelSchool611{
+  margin: 0 10rpx;
+  height:286rpx;
+}
+
+.panelSchool6111{
+  font-size: 36rpx;
+  font-size: 20rpx;
+  color: #9B9B9B;
+  height:28rpx;
+}
+
+.panelSchool62{
+  background: #F0F0F0;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #2E2E2E;
+  width:670rpx;
+  text-align: center;
+  line-height: 110rpx;
 }

pages/main/scoreline.js

@@ -22,6 +22,7 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
       ScoreTypeID:options.ScoreTypeID,
       DistrictID:options.DistrictID,
       YearIndex:options.YearIndex,

pages/main/scoreline.wxml

@@ -133,7 +133,7 @@
         <view class="panelFooterBottom">转发</view>
       </button>
     </view>
-    <view class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedback">
+    <view  wx:if="{{IsShow}}" class="panelFooter2 FlexRow"  catchtap="goto" data-url="feedbackinfo">
       <view class="panelFooterLine panelFooterBottom" wx:if="{{PageType=='scoreline'}}"></view>
       <view class="panelFooterBottom panelFooter21">纠错</view>
     </view>

pages/main/wishinfo.js

@@ -99,6 +99,23 @@ Page({
       },3000);
       that.saveLikeNum();
     }
+
+    if (count==66){
+      wx.showModal({
+        title: '66大顺',
+        content: '一分耕耘，一分收获。祝您心想事成，鱼跃龙门，考中心仪学校。',
+        showCancel: false,
+        confirmText: '中',
+      });    
+    }
+    else if (count==666){
+      wx.showModal({
+        title: '666厉害了',
+        content: '努力必有回报，祝您考中心仪学校，实现梦想，继续闪耀！',
+        showCancel: false,
+        confirmText: '中',
+      });    
+    }
   },
   saveLikeNum:function(callback){
     var that = this;

pages/main/wishinfo.wxml

@@ -5,8 +5,8 @@
   <view class="text01 text03" wx:if="{{MyWish.WishContent}}">{{MyWish.WishContent}}</view>
   <view class="panel1 FlexRow" bindtap="clickLikeNum">
     <view class="panel11 FlexRow">
+      六六大顺
       <image animation="{{animationDataShow}}" class="icon_add_02" src="../images/icon_add_02.png"></image>
-      赞
     </view>
     <view class="text04">{{LikeNum}}</view>
   </view>

pages/main/wishinfo.wxss

@@ -33,7 +33,7 @@ page{
 }
 
 .panel1{
-  width:250rpx;
+  width:316rpx;
   height:100rpx;
   border:3rpx solid #FBF0E1;
   border-radius: 20rpx;
@@ -44,12 +44,13 @@ page{
 
 .panel11{
   margin:0 0 0 30rpx;
+  font-size: 28rpx;
 }
 
 .icon_add_02{
   width:29rpx;
   height:30rpx;
-  margin-right: 10rpx;
+  margin:0 0 0 10rpx;
 }
 
 .text04{

pages/template/componentList.wxml

@@ -102,6 +102,7 @@
             <view class="panelScoreItem11 FlexColumn">
               <text class="panelScoreText01">{{item.Name}}</text>
               <view class="panelScoreText02" wx:if="{{(ScoreTypeID==2 || ScoreTypeID==4) && item.DistrictName}}">{{item.DistrictName}}</view>
+              <view class="panelScoreText02" wx:if="{{ScoreTypeID==4 && item.SchoolTargetRemark}}">{{item.SchoolTargetRemark}}</view>
             </view>
             <view class="panelScoreItem12 FlexRow" style="height:{{item.Height}}rpx;">
               <view class="panelScoreItem120 FlexRow">
@@ -135,6 +136,7 @@
             <view class="panelScoreItem13 FlexColumn">
               <text class="panelScoreText01">{{item.Name}}</text>
               <view class="panelScoreText02" wx:if="{{(ScoreTypeID==2 || ScoreTypeID==4) && item.DistrictName}}">{{item.DistrictName}}</view>
+              <view class="panelScoreText02" wx:if="{{ScoreTypeID==4 && item.SchoolTargetRemark}}">{{item.SchoolTargetRemark}}</view>
             </view>
             <view class="panelScoreItem14 FlexRow" style="height:{{item.Height}}rpx;">
               <view class="panelScoreNumber06" wx:if="{{item.PlanNum>=0}}">{{item.PlanNum}}</view>

utils/constant.js

@@ -93,6 +93,24 @@ module.exports = {
       CSS: "Selected"
     },
   ],
+  arrUserSchoolClickLike:[
+    {
+      ID:1,
+      Name:"爱他",
+    },{
+      ID:2,
+      Name:"",
+    },{
+      ID:3,
+      Name:"路过",
+    },{
+      ID:4,
+      Name:"",
+    },{
+      ID:5,
+      Name:"怼他",
+    },
+  ],
   arrSchoolType: [{
       Name: "市重点",
       CSS: "Selected",
@@ -208,7 +226,100 @@ module.exports = {
       Count: "8"
     },
   ],
-  arrArticleList: [{
+  arrArticleList: [
+    {
+      ID: 10,
+      Category: "信息整理",
+      Logo: "icon_sys_01.png",
+      Title: "2024年上海闵行、宝山、浦东、松江、青浦5区共新增15所高中介绍",
+      TitleShort: "上海中招分数线等信息查询",
+      TitleImage: "doc_1000.png",
+      Content: [{
+          Name: "doc_1001.png"
+        },
+        {
+          Name: "doc_1002.png",
+          Fun: "goto",
+          Url: "school?ID=849"
+        },
+        {
+          Name: "doc_1003.png",
+          Fun: "goto",
+          Url: "school?ID=850"
+        },
+        {
+          Name: "doc_1004.png",
+          Fun: "goto",
+          Url: "school?ID=851"
+        },
+        {
+          Name: "doc_1005.png",
+          Fun: "goto",
+          Url: "school?ID=852"
+        },
+        {
+          Name: "doc_1006.png",
+          Fun: "goto",
+          Url: "school?ID=853"
+        },
+        {
+          Name: "doc_1007.png",
+          Fun: "goto",
+          Url: "school?ID=854"
+        },
+        {
+          Name: "doc_1008.png",
+          Fun: "goto",
+          Url: "school?ID=855"
+        },
+        {
+          Name: "doc_1009.png",
+          Fun: "goto",
+          Url: "school?ID=856"
+        },
+        {
+          Name: "doc_1010.png",
+          Fun: "goto",
+          Url: "school?ID=857"
+        },
+        {
+          Name: "doc_1011.png",
+          Fun: "goto",
+          Url: "school?ID=858"
+        },
+        {
+          Name: "doc_1012.png",
+          Fun: "goto",
+          Url: "school?ID=859"
+        },
+        {
+          Name: "doc_1013.png",
+          Fun: "goto",
+          Url: "school?ID=860"
+        },
+        {
+          Name: "doc_1014.png",
+          Fun: "goto",
+          Url: "school?ID=861"
+        },
+        {
+          Name: "doc_1015.png",
+          Fun: "goto",
+          Url: "school?ID=862"
+        },
+        {
+          Name: "doc_1016.png",
+          Fun: "goto",
+          Url: "school?ID=863"
+        },
+        {
+          Name: "doc_1017.png",
+          Fun: "goto",
+          Url: "search"
+        },
+      ]
+    },
+    {
       ID: 1,
       Category: "信息整理",
       Logo: "icon_sys_01.png",
@@ -269,7 +380,7 @@ module.exports = {
       ID: 2,
       Category: "数据图表",
       Logo: "icon_sys_02.png",
-      Title: "19所市特色普通高中自主招生情况",
+      Title: "2023年19所市特色普通高中自主招生情况",
       TitleShort: "上海特色高中自主招生信息",
       TitleImage: "doc_0200.png",
       Content: [{
@@ -392,7 +503,7 @@ module.exports = {
       ID: 3,
       Category: "数据图表",
       Logo: "icon_sys_02.png",
-      Title: "体育“一条龙”市级优秀体育学生招收学校和项目",
+      Title: "2023年体育“一条龙”市级优秀体育学生招收学校和项目",
       TitleShort: "上海优秀体育生中招信息",
       TitleImage: "doc_0300.png",
       Content: [{
@@ -418,7 +529,7 @@ module.exports = {
       ID: 4,
       Category: "数据图表",
       Logo: "icon_sys_02.png",
-      Title: "艺术“一条龙”市级艺术骨干学生招收学校、项目和艺术团汇总",
+      Title: "2023年艺术“一条龙”市级艺术骨干学生招收学校、项目和艺术团汇总",
       TitleShort: "上海艺术骨干生中招信息",
       TitleImage: "doc_0400.png",
       Content: [{
@@ -446,7 +557,7 @@ module.exports = {
       ID: 5,
       Category: "数据图表",
       Logo: "icon_sys_02.png",
-      Title: "国际课程班和中外合作办学自主招生计划情况",
+      Title: "2023年国际课程班和中外合作办学自主招生计划情况",
       TitleShort: "上海国际班中考招生信息",
       TitleImage: "doc_0500.png",
       Content: [{
@@ -498,7 +609,7 @@ module.exports = {
       ID: 7,
       Category: "数据图表",
       Logo: "icon_sys_02.png",
-      Title: "政策性照顾加分和同分优待情况",
+      Title: "2023年政策性照顾加分和同分优待情况",
       TitleShort: "上海中考加分有待信息",
       TitleImage: "doc_0700.png",
       Content: [{