From 6da1631921bf9b332df5634bb610575a6fee3a05 Mon Sep 17 00:00:00 2001 From: j10c Date: Wed, 16 Nov 2022 11:11:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?perf(questionnaire):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=97=AE=E5=8D=B7=E8=AE=BF=E9=97=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Home/index.vue | 133 +++++++++++-------------- src/components/Questionnaire/index.vue | 5 +- src/constants/updateInfo.ts | 4 +- 3 files changed, 62 insertions(+), 80 deletions(-) diff --git a/src/components/Home/index.vue b/src/components/Home/index.vue index 2a31e47d..2d6eb41c 100644 --- a/src/components/Home/index.vue +++ b/src/components/Home/index.vue @@ -8,7 +8,9 @@ - + - diff --git a/src/components/Questionnaire/index.vue b/src/components/Questionnaire/index.vue index 70de3306..841c0c88 100644 --- a/src/components/Questionnaire/index.vue +++ b/src/components/Questionnaire/index.vue @@ -41,6 +41,7 @@ import Taro from '@tarojs/taro'; import { ref } from 'vue'; import store, { systemStore } from '@/store'; + import { questionnaireInfo } from '@/constants/updateInfo'; const showQuestionnaire = ref(true); const isFold = ref(false); @@ -75,8 +76,8 @@ const openQuestionnaire = () => { toggleFold(true); Taro.navigateToMiniProgram({ - appId: 'wxd947200f82267e58', - path: 'pages/wjxqList/wjxqList?activityId=O5XQdXK' + appId: questionnaireInfo.appId, + path: questionnaireInfo.path }); }; diff --git a/src/constants/updateInfo.ts b/src/constants/updateInfo.ts index 58904723..506af98f 100644 --- a/src/constants/updateInfo.ts +++ b/src/constants/updateInfo.ts @@ -5,5 +5,7 @@ export const updateInfo = { }; export const questionnaireInfo = { - path: 'pages/wjxqList/wjxqList?activityId=O5XQdXK' + isAccess: false, + appId: 'wxd947200f82267e58', + path: 'pages/wjxqList/wjxqList?activityId=O5QdXK' }; From f6e28362cf68f8be5983ba66e7652e1f0fb4da27 Mon Sep 17 00:00:00 2001 From: j10c Date: Wed, 16 Nov 2022 11:13:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix(login):=20=E5=88=A0=E9=99=A4=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E7=9A=84=E7=8A=B6=E6=80=81=E7=A0=81=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/utils/session.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/services/utils/session.ts b/src/services/utils/session.ts index 5d3f64cd..98c4e787 100644 --- a/src/services/utils/session.ts +++ b/src/services/utils/session.ts @@ -20,8 +20,7 @@ async function postWithSession( // comment: 如果刚才发出了请求,并且有结果,就直接返回结果 // TODO: NotLogin - if (res !== null && hasSession && res?.data.code !== ServerCode.NotLogin) - return res; + if (res !== null && hasSession) return res; // !hasSession 非自动登录,就直接取消继续获取 session // 如testSession 就不用再获取 session From e3cd935de3b1831013d20aaf8811a64c7a3fa924 Mon Sep 17 00:00:00 2001 From: j10c Date: Sat, 19 Nov 2022 15:55:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?perf(school-card):=20=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=A1=E5=9B=AD=E5=8D=A1=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=20perf:=20=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SchoolCardQuickView/index.vue | 4 ---- src/constants/updateInfo.ts | 1 + src/pages/index/index.vue | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/SchoolCardQuickView/index.vue b/src/components/SchoolCardQuickView/index.vue index a7731baa..d5dc9f53 100644 --- a/src/components/SchoolCardQuickView/index.vue +++ b/src/components/SchoolCardQuickView/index.vue @@ -24,10 +24,6 @@ export default defineComponent({ components: { 'quick-view': QuickView }, - async mounted() { - await CardService.updateCardBalance(); - }, - computed: { balanceUpdateTimeString() { const updateTime = serviceStore.card.updateTime; diff --git a/src/constants/updateInfo.ts b/src/constants/updateInfo.ts index 506af98f..e336d66a 100644 --- a/src/constants/updateInfo.ts +++ b/src/constants/updateInfo.ts @@ -1,4 +1,5 @@ export const updateInfo = { + version: '2.1.5.2', title: '微精弘更新公告', content: '微精弘是工大学生自主开发的小程序,旨在为大家提供更便利的校园生活。近期我们收到微精弘课表出错的相关消息,但调研多位用户后我们未能发现错误数据。\n\n微精弘的课表数据来自正方教务系统,如有出错欢迎加群反馈,希望我们能一起努力让微精弘变得更好!群号:721519763' diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b7a4c22e..f2c0d1bf 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -53,7 +53,7 @@ }); }); - const newVersion = Taro.getAccountInfoSync().miniProgram.version; + const newVersion = updateInfo.version; if (newVersion && systemStore.version !== newVersion) { store.commit('setVersion', newVersion); showUpdateInfo.value = true; From d8c61996c75663cc503b5d947b421f225cb0d55f Mon Sep 17 00:00:00 2001 From: j10c Date: Mon, 5 Dec 2022 21:39:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(freeroom):=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=EF=BC=9A=E8=8A=82=E6=AC=A1?= =?UTF-8?q?=EF=BC=8C=E5=93=8D=E5=BA=94=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoomPicker/index.vue | 78 +++++++++++++++++------------ src/pages/freeroom/index.vue | 13 ++++- src/services/services/zfService.ts | 2 +- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/src/components/RoomPicker/index.vue b/src/components/RoomPicker/index.vue index 2da00331..1cd8d50b 100644 --- a/src/components/RoomPicker/index.vue +++ b/src/components/RoomPicker/index.vue @@ -14,9 +14,10 @@ diff --git a/src/pages/freeroom/index.vue b/src/pages/freeroom/index.vue index 7a3e2716..406ed49f 100644 --- a/src/pages/freeroom/index.vue +++ b/src/pages/freeroom/index.vue @@ -45,7 +45,17 @@ import { Room } from '@/types/Room'; import './index.scss'; - function roomChanged(e) { + type freeRoomQueryType = { + campus: string; + sections: string; // 可扩展区间选择 + term: string; + week: string; + weekday: string; + year: string; + } + + function roomChanged(e: freeRoomQueryType) { + console.log(e); ZFService.getFreeRoomInfo(e); } @@ -64,6 +74,7 @@ tmp[freeroomMap[item.buildName[0]]] = []; tmp[freeroomMap[item.buildName[0]]].push(item); }); + Object.keys(tmp).forEach((key) => { buildingList.push({ buildName: key, diff --git a/src/services/services/zfService.ts b/src/services/services/zfService.ts index 8c2c7393..5b1f1928 100644 --- a/src/services/services/zfService.ts +++ b/src/services/services/zfService.ts @@ -103,7 +103,7 @@ export default class ZFService { term: string; campus: string; weekday: string; - section: string; + sections: string; week: string; }) { return updateDateStateWithSession(api.zf.freeroom, data, 'setRoomInfo'); From 19988210b9902202e182828c91189be1e261d428 Mon Sep 17 00:00:00 2001 From: j10c Date: Tue, 13 Dec 2022 14:50:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?chore(*):=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E5=8F=82=E6=95=B0=E5=92=8C=E5=8F=98?= =?UTF-8?q?=E9=87=8F=20style(*):=20=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=20fix(api):=20=E4=BF=AE=E6=94=B9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=AF=BE=E8=A1=A8=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=20fix(utils):=20=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=20alias?= =?UTF-8?q?=20=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc | 15 - .eslintrc.json | 39 + .prettierignore | 10 - .prettierrc.js | 12 - Readme.md | 19 +- babel.config.js | 4 +- config/dev.js | 4 +- config/index.js | 59 +- config/prod.js | 4 +- config/utils/version.js | 12 +- package.json | 7 +- src/apis/index.ts | 0 src/apis/interfaces/applist.ts | 0 src/apis/interfaces/index.ts | 0 src/app.config.ts | 45 +- src/app.scss | 3 +- src/app.ts | 22 +- src/components/Alarm/index.scss | 4 +- src/components/Alarm/index.vue | 22 +- src/components/AppList/AppListItem/index.vue | 95 +- src/components/AppList/index.vue | 36 +- .../BottomPanel/{style => }/index.scss | 4 +- src/components/BottomPanel/index.vue | 20 +- src/components/BottomPanel/style/dark.scss | 7 - src/components/BottomPanel/style/light.scss | 4 - src/components/Card/index.scss | 1 + src/components/Card/index.vue | 51 +- src/components/Home/index.scss | 2 + src/components/Home/index.vue | 135 +- src/components/LessonsTable/index.scss | 4 + src/components/LessonsTable/index.vue | 350 +- .../LessonsTableQuickView/index.vue | 282 +- src/components/LibraryQuickView/index.vue | 84 +- src/components/My/index.config.ts | 4 +- src/components/My/index.scss | 1 + src/components/My/index.vue | 164 +- src/components/NavBar/index.vue | 99 +- src/components/PopView/index.vue | 86 +- src/components/Questionnaire/index.scss | 1 + src/components/Questionnaire/index.vue | 98 +- src/components/QuickView/index.scss | 3 +- src/components/QuickView/index.vue | 44 +- src/components/RefleshButton/index.vue | 28 - .../index.scss | 6 +- src/components/RefreshButton/index.vue | 21 + src/components/RoomPicker/constants.ts | 1 - src/components/RoomPicker/index.vue | 153 +- src/components/SchoolCardQuickView/index.vue | 60 +- src/components/TermPicker/index.vue | 93 +- src/components/TitleBar/index.vue | 103 +- src/components/WeekPicker/index.vue | 48 +- src/components/button/index.ts | 2 +- src/components/button/src/Button.tsx | 24 +- src/components/collapse/index.ts | 4 +- src/components/collapse/src/Collapse.tsx | 8 +- src/components/collapse/src/CollapsePanel.tsx | 20 +- src/components/descriptions/index.ts | 4 +- .../descriptions/src/Descriptions.tsx | 10 +- .../descriptions/src/DescriptionsItem.tsx | 6 +- src/components/index.ts | 58 + src/components/list/index.ts | 4 +- src/components/list/src/List.tsx | 10 +- src/components/list/src/ListItem.tsx | 6 +- src/components/modal/index.ts | 2 +- src/components/modal/src/Modal.tsx | 12 +- src/components/modal/styles/index.scss | 2 +- src/components/steps/index.ts | 2 +- src/components/steps/src/Steps.tsx | 12 +- src/constants/appRoutes.ts | 0 src/constants/copywriting.ts | 56 +- src/constants/dayScheduleStartTime.ts | 68 +- src/constants/freeroomMap.ts | 42 +- src/constants/index.ts | 4 +- src/constants/updateInfo.ts | 10 +- src/hooks/index.ts | 3 + src/{utils => }/hooks/useTimeString.ts | 4 +- src/pages/about/index.config.ts | 4 +- src/pages/about/index.vue | 70 +- src/pages/activation/index.config.ts | 4 +- src/pages/activation/index.vue | 183 +- src/pages/announcement/index.config.ts | 6 +- src/pages/announcement/index.vue | 40 +- src/pages/bind/index.config.ts | 4 +- src/pages/bind/index.scss | 1 + src/pages/bind/index.vue | 171 +- src/pages/canteenflow/index.config.ts | 6 +- src/pages/canteenflow/index.scss | 3 +- src/pages/canteenflow/index.vue | 88 +- src/pages/connect/faq/index.config.ts | 6 +- src/pages/connect/faq/index.vue | 47 +- src/pages/connect/index.config.ts | 6 +- src/pages/connect/index.vue | 74 +- src/pages/exam/index.config.ts | 6 +- src/pages/exam/index.scss | 2 +- src/pages/exam/index.vue | 163 +- src/pages/freeroom/index.config.ts | 6 +- src/pages/freeroom/index.scss | 4 +- src/pages/freeroom/index.vue | 84 +- src/pages/index/index.config.ts | 6 +- src/pages/index/index.scss | 1 + src/pages/index/index.vue | 93 +- src/pages/lab/index.config.ts | 4 +- src/pages/lab/index.vue | 57 +- src/pages/lessonstable/index.config.ts | 4 +- src/pages/lessonstable/index.vue | 297 +- src/pages/library/index.config.ts | 6 +- src/pages/library/index.vue | 157 +- src/pages/schoolbus/index.config.ts | 4 +- src/pages/schoolbus/index.vue | 8 +- src/pages/schoolcard/index.config.ts | 6 +- src/pages/schoolcard/index.vue | 140 +- src/pages/score/index.config.ts | 6 +- src/pages/score/index.vue | 280 +- src/pages/setting/index.config.ts | 6 +- src/pages/setting/index.vue | 59 +- src/services/api/apiList.ts | 44 +- src/services/index.ts | 18 +- src/services/services/authService.ts | 37 +- src/services/services/canteenService.ts | 6 +- src/services/services/cardService.ts | 14 +- src/services/services/libraryService.ts | 8 +- src/services/services/schoolBusService.ts | 2 - src/services/services/systemInfoService.ts | 17 - src/services/services/systemService.ts | 14 +- src/services/services/userService.ts | 26 +- src/services/services/zfService.ts | 51 +- src/services/utils/errHandler.ts | 136 +- src/services/utils/session.ts | 36 +- src/services/utils/updateDateState.ts | 43 +- src/store/index.ts | 10 +- src/store/service/announcement.ts | 2 +- src/store/service/card.ts | 2 +- src/store/service/index.ts | 16 +- src/store/service/zf.ts | 8 +- src/store/system/index.ts | 10 +- src/style/components/input/dark.scss | 4 - src/style/components/input/index.scss | 8 - src/style/components/input/light.scss | 4 - src/style/icons.scss | 48 +- src/style/index.scss | 57 +- src/style/mixin.scss | 7 + src/style/theme.scss | 8 - src/theme.json | 10 - src/utils/{cookie => }/cookie.ts | 16 +- src/utils/effects.ts | 12 +- src/utils/{fetch/index.ts => fetch.ts} | 34 +- src/utils/hooks/index.ts | 3 - src/utils/index.ts | 17 + tests/helpers.ts | 40 - tests/mock/tarojs_components.ts | 42 - tests/setup.ts | 26 - tsconfig.json | 51 +- yarn-error.log | 15395 ++++++++++++++++ yarn.lock | 274 +- 154 files changed, 18166 insertions(+), 3244 deletions(-) delete mode 100644 .eslintrc create mode 100644 .eslintrc.json delete mode 100644 .prettierignore delete mode 100644 .prettierrc.js delete mode 100644 src/apis/index.ts delete mode 100644 src/apis/interfaces/applist.ts delete mode 100644 src/apis/interfaces/index.ts rename src/components/BottomPanel/{style => }/index.scss (88%) delete mode 100644 src/components/BottomPanel/style/dark.scss delete mode 100644 src/components/BottomPanel/style/light.scss delete mode 100644 src/components/RefleshButton/index.vue rename src/components/{RefleshButton => RefreshButton}/index.scss (80%) create mode 100644 src/components/RefreshButton/index.vue delete mode 100644 src/components/RoomPicker/constants.ts create mode 100644 src/components/index.ts delete mode 100644 src/constants/appRoutes.ts create mode 100644 src/hooks/index.ts rename src/{utils => }/hooks/useTimeString.ts (67%) delete mode 100644 src/services/services/schoolBusService.ts delete mode 100644 src/services/services/systemInfoService.ts delete mode 100644 src/style/components/input/dark.scss delete mode 100644 src/style/components/input/index.scss delete mode 100644 src/style/components/input/light.scss create mode 100644 src/style/mixin.scss delete mode 100644 src/theme.json rename src/utils/{cookie => }/cookie.ts (72%) rename src/utils/{fetch/index.ts => fetch.ts} (68%) delete mode 100644 src/utils/hooks/index.ts create mode 100644 src/utils/index.ts delete mode 100644 tests/helpers.ts delete mode 100644 tests/mock/tarojs_components.ts delete mode 100644 tests/setup.ts create mode 100644 yarn-error.log diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 08fa1635..00000000 --- a/.eslintrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": ["taro/vue3"], - "settings": { - "exclude": ["/dist", "/node_modules", "/coverage"] - }, - "parserOptions": { - "ecmaVersion": 6, - "sourceType": "module" - }, - "rules": { - "semi": "error", - "space-before-blocks": "error", - "no-trailing-spaces": "error" - } -} diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..df28ae32 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,39 @@ +{ + "env": { + "browser": true, + "es2021": true, + "node": true + }, + "extends": [ + "eslint:recommended" + ], + "overrides": [], + "parser": "vue-eslint-parser", + "parserOptions": { + "parser": "@typescript-eslint/parser", + "ecmaVersion": 2021, + "sourceType": "module" + }, + "plugins": [ + "vue", + "@typescript-eslint" + ], + "rules": { + "indent": [ + "error", + 2 + ], + "linebreak-style": [ + "error", + "unix" + ], + "quotes": [ + "error", + "double" + ], + "semi": [ + "error", + "always" + ] + } +} diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 2f0e2ec2..00000000 --- a/.prettierignore +++ /dev/null @@ -1,10 +0,0 @@ -*.min.js -*.handle.js -*.min.css -lib/ -node_modules/ -data/ -dist/ -yarn.lock -yarn-error.log -*.scss diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index a739f6e3..00000000 --- a/.prettierrc.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - trailingComma: 'none', - tabWidth: 2, - useTabs: false, - semi: true, - singleQuote: true, - arrowParens: 'always', - bracketSpacing: true, - vueIndentScriptAndStyle: true, - printWidth: 80, - endOfLine: 'lf' -}; diff --git a/Readme.md b/Readme.md index 7769d830..bd5891a7 100644 --- a/Readme.md +++ b/Readme.md @@ -1,16 +1,17 @@ # WeJH-Taro -使用跨平台框架 Taro +使用跨平台框架 Taro 构建的基于 Vue + TS 的小程序 -# 微精弘 +## 介绍 -> 微精弘是是碎片化、一站式、一体化校园移动门户,适用于浙江工业大学学生,集课表、成绩、考试、空教室、一卡通、借阅等功能于一身。 -> -> 微精弘有更好用的课表查询,本周视图、学期视图、对应日期及时钟轴,清晰明了。 -> -> 微精弘有更方便的考试安排,帮你折算出考试周对应的日期,以及考试时间倒计时,一目了然。 -> -> 微精弘还是校园生活助手与管家,一卡通余额及消费一览无余,让同学们更合理安排生活费。微精弘更是/更有... (期待您的发现) +- 微精弘是是碎片化、一站式、一体化校园移动门户,适用于浙江工业大学学生,集课表、成绩、考试、空教室、一卡通、借阅等功能于一身。 +- 微精弘有更好用的课表查询,本周视图、学期视图、对应日期及时钟轴,清晰明了。 +- 微精弘有更方便的考试安排,帮你折算出考试周对应的日期,以及考试时间倒计时,一目了然。 +- 微精弘还是校园生活助手与管家,一卡通余额及消费一览无余,让同学们更合理安排生活费。微精弘更是/更有... (期待您的发现) + +## 技术栈 + +Vue3, Typescript, Taro, Vuex ## 更多资料 diff --git a/babel.config.js b/babel.config.js index d0ec22ba..512f4986 100644 --- a/babel.config.js +++ b/babel.config.js @@ -3,9 +3,9 @@ module.exports = { presets: [ [ - 'taro', + "taro", { - framework: 'vue3', + framework: "vue3", ts: true, loose: false } diff --git a/config/dev.js b/config/dev.js index e9adccba..d4b047ae 100644 --- a/config/dev.js +++ b/config/dev.js @@ -1,7 +1,7 @@ module.exports = { env: { - NODE_ENV: '"development"', - HOST: '"https://wejh.zjutjh.com"' + NODE_ENV: "\"development\"", + HOST: "\"https://wejh.zjutjh.com\"" }, defineConstants: {}, mini: {}, diff --git a/config/index.js b/config/index.js index fc1533eb..4ef22990 100644 --- a/config/index.js +++ b/config/index.js @@ -1,9 +1,9 @@ -import { buildDate, commit } from './utils/version'; -import PackageJson from '../package.json'; -import path from 'path'; +import { buildDate, commit } from "./utils/version"; +import PackageJson from "../package.json"; +import path from "path"; const config = { - projectName: 'WeJh-Taro', - date: '2021-4-20', + projectName: "WeJh-Taro", + date: "2021-4-20", designWidth: 750, deviceRatio: { 640: 2.34 / 2, @@ -11,29 +11,30 @@ const config = { 828: 1.81 / 2, 375: 2 / 1 }, - sourceRoot: 'src', - outputRoot: 'dist', + sourceRoot: "src", + outputRoot: "dist", defineConstants: { APP_VERSION: JSON.stringify(PackageJson.version), - 'process.env.APP_NAME': JSON.stringify(PackageJson.name), - 'process.env.COMMIT_HASH': JSON.stringify(commit), - 'process.env.BUILD_TIME': JSON.stringify(buildDate), - 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV) + "process.env.APP_NAME": JSON.stringify(PackageJson.name), + "process.env.COMMIT_HASH": JSON.stringify(commit), + "process.env.BUILD_TIME": JSON.stringify(buildDate), + "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV) }, copy: { patterns: [], options: {} }, - framework: 'vue3', + framework: "vue3", alias: { - '@/assets': path.resolve(__dirname, '..', 'src/assets'), - '@/store': path.resolve(__dirname, '..', 'src/store'), - '@/utils': path.resolve(__dirname, '..', 'src/utils'), - '@/types': path.resolve(__dirname, '..', 'src/types'), - '@/services': path.resolve(__dirname, '..', 'src/services'), - '@/constants': path.resolve(__dirname, '..', 'src/constants'), - '@/components': path.resolve(__dirname, '..', 'src/components'), - '@/style': path.resolve(__dirname, '..', 'src/style') + "@/assets": path.resolve(__dirname, "..", "src/assets"), + "@/store": path.resolve(__dirname, "..", "src/store"), + "@/utils": path.resolve(__dirname, "..", "src/utils"), + "@/hooks": path.resolve(__dirname, "..", "src/hooks"), + "@/types": path.resolve(__dirname, "..", "src/types"), + "@/services": path.resolve(__dirname, "..", "src/services"), + "@/constants": path.resolve(__dirname, "..", "src/constants"), + "@/components": path.resolve(__dirname, "..", "src/components"), + "@/style": path.resolve(__dirname, "..", "src/style") }, mini: { miniCssExtractPluginOption: { @@ -53,15 +54,15 @@ const config = { cssModules: { enable: false, // 默认为 false,如需使用 css modules 功能,则设为 true config: { - namingPattern: 'module', // 转换模式,取值为 global/module - generateScopedName: '[name]__[local]___[hash:base64:5]' + namingPattern: "module", // 转换模式,取值为 global/module + generateScopedName: "[name]__[local]___[hash:base64:5]" } } } }, h5: { - publicPath: '/', - staticDirectory: 'static', + publicPath: "/", + staticDirectory: "static", postcss: { autoprefixer: { enable: true, @@ -70,8 +71,8 @@ const config = { cssModules: { enable: false, // 默认为 false,如需使用 css modules 功能,则设为 true config: { - namingPattern: 'module', // 转换模式,取值为 global/module - generateScopedName: '[name]__[local]___[hash:base64:5]' + namingPattern: "module", // 转换模式,取值为 global/module + generateScopedName: "[name]__[local]___[hash:base64:5]" } } } @@ -79,8 +80,8 @@ const config = { }; module.exports = function (merge) { - if (process.env.NODE_ENV === 'development') { - return merge({}, config, require('./dev')); + if (process.env.NODE_ENV === "development") { + return merge({}, config, require("./dev")); } - return merge({}, config, require('./prod')); + return merge({}, config, require("./prod")); }; diff --git a/config/prod.js b/config/prod.js index 95af5ef2..683a772b 100644 --- a/config/prod.js +++ b/config/prod.js @@ -1,7 +1,7 @@ module.exports = { env: { - NODE_ENV: '"production"', - HOST: '"https://wejh.zjutjh.com"' + NODE_ENV: "\"production\"", + HOST: "\"https://wejh.zjutjh.com\"" }, defineConstants: {}, mini: {}, diff --git a/config/utils/version.js b/config/utils/version.js index da4c8c63..22a5fd67 100644 --- a/config/utils/version.js +++ b/config/utils/version.js @@ -1,15 +1,15 @@ -import dayjs from 'dayjs'; -const child_process = require('child_process'); +import dayjs from "dayjs"; +const child_process = require("child_process"); // git 最后一次提交的 Head const commit = child_process - .execSync('git show -s --format=%H') + .execSync("git show -s --format=%H") .toString() .trim(); const commitDateObj = new Date( - child_process.execSync(`git show -s --format=%cd`).toString() + child_process.execSync("git show -s --format=%cd").toString() ); -const commitDate = dayjs(commitDateObj).format('YYYY-MM-DD HH:mm:ss'); -const buildDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); +const commitDate = dayjs(commitDateObj).format("YYYY-MM-DD HH:mm:ss"); +const buildDate = dayjs().format("YYYY-MM-DD HH:mm:ss"); module.exports = { commit, diff --git a/package.json b/package.json index b9bdc772..78ac91dd 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "@tarojs/cli": "^3.5.5", "@types/jest": "^26.0.17", "@types/webpack-env": "^1.16.0", - "@typescript-eslint/eslint-plugin": "^4.22.0", - "@typescript-eslint/parser": "^4.22.0", + "@typescript-eslint/eslint-plugin": "^5.46.1", + "@typescript-eslint/parser": "^5.46.1", "@vue/babel-plugin-jsx": "^1.0.0-rc.4", "@vue/compiler-sfc": "^3.0.0", "@vue/test-utils": "^2.0.0-rc.6", @@ -67,12 +67,11 @@ "cross-env": "^7.0.2", "eslint": "^7.25.0", "eslint-config-taro": "^3.5.5", - "eslint-plugin-vue": "^7.9.0", + "eslint-plugin-vue": "^9.8.0", "git-revision-webpack-plugin": "^5.0.0", "jest": "^26.6.3", "jest-serializer-vue": "^2.0.2", "jest-transform-stub": "^2.0.0", - "prettier": "^2.4.0", "ts-jest": "^26.5.5", "ts-loader": "^9.2.6", "typescript": "^4.4.3", diff --git a/src/apis/index.ts b/src/apis/index.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/apis/interfaces/applist.ts b/src/apis/interfaces/applist.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/apis/interfaces/index.ts b/src/apis/interfaces/index.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app.config.ts b/src/app.config.ts index 555ac14c..91249922 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -1,31 +1,28 @@ export default { pages: [ - 'pages/index/index', - 'pages/activation/index', - 'pages/bind/index', - 'pages/lessonstable/index', - 'pages/schoolbus/index', - 'pages/library/index', - 'pages/schoolcard/index', - 'pages/about/index', - 'pages/exam/index', - 'pages/score/index', - 'pages/setting/index', - 'pages/connect/index', - 'pages/connect/faq/index', - 'pages/lab/index', - 'pages/freeroom/index', - 'pages/canteenflow/index', - 'pages/announcement/index' + "pages/index/index", + "pages/activation/index", + "pages/bind/index", + "pages/lessonstable/index", + "pages/schoolbus/index", + "pages/library/index", + "pages/schoolcard/index", + "pages/about/index", + "pages/exam/index", + "pages/score/index", + "pages/setting/index", + "pages/connect/index", + "pages/connect/faq/index", + "pages/lab/index", + "pages/freeroom/index", + "pages/canteenflow/index", + "pages/announcement/index" ], darkmode: false, window: { - backgroundTextStyle: 'light', - navigationBarBackgroundColor: '#fff', - // navigationBarBackgroundColor: '@navBgColor', - // navigationBarTextStyle: '@navTxtStyle', - navigationBarTextStyle: 'black', - navigationStyle: 'custom' + backgroundTextStyle: "light", + navigationBarBackgroundColor: "#fff", + navigationBarTextStyle: "black", + navigationStyle: "custom" } - // themeLocation: 'theme.json' }; diff --git a/src/app.scss b/src/app.scss index 65cf49d3..f131e7c9 100644 --- a/src/app.scss +++ b/src/app.scss @@ -1,3 +1,2 @@ -@import './style/icons.scss'; @import './style'; -@import './style/puhuiti.scss' +@import './style/theme.scss'; diff --git a/src/app.ts b/src/app.ts index a0006206..ca10ad2b 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,15 +1,15 @@ -import { createApp } from 'vue'; -import store from './store/index'; -import { LoginByTaro } from './services'; -import { SystemService } from './services'; -import customParseFormat from 'dayjs/plugin/customParseFormat'; -import relativeTime from 'dayjs/plugin/relativeTime'; -import dayjs from 'dayjs'; -import utc from 'dayjs/plugin/utc'; // dependent on utc plugin -import 'dayjs/locale/zh-cn'; -import './app.scss'; +import { createApp } from "vue"; +import store from "./store/index"; +import { LoginByTaro } from "./services"; +import { SystemService } from "./services"; +import customParseFormat from "dayjs/plugin/customParseFormat"; +import relativeTime from "dayjs/plugin/relativeTime"; +import dayjs from "dayjs"; +import utc from "dayjs/plugin/utc"; // dependent on utc plugin +import "dayjs/locale/zh-cn"; +import "./app.scss"; -dayjs.locale('zh-cn'); +dayjs.locale("zh-cn"); dayjs.extend(customParseFormat); dayjs.extend(utc); dayjs.extend(relativeTime); diff --git a/src/components/Alarm/index.scss b/src/components/Alarm/index.scss index e38b7f41..7b4525b9 100644 --- a/src/components/Alarm/index.scss +++ b/src/components/Alarm/index.scss @@ -5,7 +5,7 @@ } .wjh-alarm-icon { - font-size: 1.2rem; + font-size: 1.2rem !important; color: var(--wjh-color-text-secondary); } @@ -21,4 +21,4 @@ border-radius: 1000Px; position: relative; text-align: center; -} \ No newline at end of file +} diff --git a/src/components/Alarm/index.vue b/src/components/Alarm/index.vue index a40acb85..789b9f26 100644 --- a/src/components/Alarm/index.vue +++ b/src/components/Alarm/index.vue @@ -1,19 +1,17 @@ - diff --git a/src/components/AppList/AppListItem/index.vue b/src/components/AppList/AppListItem/index.vue index 1feab57c..1b588336 100644 --- a/src/components/AppList/AppListItem/index.vue +++ b/src/components/AppList/AppListItem/index.vue @@ -1,60 +1,51 @@ - diff --git a/src/components/AppList/index.vue b/src/components/AppList/index.vue index f4ab1d0d..3c1c1dd1 100644 --- a/src/components/AppList/index.vue +++ b/src/components/AppList/index.vue @@ -13,26 +13,20 @@ 无可用服务 - diff --git a/src/components/BottomPanel/style/index.scss b/src/components/BottomPanel/index.scss similarity index 88% rename from src/components/BottomPanel/style/index.scss rename to src/components/BottomPanel/index.scss index ed084039..9ca9537e 100644 --- a/src/components/BottomPanel/style/index.scss +++ b/src/components/BottomPanel/index.scss @@ -1,5 +1,3 @@ -// @import './light.scss'; -// @import './dark.scss'; @import '@/style/theme.scss'; .bottom-panel { @@ -20,4 +18,4 @@ .bottom-bar-ios { padding-bottom: 2rem; -} \ No newline at end of file +} diff --git a/src/components/BottomPanel/index.vue b/src/components/BottomPanel/index.vue index 5beb7829..cafa8fcd 100644 --- a/src/components/BottomPanel/index.vue +++ b/src/components/BottomPanel/index.vue @@ -1,16 +1,14 @@ - diff --git a/src/components/BottomPanel/style/dark.scss b/src/components/BottomPanel/style/dark.scss deleted file mode 100644 index 90739375..00000000 --- a/src/components/BottomPanel/style/dark.scss +++ /dev/null @@ -1,7 +0,0 @@ -// comment: disable dark mode -/* @media (prefers-color-scheme: dark) { - .bottom-bar { - background-color: rgba($color: #444, $alpha: 0.7); - } -} - */ diff --git a/src/components/BottomPanel/style/light.scss b/src/components/BottomPanel/style/light.scss deleted file mode 100644 index 51fd1b22..00000000 --- a/src/components/BottomPanel/style/light.scss +++ /dev/null @@ -1,4 +0,0 @@ -.bottom-bar { - background-color: rgba($color: #fff, $alpha: 0.7); - z-index: 999; -} diff --git a/src/components/Card/index.scss b/src/components/Card/index.scss index 3adce280..75b457c8 100644 --- a/src/components/Card/index.scss +++ b/src/components/Card/index.scss @@ -1,4 +1,5 @@ @import '@/style/theme.scss'; +@import "@/style/mixin.scss"; .wjh-card-size-small { padding: 0 8Px; diff --git a/src/components/Card/index.vue b/src/components/Card/index.vue index 3654c5b0..c74f71a3 100644 --- a/src/components/Card/index.vue +++ b/src/components/Card/index.vue @@ -1,5 +1,5 @@ - diff --git a/src/components/Home/index.scss b/src/components/Home/index.scss index 8e153a89..0d4274ee 100644 --- a/src/components/Home/index.scss +++ b/src/components/Home/index.scss @@ -1,3 +1,5 @@ +@import '@/style/mixin.scss'; + .quick-card-view { display: flex; flex-direction: column; diff --git a/src/components/Home/index.vue b/src/components/Home/index.vue index 2d6eb41c..7c485b72 100644 --- a/src/components/Home/index.vue +++ b/src/components/Home/index.vue @@ -11,10 +11,10 @@ - + > diff --git a/src/components/LessonsTable/index.scss b/src/components/LessonsTable/index.scss index bea43af4..972dc698 100644 --- a/src/components/LessonsTable/index.scss +++ b/src/components/LessonsTable/index.scss @@ -1,3 +1,5 @@ +@import "@/style/mixin.scss"; + .index-panel { height: 100%; z-index: 10; @@ -27,6 +29,8 @@ margin-top: 2rem; height: calc(100% - 4rem); border-radius: 0 0 0 8Px; + background: rgb(255, 255, 255, .7); + @include blur; } .class { diff --git a/src/components/LessonsTable/index.vue b/src/components/LessonsTable/index.vue index 419ef1fd..97649c57 100644 --- a/src/components/LessonsTable/index.vue +++ b/src/components/LessonsTable/index.vue @@ -63,15 +63,15 @@ diff --git a/src/components/LessonsTableQuickView/index.vue b/src/components/LessonsTableQuickView/index.vue index 79217da8..59d9f7e0 100644 --- a/src/components/LessonsTableQuickView/index.vue +++ b/src/components/LessonsTableQuickView/index.vue @@ -1,39 +1,25 @@ - diff --git a/src/components/LibraryQuickView/index.vue b/src/components/LibraryQuickView/index.vue index 814c0bd1..dd5879bb 100644 --- a/src/components/LibraryQuickView/index.vue +++ b/src/components/LibraryQuickView/index.vue @@ -1,42 +1,56 @@ diff --git a/src/components/My/index.config.ts b/src/components/My/index.config.ts index af4535a6..26db3f0b 100644 --- a/src/components/My/index.config.ts +++ b/src/components/My/index.config.ts @@ -1,5 +1,5 @@ export default { - navigationBarTitleText: '我的', + navigationBarTitleText: "我的", disableScroll: true, - backgroundColor: '#fff' + backgroundColor: "#fff" }; diff --git a/src/components/My/index.scss b/src/components/My/index.scss index afac5fad..9e7717a8 100644 --- a/src/components/My/index.scss +++ b/src/components/My/index.scss @@ -1,4 +1,5 @@ @import '@/style/theme.scss'; +@import '@/style/mixin.scss'; .flex { diff --git a/src/components/My/index.vue b/src/components/My/index.vue index bf848f82..35e359ec 100644 --- a/src/components/My/index.vue +++ b/src/components/My/index.vue @@ -2,19 +2,19 @@ - + - + - {{ - userWXProfile.nickName + {{ + userInfo?.wxProfile.nickName }} 点击获取头像昵称微精弘 {{ - userInfo.studentID + userInfo.info?.studentID }} - + 激活 - + - diff --git a/src/components/NavBar/index.vue b/src/components/NavBar/index.vue index 3d8f5949..9d2ea7a4 100644 --- a/src/components/NavBar/index.vue +++ b/src/components/NavBar/index.vue @@ -1,69 +1,62 @@ - diff --git a/src/components/PopView/index.vue b/src/components/PopView/index.vue index 282afe06..c9bf7158 100644 --- a/src/components/PopView/index.vue +++ b/src/components/PopView/index.vue @@ -1,55 +1,47 @@ - diff --git a/src/components/Questionnaire/index.scss b/src/components/Questionnaire/index.scss index 3be8ee43..0a8517f9 100644 --- a/src/components/Questionnaire/index.scss +++ b/src/components/Questionnaire/index.scss @@ -1,4 +1,5 @@ @import '@/style/theme.scss'; +@import '@/style/mixin.scss'; .questionnaire { @include radius; diff --git a/src/components/Questionnaire/index.vue b/src/components/Questionnaire/index.vue index 841c0c88..53d6e163 100644 --- a/src/components/Questionnaire/index.vue +++ b/src/components/Questionnaire/index.vue @@ -1,14 +1,8 @@ - + 点击卡片参与问卷调查 为微精弘的更新迭代提出一份建议吧~ @@ -36,48 +24,50 @@ + diff --git a/src/components/QuickView/index.scss b/src/components/QuickView/index.scss index 807818aa..91161ceb 100644 --- a/src/components/QuickView/index.scss +++ b/src/components/QuickView/index.scss @@ -1,4 +1,5 @@ @import '@/style/theme.scss'; +@import '@/style/mixin.scss'; .quick-view { @include radius; @@ -62,4 +63,4 @@ line-height: 200%; } -} \ No newline at end of file +} diff --git a/src/components/QuickView/index.vue b/src/components/QuickView/index.vue index 64530207..40e5c0dd 100644 --- a/src/components/QuickView/index.vue +++ b/src/components/QuickView/index.vue @@ -2,40 +2,28 @@ - - + + {{ title }} - + - + - diff --git a/src/components/RefleshButton/index.vue b/src/components/RefleshButton/index.vue deleted file mode 100644 index dc96d4bc..00000000 --- a/src/components/RefleshButton/index.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/src/components/RefleshButton/index.scss b/src/components/RefreshButton/index.scss similarity index 80% rename from src/components/RefleshButton/index.scss rename to src/components/RefreshButton/index.scss index d4b36d24..a2549a2b 100644 --- a/src/components/RefleshButton/index.scss +++ b/src/components/RefreshButton/index.scss @@ -8,10 +8,10 @@ } } -.reflesh-button { +.refresh-button { padding: 5Px; } -.reflesh-running { +.refresh-running { animation: rote 1s alternate infinite; -} \ No newline at end of file +} diff --git a/src/components/RefreshButton/index.vue b/src/components/RefreshButton/index.vue new file mode 100644 index 00000000..3a886fd5 --- /dev/null +++ b/src/components/RefreshButton/index.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/components/RoomPicker/constants.ts b/src/components/RoomPicker/constants.ts deleted file mode 100644 index 0025d894..00000000 --- a/src/components/RoomPicker/constants.ts +++ /dev/null @@ -1 +0,0 @@ -export const campus = ['朝晖', '屏峰', '莫干山']; diff --git a/src/components/RoomPicker/index.vue b/src/components/RoomPicker/index.vue index 1cd8d50b..9aa2b813 100644 --- a/src/components/RoomPicker/index.vue +++ b/src/components/RoomPicker/index.vue @@ -2,8 +2,8 @@ {{ selectorChecked[0] }} {{ selectorChecked[1] }} @@ -12,96 +12,81 @@ - diff --git a/src/components/SchoolCardQuickView/index.vue b/src/components/SchoolCardQuickView/index.vue index d5dc9f53..b9b13e0d 100644 --- a/src/components/SchoolCardQuickView/index.vue +++ b/src/components/SchoolCardQuickView/index.vue @@ -1,47 +1,45 @@ - diff --git a/src/components/TermPicker/index.vue b/src/components/TermPicker/index.vue index 3098bdb1..990a53ea 100644 --- a/src/components/TermPicker/index.vue +++ b/src/components/TermPicker/index.vue @@ -16,55 +16,50 @@ - - diff --git a/src/components/TitleBar/index.vue b/src/components/TitleBar/index.vue index f5a5865a..2ff17dfc 100644 --- a/src/components/TitleBar/index.vue +++ b/src/components/TitleBar/index.vue @@ -1,63 +1,56 @@ - diff --git a/src/components/WeekPicker/index.vue b/src/components/WeekPicker/index.vue index 44f63fa0..822dad35 100644 --- a/src/components/WeekPicker/index.vue +++ b/src/components/WeekPicker/index.vue @@ -32,35 +32,35 @@ diff --git a/src/components/button/index.ts b/src/components/button/index.ts index 55358cfd..624e07f5 100644 --- a/src/components/button/index.ts +++ b/src/components/button/index.ts @@ -1 +1 @@ -export { default as WButton } from './src/Button'; +export { default as WButton } from "./src/Button"; diff --git a/src/components/button/src/Button.tsx b/src/components/button/src/Button.tsx index 689cfb7f..b8fb9e59 100644 --- a/src/components/button/src/Button.tsx +++ b/src/components/button/src/Button.tsx @@ -1,39 +1,39 @@ -import { Button } from '@tarojs/components'; -import { defineComponent, PropType } from 'vue'; -import '../styles/index.scss'; +import { Button } from "@tarojs/components"; +import { defineComponent, PropType } from "vue"; +import "../styles/index.scss"; const buttonProps = { size: { - type: String as PropType<'small' | 'middle' | 'large'>, - default: 'middle' + type: String as PropType<"small" | "middle" | "large">, + default: "middle" }, shape: { - type: String as PropType<'circle' | 'rounded' | 'default'>, - default: 'default' + type: String as PropType<"circle" | "rounded" | "default">, + default: "default" }, block: { type: Boolean, default: false }, color: { - type: String as PropType<'green' | 'yellow' | 'blue' | 'cyan'> + type: String as PropType<"green" | "yellow" | "blue" | "cyan"> } }; export default defineComponent({ - name: 'WButton', + name: "WButton", props: buttonProps, render() { const { $slots } = this; const colorStyle = this.color ? { backgroundColor: `var(--wjh-color-${this.color})` } - : ''; + : ""; const sizeClass = `wjh-button-${this.size}`; - const blockClass = this.block ? 'wjh-button-block' : undefined; + const blockClass = this.block ? "wjh-button-block" : undefined; const shapeClass = `wjh-button-shape-${this.shape}`; return ( diff --git a/src/components/collapse/index.ts b/src/components/collapse/index.ts index 9cb5e36f..26924ada 100644 --- a/src/components/collapse/index.ts +++ b/src/components/collapse/index.ts @@ -1,2 +1,2 @@ -export { default as WCollapse } from './src/Collapse'; -export { default as WCollapsePanel } from './src/CollapsePanel'; +export { default as WCollapse } from "./src/Collapse"; +export { default as WCollapsePanel } from "./src/CollapsePanel"; diff --git a/src/components/collapse/src/Collapse.tsx b/src/components/collapse/src/Collapse.tsx index b736d436..61e6fb8f 100644 --- a/src/components/collapse/src/Collapse.tsx +++ b/src/components/collapse/src/Collapse.tsx @@ -1,6 +1,6 @@ -import { WList } from '@/components/list'; -import { defineComponent } from 'vue'; -import '../styles/index.scss'; +import { WList } from "@/components/list"; +import { defineComponent } from "vue"; +import "../styles/index.scss"; const collapseProps = { defaultAvtiveKey: { @@ -9,7 +9,7 @@ const collapseProps = { } }; export default defineComponent({ - name: 'Collapse', + name: "Collapse", props: collapseProps, components: { WList diff --git a/src/components/collapse/src/CollapsePanel.tsx b/src/components/collapse/src/CollapsePanel.tsx index 874dad4f..ace92a05 100644 --- a/src/components/collapse/src/CollapsePanel.tsx +++ b/src/components/collapse/src/CollapsePanel.tsx @@ -1,6 +1,6 @@ -import { defineComponent } from 'vue'; -import '../styles/index.scss'; -import { WListItem } from '@/components/list'; +import { defineComponent } from "vue"; +import "../styles/index.scss"; +import { WListItem } from "@/components/list"; const collapsePanelProps = { title: { @@ -12,7 +12,7 @@ const collapsePanelProps = { }, maxHeight: { type: String, - default: '500px' + default: "500px" }, arrow: { type: Boolean, @@ -21,7 +21,7 @@ const collapsePanelProps = { }; export default defineComponent({ - name: 'CollapsePanel', + name: "CollapsePanel", props: collapsePanelProps, components: { WListItem @@ -43,8 +43,8 @@ export default defineComponent({ <> {$slots.default?.()} diff --git a/src/components/descriptions/index.ts b/src/components/descriptions/index.ts index 87b47df3..c0cedc9a 100644 --- a/src/components/descriptions/index.ts +++ b/src/components/descriptions/index.ts @@ -1,2 +1,2 @@ -export { default as WDescriptions } from './src/Descriptions'; -export { default as WDescriptionsItem } from './src/DescriptionsItem'; +export { default as WDescriptions } from "./src/Descriptions"; +export { default as WDescriptionsItem } from "./src/DescriptionsItem"; diff --git a/src/components/descriptions/src/Descriptions.tsx b/src/components/descriptions/src/Descriptions.tsx index c534eba7..1e1ade4f 100644 --- a/src/components/descriptions/src/Descriptions.tsx +++ b/src/components/descriptions/src/Descriptions.tsx @@ -1,16 +1,16 @@ -import { defineComponent, PropType } from 'vue'; -import '../styles/index.scss'; +import { defineComponent, PropType } from "vue"; +import "../styles/index.scss"; const descriptionsProps = { size: { - type: String as PropType<'small' | 'middle'>, - default: 'middle' + type: String as PropType<"small" | "middle">, + default: "middle" }, title: String }; export default defineComponent({ - name: 'Descriptions', + name: "Descriptions", props: descriptionsProps, render() { const { $slots, $props } = this; diff --git a/src/components/descriptions/src/DescriptionsItem.tsx b/src/components/descriptions/src/DescriptionsItem.tsx index 4686f792..b28eb2b7 100644 --- a/src/components/descriptions/src/DescriptionsItem.tsx +++ b/src/components/descriptions/src/DescriptionsItem.tsx @@ -1,5 +1,5 @@ -import { defineComponent } from 'vue'; -import '../styles/index.scss'; +import { defineComponent } from "vue"; +import "../styles/index.scss"; const descriptionsItemProps = { label: String, @@ -10,7 +10,7 @@ const descriptionsItemProps = { }; export default defineComponent({ - name: 'DescriptionsItem', + name: "DescriptionsItem", props: descriptionsItemProps, render() { const { $slots, $props } = this; diff --git a/src/components/index.ts b/src/components/index.ts new file mode 100644 index 00000000..82dfb970 --- /dev/null +++ b/src/components/index.ts @@ -0,0 +1,58 @@ +import Alarm from "./Alarm/index.vue"; +import AppList from "./AppList/index.vue"; +import BottomPanel from "./BottomPanel/index.vue"; +import Card from "./Card/index.vue"; +import Home from "./Home/index.vue"; +import LessonsTable from "./LessonsTable/index.vue"; +import LessonsTableQuickView from "./LessonsTableQuickView/index.vue"; +import LibraryQuickView from "./LibraryQuickView/index.vue"; +import My from "./My/index.vue"; +import NavBar from "./NavBar/index.vue"; +import PopView from "./PopView/index.vue"; +import Questionnaire from "./Questionnaire/index.vue"; +import QuickView from "./QuickView/index.vue"; +import RefreshButton from "./RefreshButton/index.vue"; +import RoomPicker from "./RoomPicker/index.vue"; +import SchoolCardQuickView from "./SchoolCardQuickView/index.vue"; +import TermPicker from "./TermPicker/index.vue"; +import TitleBar from "./TitleBar/index.vue"; +import WeekPicker from "./WeekPicker/index.vue"; + +import { WList, WListItem } from "./list"; +import { WButton } from "./button"; +import { WCollapse, WCollapsePanel } from "./collapse/"; +import { WDescriptions, WDescriptionsItem } from "./descriptions"; +import { WModal } from "./modal"; +import { WSteps } from "./steps"; + +export { + Alarm, + AppList, + BottomPanel, + Card, + Home, + LessonsTable, + LessonsTableQuickView, + LibraryQuickView, + WButton, + PopView, + My, + NavBar, + Questionnaire, + QuickView, + RefreshButton, + RoomPicker, + SchoolCardQuickView, + TermPicker, + TitleBar, + WeekPicker, + + WList, + WListItem, + WCollapse, + WCollapsePanel, + WDescriptions, + WDescriptionsItem, + WModal, + WSteps, +}; diff --git a/src/components/list/index.ts b/src/components/list/index.ts index cdf9bf53..893bd4d0 100644 --- a/src/components/list/index.ts +++ b/src/components/list/index.ts @@ -1,2 +1,2 @@ -export { default as WList } from './src/List'; -export { default as WListItem } from './src/ListItem'; +export { default as WList } from "./src/List"; +export { default as WListItem } from "./src/ListItem"; diff --git a/src/components/list/src/List.tsx b/src/components/list/src/List.tsx index ed6c41e1..6e626b5a 100644 --- a/src/components/list/src/List.tsx +++ b/src/components/list/src/List.tsx @@ -1,15 +1,15 @@ -import { defineComponent, PropType } from 'vue'; -import '../styles/index.scss'; +import { defineComponent, PropType } from "vue"; +import "../styles/index.scss"; const listProps = { size: { - type: String as PropType<'small' | 'middle'>, - default: 'middle' + type: String as PropType<"small" | "middle">, + default: "middle" } }; export default defineComponent({ - name: 'List', + name: "List", props: listProps, render() { const { $slots, $props } = this; diff --git a/src/components/list/src/ListItem.tsx b/src/components/list/src/ListItem.tsx index 67fd669e..ec7ef313 100644 --- a/src/components/list/src/ListItem.tsx +++ b/src/components/list/src/ListItem.tsx @@ -1,5 +1,5 @@ -import { defineComponent } from 'vue'; -import '../styles/index.scss'; +import { defineComponent } from "vue"; +import "../styles/index.scss"; const listItemProps = { clickable: { @@ -8,7 +8,7 @@ const listItemProps = { } }; export default defineComponent({ - name: 'ListItem', + name: "ListItem", props: listItemProps, render() { const { $slots, $props } = this; diff --git a/src/components/modal/index.ts b/src/components/modal/index.ts index 21898154..abc2c4e8 100644 --- a/src/components/modal/index.ts +++ b/src/components/modal/index.ts @@ -1 +1 @@ -export { default as WModal } from './src/Modal'; +export { default as WModal } from "./src/Modal"; diff --git a/src/components/modal/src/Modal.tsx b/src/components/modal/src/Modal.tsx index c2b427a1..499ee94b 100644 --- a/src/components/modal/src/Modal.tsx +++ b/src/components/modal/src/Modal.tsx @@ -1,9 +1,9 @@ -import { defineComponent } from 'vue'; -import '../styles/index.scss'; +import { defineComponent } from "vue"; +import "../styles/index.scss"; const modalProps = { title: { - default: '帮助', + default: "帮助", type: String }, mask: { @@ -19,17 +19,17 @@ const modalProps = { } }; export default defineComponent({ - name: 'WModal', + name: "WModal", props: modalProps, methods: { closeModal() { - this.$emit('update:show', false); + this.$emit("update:show", false); } }, render() { const { $slots, $props, closeModal } = this; return ( - + {$props.title} diff --git a/src/components/modal/styles/index.scss b/src/components/modal/styles/index.scss index 4d821d37..6c7030bb 100644 --- a/src/components/modal/styles/index.scss +++ b/src/components/modal/styles/index.scss @@ -1,4 +1,4 @@ -@import '@/style/theme.scss'; +@import "@/style/mixin.scss"; .wjh-modal-mask { position: fixed; diff --git a/src/components/steps/index.ts b/src/components/steps/index.ts index 942b43c6..9de14230 100644 --- a/src/components/steps/index.ts +++ b/src/components/steps/index.ts @@ -1 +1 @@ -export { default as WSteps } from './src/Steps'; +export { default as WSteps } from "./src/Steps"; diff --git a/src/components/steps/src/Steps.tsx b/src/components/steps/src/Steps.tsx index c9445c08..4a6a0527 100644 --- a/src/components/steps/src/Steps.tsx +++ b/src/components/steps/src/Steps.tsx @@ -1,5 +1,5 @@ -import { defineComponent } from 'vue'; -import '../styles/index.scss'; +import { defineComponent } from "vue"; +import "../styles/index.scss"; const stepProps = { total: Number, @@ -7,7 +7,7 @@ const stepProps = { }; export default defineComponent({ - name: 'WSteps', + name: "WSteps", props: stepProps, render() { const { $slots, $props } = this; @@ -20,13 +20,13 @@ export default defineComponent({ return ( - {index === $props.current - 1 ? `0${$props.current}` : ''} + {index === $props.current - 1 ? `0${$props.current}` : ""} ); })} diff --git a/src/constants/appRoutes.ts b/src/constants/appRoutes.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/constants/copywriting.ts b/src/constants/copywriting.ts index 7dc2deed..ef7f885d 100644 --- a/src/constants/copywriting.ts +++ b/src/constants/copywriting.ts @@ -1,70 +1,70 @@ export const aboutText = { description: [ - '微精弘是是碎片化、一站式、一体化校园移动门户,适用于浙江工业大学学生,集课表、成绩、考试、空教室、一卡通、借阅等功能于一身。', - '微精弘有更好用的课表查询,本周视图、学期视图、对应日期及时钟轴,清晰明了', - '微精弘有更方便的考试安排,帮你折算出考试周对应的日期,以及考试时间倒计时,一目了然。', - '微精弘还是校园生活助手与管家,一卡通余额及消费一览无余,让同学们更合理安排生活费。微精弘更是/更有...(期待您的发现)' + "微精弘是是碎片化、一站式、一体化校园移动门户,适用于浙江工业大学学生,集课表、成绩、考试、空教室、一卡通、借阅等功能于一身。", + "微精弘有更好用的课表查询,本周视图、学期视图、对应日期及时钟轴,清晰明了", + "微精弘有更方便的考试安排,帮你折算出考试周对应的日期,以及考试时间倒计时,一目了然。", + "微精弘还是校园生活助手与管家,一卡通余额及消费一览无余,让同学们更合理安排生活费。微精弘更是/更有...(期待您的发现)" ] }; export const labText = { - empty: '当前没有实验功能,尽情期待!😚' + empty: "当前没有实验功能,尽情期待!😚" }; export const settingText = { - empty: '当前没有可设置功能,尽情期待!😚' + empty: "当前没有可设置功能,尽情期待!😚" }; export const faqText = { qa: [ { - title: '我一直空课表或课表报错,怎么办?', + title: "我一直空课表或课表报错,怎么办?", content: - '1. 首先检查一下网络连接。\n2. 假如是空课表,没有报错,请检查一下当前学期是否正确。\n3. 切换学期:右下角「期/周」切换,然后在下方进行切换学期。\n4. 假如有报错,可能是因为修改过正方教务系统密码而导致课表未能同步,请前往「我的-绑定-正方账号」重新填写正方密码进行绑定操作。\n5. 回到首页自动刷新。\n' + "1. 首先检查一下网络连接。\n2. 假如是空课表,没有报错,请检查一下当前学期是否正确。\n3. 切换学期:右下角「期/周」切换,然后在下方进行切换学期。\n4. 假如有报错,可能是因为修改过正方教务系统密码而导致课表未能同步,请前往「我的-绑定-正方账号」重新填写正方密码进行绑定操作。\n5. 回到首页自动刷新。\n" }, { - title: '遇到了「用户名或密码错误」', + title: "遇到了「用户名或密码错误」", content: - '请前往「我的-绑定-正方账号」重新填写正方密码进行绑定操作。\n(考试安排等重要信息可以截图保存喔)' + "请前往「我的-绑定-正方账号」重新填写正方密码进行绑定操作。\n(考试安排等重要信息可以截图保存喔)" }, { - title: '关于数据来源的说明', + title: "关于数据来源的说明", content: - '课程表、校园卡余额、借阅信息等数据全部来自正方、容大后勤、图书馆系统,有任何数据错误问题可以直接联系教务处、容大后勤或图书馆。' + "课程表、校园卡余额、借阅信息等数据全部来自正方、容大后勤、图书馆系统,有任何数据错误问题可以直接联系教务处、容大后勤或图书馆。" }, { - title: '校园卡余额为什么没有同步更新', + title: "校园卡余额为什么没有同步更新", content: - '1. 校园卡本身不联网,和线上的数据同步依靠打卡机。但校内有部分打卡机(如校车、移动早餐点)不联网,所以在这些地方刷卡后在网上查询流水是没有记录的,校园卡在接触联网的打卡机后数据会自动同步到线上。\n2. 如果余额和交易数据空白或长期没有更新,可能是因为修改过校园卡密码而导致数据未能同步,请前往「我的-绑定-校园卡」重新填写校园卡密码进行绑定操作。' + "1. 校园卡本身不联网,和线上的数据同步依靠打卡机。但校内有部分打卡机(如校车、移动早餐点)不联网,所以在这些地方刷卡后在网上查询流水是没有记录的,校园卡在接触联网的打卡机后数据会自动同步到线上。\n2. 如果余额和交易数据空白或长期没有更新,可能是因为修改过校园卡密码而导致数据未能同步,请前往「我的-绑定-校园卡」重新填写校园卡密码进行绑定操作。" }, { - title: '遇到「正方服务器出错」请怼教务处', + title: "遇到「正方服务器出错」请怼教务处", content: - '选课:5290019\n资源管理(教室借用):85290020\n教务管理(重考、重修、学生证补办、订火车票、申请旁听课):85290029' + "选课:5290019\n资源管理(教室借用):85290020\n教务管理(重考、重修、学生证补办、订火车票、申请旁听课):85290029" }, { - title: '正方教务系统的密码是什么?', + title: "正方教务系统的密码是什么?", content: - '这个密码到底是什么?就是你们自己的教务系统账号的密码喔~\n选课、查成绩、教学过程评价用的都是正方教务系统这个密码,初始密码是身份证号后六位。\n要是忘记了自己的教务系统密码可以去学院教务处重置哦~\n' + "这个密码到底是什么?就是你们自己的教务系统账号的密码喔~\n选课、查成绩、教学过程评价用的都是正方教务系统这个密码,初始密码是身份证号后六位。\n要是忘记了自己的教务系统密码可以去学院教务处重置哦~\n" }, { - title: '问题紧急请添加反馈 QQ 群', - content: '721519763(三群)' + title: "问题紧急请添加反馈 QQ 群", + content: "721519763(三群)" } ] }; export const helpText = { lessonsTable: - '若课表长时间无法更新或总是刷新失败,可能是因为更改过正方教务系统密码,请前往我的-绑定-重新绑定正方账号。', + "若课表长时间无法更新或总是刷新失败,可能是因为更改过正方教务系统密码,请前往我的-绑定-重新绑定正方账号。", schoolCard: - '若余额或交易记录长时间无法更新或总是刷新失败,可能是因为更改过校园卡密码,请前往我的-绑定-重新绑定校园卡账号。', + "若余额或交易记录长时间无法更新或总是刷新失败,可能是因为更改过校园卡密码,请前往我的-绑定-重新绑定校园卡账号。", bind: { - zf: '1.正方教务系统是什么?\n正方教务系统是你的选课系统哦~\n那么密码就是你的选课密码~\n\n2.忘记密码?\n请找自己的辅导员重置密码。', + zf: "1.正方教务系统是什么?\n正方教务系统是你的选课系统哦~\n那么密码就是你的选课密码~\n\n2.忘记密码?\n请找自己的辅导员重置密码。", library: - '新生图书馆绑定异常——新生需要在接受图书馆培训并通过入馆考试后,才能正常绑定图书馆账号' + "新生图书馆绑定异常——新生需要在接受图书馆培训并通过入馆考试后,才能正常绑定图书馆账号" }, - exam: '丨微精弘的数据全部来源于正方教务系统,如果有误,请向正方教务系统提出更正意见。\n丨考试信息以实际为准,常见考试时长是2h,但也有部分考试时长为1.5h,请大家务必仔细注意考场黑板上的考试时间噢~', + exam: "丨微精弘的数据全部来源于正方教务系统,如果有误,请向正方教务系统提出更正意见。\n丨考试信息以实际为准,常见考试时长是2h,但也有部分考试时长为1.5h,请大家务必仔细注意考场黑板上的考试时间噢~", canteenflow: - '丨食堂计数机制存在误差,且数据有一定延迟,流量指数仅供参考噢 \n丨莫干山校区暂无食堂流量数据,摊手手\n丨祝大家干饭顺利', + "丨食堂计数机制存在误差,且数据有一定延迟,流量指数仅供参考噢 \n丨莫干山校区暂无食堂流量数据,摊手手\n丨祝大家干饭顺利", activtion: - '因微精弘改版更新,老用户需要重新对微精弘账号进行激活操作,重新设置的密码将作为账号新密码,万望理解。如遇长时间加载可退出重试或删除小程序重新进入(如有疑问请加群 721519763 )', + "因微精弘改版更新,老用户需要重新对微精弘账号进行激活操作,重新设置的密码将作为账号新密码,万望理解。如遇长时间加载可退出重试或删除小程序重新进入(如有疑问请加群 721519763 )", score: - '因各学院实际绩点计算标准不一,微精弘绩点算法将特殊科目(包括通识课和体育课)成绩也纳入计算,且缓考、补考、重修、免修的成绩不纳入计算,计算结果仅供参考,数据来源于正方教务系统。' + "因各学院实际绩点计算标准不一,微精弘绩点算法将特殊科目(包括通识课和体育课)成绩也纳入计算,且缓考、补考、重修、免修的成绩不纳入计算,计算结果仅供参考,数据来源于正方教务系统。" }; diff --git a/src/constants/dayScheduleStartTime.ts b/src/constants/dayScheduleStartTime.ts index 3b21c660..b3725eb2 100644 --- a/src/constants/dayScheduleStartTime.ts +++ b/src/constants/dayScheduleStartTime.ts @@ -1,50 +1,20 @@ -export const dayScheduleStartTime = [ - { - hour: 8, - min: 0 - }, - { - hour: 8, - min: 55 - }, - { - hour: 9, - min: 55 - }, - { - hour: 10, - min: 50 - }, - { - hour: 11, - min: 45 - }, - { - hour: 13, - min: 30 - }, - { - hour: 14, - min: 25 - }, - { - hour: 15, - min: 25 - }, - { - hour: 16, - min: 20 - }, - { - hour: 18, - min: 30 - }, - { - hour: 19, - min: 25 - }, - { - hour: 20, - min: 20 - } +interface dayScheduleStartTimeType { + hour: number; + min: number; +} +const dayScheduleStartTime: dayScheduleStartTimeType[] = [ + { hour: 8, min: 0 }, + { hour: 8, min: 55 }, + { hour: 9, min: 55 }, + { hour: 10, min: 50 }, + { hour: 11, min: 45 }, + { hour: 13, min: 30 }, + { hour: 14, min: 25 }, + { hour: 15, min: 25 }, + { hour: 16, min: 20 }, + { hour: 18, min: 30 }, + { hour: 19, min: 25 }, + { hour: 20, min: 20 } ]; + +export { dayScheduleStartTime }; diff --git a/src/constants/freeroomMap.ts b/src/constants/freeroomMap.ts index 51c3250d..ca3ca19e 100644 --- a/src/constants/freeroomMap.ts +++ b/src/constants/freeroomMap.ts @@ -1,23 +1,23 @@ export const freeroomMap = { - 子: '子良楼', - 教: '新教楼', - 文: '文荟楼', - 存: '存中楼', - 博: '博易楼', - 语: '语林楼', - 郁: '郁文楼', - 计: '计算机楼', - 广: '广知楼', - 法: '法学楼', - 仁: '仁和楼', - 健: '健行楼', - 建: '建工楼', - 艺: '艺术楼', - 材: '材料楼', - 食: '食品工程学院楼', - 公: '公共教学楼', - 环: '环境楼', - 高: '高等研究院', - 生: '生物楼', - 协: '协同中心1号楼' + 子: "子良楼", + 教: "新教楼", + 文: "文荟楼", + 存: "存中楼", + 博: "博易楼", + 语: "语林楼", + 郁: "郁文楼", + 计: "计算机楼", + 广: "广知楼", + 法: "法学楼", + 仁: "仁和楼", + 健: "健行楼", + 建: "建工楼", + 艺: "艺术楼", + 材: "材料楼", + 食: "食品工程学院楼", + 公: "公共教学楼", + 环: "环境楼", + 高: "高等研究院", + 生: "生物楼", + 协: "协同中心1号楼" }; diff --git a/src/constants/index.ts b/src/constants/index.ts index c636e670..7ca8d43b 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -1,4 +1,4 @@ -import { dayScheduleStartTime } from './dayScheduleStartTime'; -import { updateInfo } from './updateInfo'; +import { dayScheduleStartTime } from "./dayScheduleStartTime"; +import { updateInfo } from "./updateInfo"; export { dayScheduleStartTime, updateInfo }; diff --git a/src/constants/updateInfo.ts b/src/constants/updateInfo.ts index e336d66a..fc8ef66f 100644 --- a/src/constants/updateInfo.ts +++ b/src/constants/updateInfo.ts @@ -1,12 +1,12 @@ export const updateInfo = { - version: '2.1.5.2', - title: '微精弘更新公告', + version: "2.1.5.2", + title: "微精弘更新公告", content: - '微精弘是工大学生自主开发的小程序,旨在为大家提供更便利的校园生活。近期我们收到微精弘课表出错的相关消息,但调研多位用户后我们未能发现错误数据。\n\n微精弘的课表数据来自正方教务系统,如有出错欢迎加群反馈,希望我们能一起努力让微精弘变得更好!群号:721519763' + "微精弘是工大学生自主开发的小程序,旨在为大家提供更便利的校园生活。近期我们收到微精弘课表出错的相关消息,但调研多位用户后我们未能发现错误数据。\n\n微精弘的课表数据来自正方教务系统,如有出错欢迎加群反馈,希望我们能一起努力让微精弘变得更好!群号:721519763" }; export const questionnaireInfo = { isAccess: false, - appId: 'wxd947200f82267e58', - path: 'pages/wjxqList/wjxqList?activityId=O5QdXK' + appId: "wxd947200f82267e58", + path: "pages/wjxqList/wjxqList?activityId=O5QdXK" }; diff --git a/src/hooks/index.ts b/src/hooks/index.ts new file mode 100644 index 00000000..493b6d1c --- /dev/null +++ b/src/hooks/index.ts @@ -0,0 +1,3 @@ +import useTimeInstance from "./useTimeString"; + +export { useTimeInstance }; diff --git a/src/utils/hooks/useTimeString.ts b/src/hooks/useTimeString.ts similarity index 67% rename from src/utils/hooks/useTimeString.ts rename to src/hooks/useTimeString.ts index a4857f6f..895e3989 100644 --- a/src/utils/hooks/useTimeString.ts +++ b/src/hooks/useTimeString.ts @@ -1,7 +1,7 @@ -import dayjs from 'dayjs'; +import dayjs from "dayjs"; export default function useTimeInstance(hours: number, minutes: number) { const newMinutes = minutes % 60; const newHours = (hours + Math.floor(minutes / 60)) % 24; - return dayjs(`${newHours}:${newMinutes} `, `HH:mm`); + return dayjs(`${newHours}:${newMinutes} `, "HH:mm"); } diff --git a/src/pages/about/index.config.ts b/src/pages/about/index.config.ts index a318565d..6de0f380 100644 --- a/src/pages/about/index.config.ts +++ b/src/pages/about/index.config.ts @@ -1,5 +1,5 @@ export default { - navigationBarTitleText: '关于', - backgroundColor: '#dfdfdf', + navigationBarTitleText: "关于", + backgroundColor: "#dfdfdf", disableScroll: true }; diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue index 24d33fb5..643d4f3e 100644 --- a/src/pages/about/index.vue +++ b/src/pages/about/index.vue @@ -1,16 +1,22 @@ - diff --git a/src/pages/activation/index.config.ts b/src/pages/activation/index.config.ts index 32298b02..2e905282 100644 --- a/src/pages/activation/index.config.ts +++ b/src/pages/activation/index.config.ts @@ -1,5 +1,5 @@ export default { - navigationBarTitleText: '激活', - backgroundColor: '#fff', + navigationBarTitleText: "激活", + backgroundColor: "#fff", disableScroll: true }; diff --git a/src/pages/activation/index.vue b/src/pages/activation/index.vue index 189d907c..8d26c79d 100644 --- a/src/pages/activation/index.vue +++ b/src/pages/activation/index.vue @@ -95,117 +95,104 @@ diff --git a/src/pages/announcement/index.config.ts b/src/pages/announcement/index.config.ts index aeba3517..91aceb8a 100644 --- a/src/pages/announcement/index.config.ts +++ b/src/pages/announcement/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: '食堂流量', - backgroundColor: '#dfdfdf', - navigationStyle: 'custom', + navigationBarTitleText: "食堂流量", + backgroundColor: "#dfdfdf", + navigationStyle: "custom", disableScroll: true }; diff --git a/src/pages/announcement/index.vue b/src/pages/announcement/index.vue index f326dae7..b378de05 100644 --- a/src/pages/announcement/index.vue +++ b/src/pages/announcement/index.vue @@ -1,6 +1,6 @@ - diff --git a/src/pages/bind/index.config.ts b/src/pages/bind/index.config.ts index dde88c0d..47570265 100644 --- a/src/pages/bind/index.config.ts +++ b/src/pages/bind/index.config.ts @@ -1,5 +1,5 @@ export default { - navigationBarTitleText: '信息绑定', - backgroundColor: '#fff', + navigationBarTitleText: "信息绑定", + backgroundColor: "#fff", disableScroll: true }; diff --git a/src/pages/bind/index.scss b/src/pages/bind/index.scss index d5c269fa..05597b18 100644 --- a/src/pages/bind/index.scss +++ b/src/pages/bind/index.scss @@ -1,3 +1,4 @@ +@import '@/style/mixin.scss'; @import '@/style/theme.scss'; .bind-view { diff --git a/src/pages/bind/index.vue b/src/pages/bind/index.vue index 155ed46e..ee1aa5c8 100644 --- a/src/pages/bind/index.vue +++ b/src/pages/bind/index.vue @@ -1,6 +1,6 @@ - diff --git a/src/pages/canteenflow/index.config.ts b/src/pages/canteenflow/index.config.ts index 1c7c70a3..b9c20ac7 100644 --- a/src/pages/canteenflow/index.config.ts +++ b/src/pages/canteenflow/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: '食堂流量', - backgroundColor: '#dfdfdf', + navigationBarTitleText: "食堂流量", + backgroundColor: "#dfdfdf", disableScroll: true, - navigationStyle: 'custom' + navigationStyle: "custom" }; diff --git a/src/pages/canteenflow/index.scss b/src/pages/canteenflow/index.scss index 921e12d8..8c0d515e 100644 --- a/src/pages/canteenflow/index.scss +++ b/src/pages/canteenflow/index.scss @@ -1,4 +1,5 @@ -@import '@/style/theme.scss'; +@import '@/style/mixin.scss'; +@import "@/style/theme.scss"; .background { background-image: url("~@/assets/photos/background-yellow.svg"); diff --git a/src/pages/canteenflow/index.vue b/src/pages/canteenflow/index.vue index eaa6c3fd..1a63e0ed 100644 --- a/src/pages/canteenflow/index.vue +++ b/src/pages/canteenflow/index.vue @@ -1,6 +1,6 @@ - diff --git a/src/pages/connect/faq/index.config.ts b/src/pages/connect/faq/index.config.ts index 05cdd3aa..f302cc51 100644 --- a/src/pages/connect/faq/index.config.ts +++ b/src/pages/connect/faq/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: 'FAQ', - backgroundColor: '#dfdfdf', + navigationBarTitleText: "FAQ", + backgroundColor: "#dfdfdf", disableScroll: true, - navigationStyle: 'custom' + navigationStyle: "custom" }; diff --git a/src/pages/connect/faq/index.vue b/src/pages/connect/faq/index.vue index 7ddd8e1d..e77b78e1 100644 --- a/src/pages/connect/faq/index.vue +++ b/src/pages/connect/faq/index.vue @@ -1,16 +1,23 @@ - diff --git a/src/pages/connect/index.config.ts b/src/pages/connect/index.config.ts index 3dbfe31c..de076dad 100644 --- a/src/pages/connect/index.config.ts +++ b/src/pages/connect/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: '联系与反馈', - backgroundColor: '#dfdfdf', + navigationBarTitleText: "联系与反馈", + backgroundColor: "#dfdfdf", disableScroll: true, - navigationStyle: 'custom' + navigationStyle: "custom" }; diff --git a/src/pages/connect/index.vue b/src/pages/connect/index.vue index cc4ebe51..527c6c9b 100644 --- a/src/pages/connect/index.vue +++ b/src/pages/connect/index.vue @@ -1,7 +1,7 @@ - diff --git a/src/pages/schoolbus/index.config.ts b/src/pages/schoolbus/index.config.ts index 36988ac3..5ca328ab 100644 --- a/src/pages/schoolbus/index.config.ts +++ b/src/pages/schoolbus/index.config.ts @@ -1,5 +1,5 @@ export default { - navigationBarTitleText: '校车', + navigationBarTitleText: "校车", disableScroll: true, - backgroundColor: '#dfdfdf' + backgroundColor: "#dfdfdf" }; diff --git a/src/pages/schoolbus/index.vue b/src/pages/schoolbus/index.vue index 8a25ae8d..bcefa08c 100644 --- a/src/pages/schoolbus/index.vue +++ b/src/pages/schoolbus/index.vue @@ -2,7 +2,9 @@ diff --git a/src/pages/schoolcard/index.config.ts b/src/pages/schoolcard/index.config.ts index 8564767b..e440a25f 100644 --- a/src/pages/schoolcard/index.config.ts +++ b/src/pages/schoolcard/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: '校园卡', + navigationBarTitleText: "校园卡", disableScroll: true, - backgroundColor: '#dfdfdf', - navigationStyle: 'custom' + backgroundColor: "#dfdfdf", + navigationStyle: "custom" }; diff --git a/src/pages/schoolcard/index.vue b/src/pages/schoolcard/index.vue index 11693746..07186239 100644 --- a/src/pages/schoolcard/index.vue +++ b/src/pages/schoolcard/index.vue @@ -1,6 +1,6 @@ - 无消费记录 @@ -96,78 +76,70 @@ diff --git a/src/pages/score/index.config.ts b/src/pages/score/index.config.ts index d20497e6..c71e62af 100644 --- a/src/pages/score/index.config.ts +++ b/src/pages/score/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: '成绩', + navigationBarTitleText: "成绩", disableScroll: true, - backgroundColor: '#dfdfdf', - navigationStyle: 'custom' + backgroundColor: "#dfdfdf", + navigationStyle: "custom" }; diff --git a/src/pages/score/index.vue b/src/pages/score/index.vue index 81d05687..760c6489 100644 --- a/src/pages/score/index.vue +++ b/src/pages/score/index.vue @@ -1,12 +1,9 @@ - + diff --git a/src/pages/setting/index.config.ts b/src/pages/setting/index.config.ts index 45001ac6..7d4ff529 100644 --- a/src/pages/setting/index.config.ts +++ b/src/pages/setting/index.config.ts @@ -1,6 +1,6 @@ export default { - navigationBarTitleText: '设置', + navigationBarTitleText: "设置", disableScroll: true, - backgroundColor: '#dfdfdf', - navigationStyle: 'custom' + backgroundColor: "#dfdfdf", + navigationStyle: "custom" }; diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue index 36584299..19edbced 100644 --- a/src/pages/setting/index.vue +++ b/src/pages/setting/index.vue @@ -1,15 +1,25 @@