chengjie 2 주 전
부모
커밋
edbe17268e
2개의 변경된 파일27개의 추가작업 그리고 27개의 파일을 삭제
  1. 1 1
      src/api/mps/mpsCommonController.js
  2. 26 26
      src/model/mps.js

+ 1 - 1
src/api/mps/mpsCommonController.js

@@ -407,7 +407,7 @@ export async function GetMPSArticle(ctx) {
407 407
     let articles = [
408 408
         {
409 409
             ID: 27,
410
-            Category: "2026",
410
+            Category: "2025",
411 411
             IsPageShow: 1,
412 412
             Logo: "icon_sys_02.png",
413 413
             Title: "2026新开17所高中介绍(黄埔、徐汇、静安、普陀、闵行……)",

+ 26 - 26
src/model/mps.js

@@ -5,7 +5,7 @@ import moment from 'moment';
5 5
  * MPS (分数线) 模型
6 6
  */
7 7
 class MPS {
8
-    
8
+
9 9
     /**
10 10
      * 获取用户信息(通过OpenID)
11 11
      * @param {Object} obj 查询参数
@@ -152,21 +152,21 @@ class MPS {
152 152
         const values = [];
153 153
 
154 154
         let sql = "select w.*,u.AvatarUrl,u.NickName,s.SchoolShortName from MPS_Wish w inner join MPS_WXUsers u on w.UserID=u.UserID inner join MPS_School s on w.SchoolID = s.ID where w.Flag=0;";
155
-        if (param.WishType=="school"){
155
+        if (param.WishType == "school") {
156 156
             sql = "select w.*,u.AvatarUrl,u.NickName,s.SchoolShortName from MPS_Wish w inner join MPS_WXUsers u on w.UserID=u.UserID inner join MPS_School s on w.SchoolID = s.ID where w.Flag=0 and w.SchoolID=? order by UpdateTime desc;";
157 157
             values.push(param.SchoolID);
158 158
         }
159
-        else if (param.WishType=="schoolAll"){
159
+        else if (param.WishType == "schoolAll") {
160 160
             sql = "select w.*,u.AvatarUrl,u.NickName,s.SchoolShortName from MPS_Wish w inner join MPS_WXUsers u on w.UserID=u.UserID inner join MPS_School s on w.SchoolID = s.ID where w.Flag=0 and w.SchoolID=? order by UpdateTime desc;";
161 161
             values.push(param.SchoolID);
162 162
         }
163
-        else if (param.WishType=="person") {
164
-            
165
-            if (param.ID){
163
+        else if (param.WishType == "person") {
164
+
165
+            if (param.ID) {
166 166
                 sql = "select w.*,u.AvatarUrl,u.NickName,s.SchoolShortName from MPS_Wish w inner join MPS_WXUsers u on w.UserID=u.UserID inner join MPS_School s on w.SchoolID = s.ID where w.Flag=0 and w.ID=?;";
167 167
                 values.push(param.ID);
168 168
             }
169
-            else{
169
+            else {
170 170
                 sql = "select w.*,u.AvatarUrl,u.NickName,s.SchoolShortName from MPS_Wish w inner join MPS_WXUsers u on w.UserID=u.UserID inner join MPS_School s on w.SchoolID = s.ID where w.Flag=0 and w.UserID=? and w.SchoolID=?;";
171 171
                 values.push(param.UserID);
172 172
                 values.push(param.SchoolID);
@@ -224,27 +224,27 @@ class MPS {
224 224
 
225 225
 // 当前年份配置
226 226
 export const ArrYear = [
227
-//     {
228
-//     Name: "2026",
229
-//     CSS: ""
230
-// },
231
-{
232
-    Name: "2025",
233
-    IsNullScoreLine: (moment().format("MM-DD") >= "05-30" && moment().format("MM-DD") < "07-14") ? true : false, // 当只有计划没有分数线时
234
-    CSS: "Selected"
235
-}, {
236
-    Name: "2024",
237
-    CSS: ""
238
-}, {
239
-    Name: "2023",
240
-    CSS: ""
241
-}, {
242
-    Name: "2022",
243
-    CSS: ""
244
-}];
227
+    // {
228
+    //     Name: "2026",
229
+    //     CSS: ""
230
+    // },
231
+    {
232
+        Name: "2025",
233
+        IsNullScoreLine: (moment().format("MM-DD") >= "05-30" && moment().format("MM-DD") < "07-14") ? true : false, // 当只有计划没有分数线时
234
+        CSS: "Selected"
235
+    }, {
236
+        Name: "2024",
237
+        CSS: ""
238
+    }, {
239
+        Name: "2023",
240
+        CSS: ""
241
+    }, {
242
+        Name: "2022",
243
+        CSS: ""
244
+    }];
245 245
 
246 246
 export function getDistrict(id) {
247
-    switch (Number(id)){
247
+    switch (Number(id)) {
248 248
         case 0:
249 249
             return "上海市";
250 250
         case 1: