Skip to content

Commit

Permalink
chore(*): ready to release v2.2.0 (#31)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
j10ccc committed Mar 14, 2023
1 parent 168dc28 commit e9f61ab
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/components/ExamQuickView/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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( () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Home/edit-panel/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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<{
Expand Down
1 change: 0 additions & 1 deletion src/components/LessonsTableQuickView/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ScoreQuickView/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
6 changes: 3 additions & 3 deletions src/constants/copywriting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const faqText = {
{
title: "遇到「正方服务器出错」请怼教务处",
content:
"选课:5290019\n资源管理(教室借用):85290020\n教务管理(重考、重修、学生证补办、订火车票、申请旁听课):85290029"
"选课:85290019\n资源管理(教室借用):85290020\n教务管理(重考、重修、学生证补办、订火车票、申请旁听课):85290029"
},
{
title: "正方教务系统的密码是什么?",
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions src/constants/homeCards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]: {
Expand Down Expand Up @@ -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"
}
} */
};
13 changes: 11 additions & 2 deletions src/constants/updateInfo.ts
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
6 changes: 2 additions & 4 deletions src/pages/schoolcard/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
1 change: 1 addition & 0 deletions src/store/system/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface SystemStoreType {
termYear: string;
time: string;
week: number;
score?: "上" | "下" | "短"; // 考虑一些服务与实际学期不同步
};
version: string;
questionnaire: {
Expand Down

0 comments on commit e9f61ab

Please sign in to comment.