From 14873889f3cc28d55fab38b2a43370c6e5d0b088 Mon Sep 17 00:00:00 2001 From: popWheat <49830650+j10ccc@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:50:44 +0800 Subject: [PATCH] chore(canteen): deprecate canteen flow page (#137) --- src/app.config.ts | 1 - src/constants/copywriting.ts | 2 - src/pages/canteenflow/index.config.ts | 6 -- src/pages/canteenflow/index.scss | 79 ------------------ src/pages/canteenflow/index.vue | 104 ------------------------ src/services/api/apiList.ts | 3 - src/services/index.ts | 2 - src/services/services/canteenService.ts | 8 -- src/store/service/canteen.ts | 14 ---- src/store/service/index.ts | 8 -- 10 files changed, 227 deletions(-) delete mode 100644 src/pages/canteenflow/index.config.ts delete mode 100644 src/pages/canteenflow/index.scss delete mode 100644 src/pages/canteenflow/index.vue delete mode 100644 src/services/services/canteenService.ts delete mode 100644 src/store/service/canteen.ts diff --git a/src/app.config.ts b/src/app.config.ts index 29388c2b..828b5298 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -18,7 +18,6 @@ export default { "pages/connect/faq/index", "pages/lab/index", "pages/freeroom/index", - "pages/canteenflow/index", "pages/announcement/index", "pages/electricity/index", "pages/electricity/record/index", diff --git a/src/constants/copywriting.ts b/src/constants/copywriting.ts index fadc765d..3826659b 100644 --- a/src/constants/copywriting.ts +++ b/src/constants/copywriting.ts @@ -66,8 +66,6 @@ export const helpText = { }, exam: "丨微精弘的数据全部来源于正方教务系统，如果有误，请向正方教务系统提出更正意见。\n丨考试信息以实际为准，常见考试时长是2h，但也有部分考试时长为1.5h，请大家务必仔细注意考场黑板上的考试时间噢～", examCard: "若信息长时间无法更新或总是刷新失败，可能是因为更改过正方教务系统的密码，请前往我的-绑定-重新绑定正方账号。\n丨考试安排中的信息全部来自正方教务系统，数据录入可能会有延迟，请耐心等待。如有疑问请联系教务处，本程序仅作信息展示。\n丨仅展示 近3日 的考试", - canteenflow: - "丨食堂计数机制存在误差，且数据有一定延迟，流量指数仅供参考噢 \n丨莫干山校区暂无食堂流量数据，摊手手\n丨祝大家干饭顺利", activtion: "因微精弘改版更新，老用户需要重新对微精弘账号进行激活操作，重新设置的密码将作为账号新密码，万望理解。如遇长时间加载可退出重试或删除小程序重新进入（如有疑问请加群 721519763 ）", score: diff --git a/src/pages/canteenflow/index.config.ts b/src/pages/canteenflow/index.config.ts deleted file mode 100644 index b9c20ac7..00000000 --- a/src/pages/canteenflow/index.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -export default { - navigationBarTitleText: "食堂流量", - backgroundColor: "#dfdfdf", - disableScroll: true, - navigationStyle: "custom" -}; diff --git a/src/pages/canteenflow/index.scss b/src/pages/canteenflow/index.scss deleted file mode 100644 index 6f5f1d3f..00000000 --- a/src/pages/canteenflow/index.scss +++ /dev/null @@ -1,79 +0,0 @@ -@import '@/style/mixin.scss'; -@import "@/style/theme.scss"; - -.background { - background-image: url("~@/assets/photos/background-yellow.svg"); -} - -.header-view { - height: 200Px; - background-color: var(--wjh-color-yellow-600); - display: flex; - - image { - height: 95%; - margin: auto; - } - - .extra { - position: absolute; - color: var(--wjh-color-white); - right: 16Px; - top: 145Px; - text-align: center; - - .icon-wrapper { - width: 32Px; - height: 32Px; - background-color: var(--wjh-color-background-container); - text-align: center; - border-radius: 50%; - - .extra-icon { - color: var(--wjh-color-yellow-600); - font-size: 1.5rem; - } - } - - .label { - font-size: 0.75rem; - } - } -} - -.canteen-flow-list { - display: flex; - align-items: center; - gap: 16Px; - - .name-wrapper { - @include radius; - display: inline-block; - padding: 0.5rem; - height: 40Px; - width: 40Px; - color: var(--wjh-color-white); - font-size: 1.875rem; - text-align: center; - } - - .col:not(:first-child):not(:last-child) { - flex: 1; - font-size: 0.875rem; - line-height: 1.8rem; - - :last-child { - color: var(--wjh-color-week); - } - } - - .col:first-child { - flex: 0 0 20%; - } - - .col:last-child { - flex: 0 0 20%; - font-size: 1.5rem; - font-weight: var(--wjh-font-weight-medium); - } -} diff --git a/src/pages/canteenflow/index.vue b/src/pages/canteenflow/index.vue deleted file mode 100644 index cb73a507..00000000 --- a/src/pages/canteenflow/index.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - diff --git a/src/services/api/apiList.ts b/src/services/api/apiList.ts index ae0d83b7..aa14dfd1 100644 --- a/src/services/api/apiList.ts +++ b/src/services/api/apiList.ts @@ -41,9 +41,6 @@ const api = { midtermscoreInfo: "/api/func/zf/midtermscore", freeroom: "/api/func/zf/room" }, - canteen: { - flow: "/api/func/canteen/flow" - }, electricity: { balance: "/api/func/electricity/balance", record: "/api/func/electricity/record", diff --git a/src/services/index.ts b/src/services/index.ts index 0b781a1c..7175cbf7 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -2,7 +2,6 @@ import ZFService from "./services/zfService"; import SystemService from "./services/systemService"; import UserService from "./services/userService"; import LibraryService from "./services/libraryService"; -import CanteenService from "./services/canteenService"; import YxyService from "./services/yxyService"; import LostfoundService from "./services/lostfoundService"; import SuitService from "./services/suitService"; @@ -15,7 +14,6 @@ export { SystemService, UserService, LibraryService, - CanteenService, YxyService, LostfoundService, SuitService, diff --git a/src/services/services/canteenService.ts b/src/services/services/canteenService.ts deleted file mode 100644 index 3028757b..00000000 --- a/src/services/services/canteenService.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { api } from "../api/apiList"; -import { updateDateStateWithSession } from "../utils/updateDateState"; - -export default class CanteenService { - static async getCanteenFlow(): Promise { - return updateDateStateWithSession(api.canteen.flow, null, "setCanteenFlow"); - } -} diff --git a/src/store/service/canteen.ts b/src/store/service/canteen.ts deleted file mode 100644 index 16ca35a5..00000000 --- a/src/store/service/canteen.ts +++ /dev/null @@ -1,14 +0,0 @@ -export const CanteenServiceStore = { - state: () => ({ - flow: undefined, - updateTime: { - flow: undefined - } - }), - mutations: { - setCanteenFlow(state: any, value) { - state.flow = value; - state.updateTime.flow = new Date(); - } - } -}; diff --git a/src/store/service/index.ts b/src/store/service/index.ts index 5e5ba08c..6b740170 100644 --- a/src/store/service/index.ts +++ b/src/store/service/index.ts @@ -6,7 +6,6 @@ import { BorrowBooksInfo } from "@/types/BorrowBooksInfo"; import { AnnouncementStore, AnnouncementType } from "./announcement"; import { InformationStore, InformationStoreType } from "./information"; import { AppListItem } from "@/types/AppList"; -import { CanteenServiceStore } from "./canteen"; import { ScoreServiceStore } from "./score"; import { HomeCardServiceStore, HomeCardServiceType } from "./homecard"; import { ElectricityServiceStore } from "./electricity"; @@ -24,12 +23,6 @@ export interface ServiceStoreType { webview: WebviewStoreType; announcement: AnnouncementType; information: InformationStoreType; - canteen: { - flow: any; - updateTime: { - flow: string; - }; - }; electricity: { roomName: string; roomCode: string; @@ -70,7 +63,6 @@ export const ServiceStore = { zf: ZFServiceStore, announcement: AnnouncementStore, information: InformationStore, - canteen: CanteenServiceStore, score: ScoreServiceStore, homecard: HomeCardServiceStore, electricity: ElectricityServiceStore,