From e9f61ab961c5523ba43877ab1ba5dd5d5368e0f4 Mon Sep 17 00:00:00 2001
From: popWheat <49830650+j10ccc@users.noreply.github.com>
Date: Fri, 17 Feb 2023 19:14:14 +0800
Subject: [PATCH] chore(*): ready to release v2.2.0 (#31)

fix(home): temporary disable electricity query page
fix(lessons-table): remove unnecessary counter
fix(*): adapts to special stiuation querying exam and score in home
chore(constants): change update info
---
 src/components/ExamQuickView/index.vue         |  4 ++--
 src/components/Home/edit-panel/index.vue       |  2 +-
 src/components/LessonsTableQuickView/index.vue |  1 -
 src/components/ScoreQuickView/index.vue        |  2 +-
 src/constants/copywriting.ts                   |  6 +++---
 src/constants/homeCards.ts                     |  8 ++++----
 src/constants/updateInfo.ts                    | 13 +++++++++++--
 src/pages/schoolcard/index.vue                 |  6 ++----
 src/store/system/index.ts                      |  1 +
 9 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/ExamQuickView/index.vue b/src/components/ExamQuickView/index.vue
index 5a9e232e..a246ed34 100644
--- a/src/components/ExamQuickView/index.vue
+++ b/src/components/ExamQuickView/index.vue
@@ -34,7 +34,7 @@
             </text>
             <template v-else-if="examState(item.examTime) === 'before'">
               <text v-if="timeUtils.getDayInterval(getExamTime(item.examTime).date) > 0">
-                还有 {{ timeUtils.getDayInterval(item.examTime) }} 天开始
+                还有 {{ timeUtils.getDayInterval(getExamTime(item.examTime).date) }} 天开始
               </text>
               <template v-else>
                 <text v-if="minuteInterval(getExamTime(item.examTime).start) >= 60">
@@ -68,7 +68,7 @@ const emit = defineEmits(["showHelp"]);
 
 const selectTerm = ref({
   year: systemStore.generalInfo.termYear,
-  term: systemStore.generalInfo.term
+  term: systemStore.generalInfo.score || systemStore.generalInfo.term
 });
 
 const updateTimeString = computed( () => {
diff --git a/src/components/Home/edit-panel/index.vue b/src/components/Home/edit-panel/index.vue
index ca717856..25638690 100644
--- a/src/components/Home/edit-panel/index.vue
+++ b/src/components/Home/edit-panel/index.vue
@@ -28,7 +28,7 @@ const validList = computed(() => {
 
 const selectedList = computed(() => {
   const list = serviceStore.homecard.selected;
-  return list.map(item => homeCards[item]);
+  return list.filter(item => homeCards[item]).map(item => homeCards[item]);
 });
 
 const props = defineProps<{
diff --git a/src/components/LessonsTableQuickView/index.vue b/src/components/LessonsTableQuickView/index.vue
index dfdcd667..406902e0 100644
--- a/src/components/LessonsTableQuickView/index.vue
+++ b/src/components/LessonsTableQuickView/index.vue
@@ -17,7 +17,6 @@
           <text v-if="lessonState(item.sections) === 'taking'" class="taking-lesson">
             上课中
           </text>
-          {{ updateRestTimeCounter }}
         </view>
         <view class="teacher">
           <text class="iconfont icon-teacher"></text>
diff --git a/src/components/ScoreQuickView/index.vue b/src/components/ScoreQuickView/index.vue
index 3609da4e..8214fc5a 100644
--- a/src/components/ScoreQuickView/index.vue
+++ b/src/components/ScoreQuickView/index.vue
@@ -50,7 +50,7 @@ function handleTapHelp() {
 const showSorted = ref(false);
 const selectTerm = ref({
   year: systemStore.generalInfo.termYear,
-  term: systemStore.generalInfo.term
+  term: systemStore.generalInfo.score || systemStore.generalInfo.term
 });
 
 onMounted(async () => {
diff --git a/src/constants/copywriting.ts b/src/constants/copywriting.ts
index 22d1e154..51c2a580 100644
--- a/src/constants/copywriting.ts
+++ b/src/constants/copywriting.ts
@@ -37,7 +37,7 @@ export const faqText = {
     {
       title: "遇到「正方服务器出错」请怼教务处",
       content:
-        "选课：5290019\n资源管理（教室借用）：85290020\n教务管理（重考、重修、学生证补办、订火车票、申请旁听课）：85290029"
+        "选课：85290019\n资源管理（教室借用）：85290020\n教务管理（重考、重修、学生证补办、订火车票、申请旁听课）：85290029"
     },
     {
       title: "正方教务系统的密码是什么？",
@@ -61,10 +61,10 @@ export const helpText = {
     zf: "1.正方教务系统是什么？\n正方教务系统是你的选课系统哦~\n那么密码就是你的选课密码~\n\n2.忘记密码？\n请找自己的辅导员重置密码。",
     library:
       "新生图书馆绑定异常——新生需要在接受图书馆培训并通过入馆考试后，才能正常绑定图书馆账号",
-    yxy: "丨绑定此项以使用电费余额、校园卡查询等功能\n丨请确保已下载过易校园 APP 且将手机号与学号、宿舍绑定\n丨若图形验证码加载失败，请过一段时间再来绑定"
+    yxy: "丨绑定此项以使用校园卡查询等功能\n丨请确保已下载过易校园 APP 且将手机号与学号、宿舍绑定\n丨若图形验证码加载失败，请过一段时间再来绑定"
   },
   exam: "丨微精弘的数据全部来源于正方教务系统，如果有误，请向正方教务系统提出更正意见。\n丨考试信息以实际为准，常见考试时长是2h，但也有部分考试时长为1.5h，请大家务必仔细注意考场黑板上的考试时间噢～",
-  examCard: "若信息长时间无法更新或总是刷新失败，可能是因为更改过正方教务系统的密码，请前往我的-绑定-重新绑定正方账号。\n丨考试安排中的信息全部来自正方教务系统，数据录入可能会有延迟，请耐心等待。如有疑问请联系教务处，本程序仅作信息展示。\n丨仅展示 近2日 和 过去1日 的考试",
+  examCard: "若信息长时间无法更新或总是刷新失败，可能是因为更改过正方教务系统的密码，请前往我的-绑定-重新绑定正方账号。\n丨考试安排中的信息全部来自正方教务系统，数据录入可能会有延迟，请耐心等待。如有疑问请联系教务处，本程序仅作信息展示。\n丨仅展示 近3日 的考试",
   canteenflow:
     "丨食堂计数机制存在误差，且数据有一定延迟，流量指数仅供参考噢 \n丨莫干山校区暂无食堂流量数据，摊手手\n丨祝大家干饭顺利",
   activtion:
diff --git a/src/constants/homeCards.ts b/src/constants/homeCards.ts
index 57aaf33e..dce685d9 100644
--- a/src/constants/homeCards.ts
+++ b/src/constants/homeCards.ts
@@ -3,8 +3,8 @@ export type HomeCardName =
   "exam-quick-view" |
   "school-card-quick-view" |
   "score-quick-view" |
-  "library-quick-view" |
-  "electricity-quick-view";
+  "library-quick-view"
+  // "electricity-quick-view";
 
 export const homeCards: {
   [key in HomeCardName]: {
@@ -50,11 +50,11 @@ export const homeCards: {
     backgroundColor: "green",
     require: "isBindZF"
   },
-  "electricity-quick-view": {
+  /* "electricity-quick-view": {
     name: "electricity-quick-view",
     label: "电费查询",
     icon: "electricity",
     backgroundColor: "yellow",
     require: "isBindYXY"
-  }
+  } */
 };
diff --git a/src/constants/updateInfo.ts b/src/constants/updateInfo.ts
index fc8ef66f..d1537507 100644
--- a/src/constants/updateInfo.ts
+++ b/src/constants/updateInfo.ts
@@ -1,8 +1,17 @@
 export const updateInfo = {
-  version: "2.1.5.2",
+  version: "2.3.1",
   title: "微精弘更新公告",
   content:
-    "微精弘是工大学生自主开发的小程序，旨在为大家提供更便利的校园生活。近期我们收到微精弘课表出错的相关消息，但调研多位用户后我们未能发现错误数据。\n\n微精弘的课表数据来自正方教务系统，如有出错欢迎加群反馈，希望我们能一起努力让微精弘变得更好！群号：721519763"
+    ` | 版本号 2.2
+校级学生组织【精弘网络】研发的微精弘小程序发布重大更新，众多新功能等你来体验～\n
+| 更新内容
+1. 微精弘首页全面升级，上线首页自定义功能
+2. 新增「考试信息」首页卡片
+3. 新增「成绩查询」首页卡片
+4. 「成绩查询」功能已支持查询期中成绩
+5. 一卡通账号绑定功能开放测试
+6. 校园卡相关查询功能开放测试
+    `
 };
 
 export const questionnaireInfo = {
diff --git a/src/pages/schoolcard/index.vue b/src/pages/schoolcard/index.vue
index 4adb5044..d7618af9 100644
--- a/src/pages/schoolcard/index.vue
+++ b/src/pages/schoolcard/index.vue
@@ -114,10 +114,8 @@ const { run: queryRecord, loading } = useRequest(
     defaultParams: { queryTime: dayjs().format("YYYYMMDD") },
     onSuccess: (response) => {
       if (response.data.code === 1) {
-        if (response.data.data) {
-          records.value = response.data.data;
-          store.commit("setCardToday", records.value);
-        }
+        records.value = response.data.data || [];
+        store.commit("setCardToday", records.value);
       } else throw new Error(response.data.msg);
     },
     onError: (e) => {
diff --git a/src/store/system/index.ts b/src/store/system/index.ts
index 45b598de..3fb06ce2 100644
--- a/src/store/system/index.ts
+++ b/src/store/system/index.ts
@@ -9,6 +9,7 @@ export interface SystemStoreType {
     termYear: string;
     time: string;
     week: number;
+    score?: "上" | "下" | "短"; // 考虑一些服务与实际学期不同步
   };
   version: string;
   questionnaire: {