diff --git a/components.d.ts b/components.d.ts index 67e6db8..0d4714a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -19,6 +19,7 @@ declare module 'vue' { IonButton: typeof import('@ionic/vue')['IonButton'] IonCheckbox: typeof import('@ionic/vue')['IonCheckbox'] IonContent: typeof import('@ionic/vue')['IonContent'] + IonDatetime: typeof import('@ionic/vue')['IonDatetime'] IonHeader: typeof import('@ionic/vue')['IonHeader'] IonIcon: typeof import('@ionic/vue')['IonIcon'] IonInfiniteScroll: typeof import('@ionic/vue')['IonInfiniteScroll'] @@ -49,6 +50,7 @@ declare global { const IonButton: typeof import('@ionic/vue')['IonButton'] const IonCheckbox: typeof import('@ionic/vue')['IonCheckbox'] const IonContent: typeof import('@ionic/vue')['IonContent'] + const IonDatetime: typeof import('@ionic/vue')['IonDatetime'] const IonHeader: typeof import('@ionic/vue')['IonHeader'] const IonIcon: typeof import('@ionic/vue')['IonIcon'] const IonInfiniteScroll: typeof import('@ionic/vue')['IonInfiniteScroll'] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b1b7e6..0aaf778 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -52,8 +52,8 @@ catalogs: specifier: 8.0.0 version: 8.0.0 '@capp/eden': - specifier: http://192.168.1.2:9538/api/capp-eden-0.0.4.tgz - version: 0.0.4 + specifier: http://192.168.1.2:9538/api/capp-eden-0.0.5.tgz + version: 0.0.5 '@cloudflare/workers-types': specifier: ^4.20260113.0 version: 4.20260116.0 @@ -298,7 +298,7 @@ importers: version: 8.0.0(@capacitor/core@8.0.0) '@capp/eden': specifier: 'catalog:' - version: http://192.168.1.2:9538/api/capp-eden-0.0.4.tgz(@elysiajs/eden@1.4.6(elysia@1.4.22(@sinclair/typebox@0.34.47)(exact-mirror@0.2.6(@sinclair/typebox@0.34.47))(file-type@21.3.0)(openapi-types@12.1.3)(typescript@5.9.3))) + version: http://192.168.1.2:9538/api/capp-eden-0.0.5.tgz(@elysiajs/eden@1.4.6(elysia@1.4.22(@sinclair/typebox@0.34.47)(exact-mirror@0.2.6(@sinclair/typebox@0.34.47))(file-type@21.3.0)(openapi-types@12.1.3)(typescript@5.9.3))) '@elysiajs/eden': specifier: 'catalog:' version: 1.4.6(elysia@1.4.22(@sinclair/typebox@0.34.47)(exact-mirror@0.2.6(@sinclair/typebox@0.34.47))(file-type@21.3.0)(openapi-types@12.1.3)(typescript@5.9.3)) @@ -1182,9 +1182,9 @@ packages: '@capacitor/synapse@1.0.4': resolution: {integrity: sha512-/C1FUo8/OkKuAT4nCIu/34ny9siNHr9qtFezu4kxm6GY1wNFxrCFWjfYx5C1tUhVGz3fxBABegupkpjXvjCHrw==} - '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.4.tgz': - resolution: {tarball: http://192.168.1.2:9538/api/capp-eden-0.0.4.tgz} - version: 0.0.4 + '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.5.tgz': + resolution: {tarball: http://192.168.1.2:9538/api/capp-eden-0.0.5.tgz} + version: 0.0.5 peerDependencies: '@elysiajs/eden': ^1.4.6 @@ -6903,7 +6903,7 @@ snapshots: '@capacitor/synapse@1.0.4': {} - '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.4.tgz(@elysiajs/eden@1.4.6(elysia@1.4.22(@sinclair/typebox@0.34.47)(exact-mirror@0.2.6(@sinclair/typebox@0.34.47))(file-type@21.3.0)(openapi-types@12.1.3)(typescript@5.9.3)))': + '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.5.tgz(@elysiajs/eden@1.4.6(elysia@1.4.22(@sinclair/typebox@0.34.47)(exact-mirror@0.2.6(@sinclair/typebox@0.34.47))(file-type@21.3.0)(openapi-types@12.1.3)(typescript@5.9.3)))': dependencies: '@elysiajs/eden': 1.4.6(elysia@1.4.22(@sinclair/typebox@0.34.47)(exact-mirror@0.2.6(@sinclair/typebox@0.34.47))(file-type@21.3.0)(openapi-types@12.1.3)(typescript@5.9.3)) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 7c4e369..da2f5a0 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -18,7 +18,7 @@ catalog: '@capacitor/keyboard': 8.0.0 '@capacitor/share': ^8.0.0 '@capacitor/status-bar': 8.0.0 - '@capp/eden': http://192.168.1.2:9538/api/capp-eden-0.0.4.tgz + '@capp/eden': http://192.168.1.2:9538/api/capp-eden-0.0.5.tgz '@cloudflare/workers-types': ^4.20260113.0 '@elysiajs/eden': ^1.4.6 '@faker-js/faker': ^10.2.0 diff --git a/src/dayjs/index.ts b/src/dayjs/index.ts new file mode 100644 index 0000000..1626524 --- /dev/null +++ b/src/dayjs/index.ts @@ -0,0 +1,4 @@ +import dayjs from "dayjs"; +import "dayjs/locale/zh-cn"; + +dayjs.locale("zh-cn"); diff --git a/src/main.ts b/src/main.ts index 0fd18b4..0007199 100644 --- a/src/main.ts +++ b/src/main.ts @@ -6,8 +6,9 @@ import { createApp } from "vue"; import App from "./App.vue"; import { authClient } from "./auth"; import { i18n } from "./locales"; - import { router } from "./router"; + +import "./dayjs"; /* Core CSS required for Ionic components to work properly */ import "@ionic/vue/css/core.css"; /* Basic CSS for apps built with Ionic */ diff --git a/src/router/index.ts b/src/router/index.ts index 3c56912..9829d8c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -40,8 +40,8 @@ const routes: Array = [ ], }, { - path: "/signup", - component: () => import("@/views/signup/index.vue"), + path: "/check_in", + component: () => import("@/views/check_in/index.vue"), }, { path: "/invite", diff --git a/src/views/signup/index.vue b/src/views/check_in/index.vue similarity index 53% rename from src/views/signup/index.vue rename to src/views/check_in/index.vue index 942f211..5d3220e 100644 --- a/src/views/signup/index.vue +++ b/src/views/check_in/index.vue @@ -4,7 +4,7 @@ import dayjs from "dayjs"; import { checkmarkCircleOutline } from "ionicons/icons"; import { client, safeClient } from "@/api"; -const [start, end] = [dayjs().startOf("week"), dayjs().endOf("week")]; +const [start, end] = [dayjs().startOf("month"), dayjs().endOf("month")]; const { data } = await safeClient(client.api.checkIns.get({ query: { startDate: start.toISOString(), @@ -12,23 +12,20 @@ const { data } = await safeClient(client.api.checkIns.get({ }, })); -// 签到信息 -const signupInfo = ref({ - consecutiveDays: 53, - totalDays: 127, - isSignedToday: false, +const { data: current_streak } = await safeClient(client.api.checkIns.current_streak.get()); +const { data: total_count } = await safeClient(client.api.checkIns.total_days.get()); +const { data: today_checkin } = await safeClient(client.api.checkIns.today.get({ query: { timezone: "IANA" } })); + +const checkedInDates = computed(() => { + if (!data.value?.data) + return new Set(); + return new Set(data.value.data.map(item => dayjs(item.checkInAt).format("YYYY-MM-DD"))); }); -// 签到记录（最近7天） -const recentSignup = ref([ - { day: "周一", date: "01-13", signed: true }, - { day: "周二", date: "01-14", signed: true }, - { day: "周三", date: "01-15", signed: true }, - { day: "周四", date: "01-16", signed: true }, - { day: "周五", date: "01-17", signed: false }, - { day: "周六", date: "01-18", signed: false }, - { day: "周日", date: "01-19", signed: false }, -]); +function isCheckedIn(day: number) { + const dateStr = dayjs().year(start.year()).month(start.month()).date(day).format("YYYY-MM-DD"); + return checkedInDates.value.has(dateStr); +} async function handleSignup() { await safeClient(client.api.checkIns.post()); @@ -75,7 +72,7 @@ async function handleSignup() { 连续签到
- {{ signupInfo.consecutiveDays }} + {{ current_streak?.currentStreakDays }}
天 @@ -86,7 +83,7 @@ async function handleSignup() { 累计签到
- {{ signupInfo.totalDays }} + {{ total_count?.totalDays }}
天 @@ -97,77 +94,76 @@ async function handleSignup() { - {{ signupInfo.isSignedToday ? '今日已签到' : '立即签到' }} + {{ today_checkin?.checkedInToday ? '今日已签到' : '立即签到' }}
-
- 本周签到 + {{ dayjs().format('YYYY年MM月') }} 签到日历
-
+ +
+ {{ weekday }} +
+
+ + +
+ +
+ + +
- - {{ day.date.split('-')[1] }} + {{ day }}
- {{ day.day }} -
-
-
-
- - -
-
-
- -
- 签到奖励
-
-
-
-
- 连续签到7天 -
- +10积分 + +
+
+
+ 已签到
-
-
-
- 连续签到30天 -
- +50积分 +
+
+ 今天
-
-
-
- 连续签到60天 -
- +100积分 +
+
+ 未签到
@@ -192,14 +188,7 @@ async function handleSignup() { .card { background: linear-gradient(180deg, #ffeef1, #ffffff 15%); } - -.signup-btn::part(native) { - font-weight: 700; -} - -.signup-btn:disabled { - --background: rgba(255, 255, 255, 0.5); - --color: rgba(255, 255, 255, 0.8); - opacity: 0.6; +ion-datetime { + --background: transparent; } diff --git a/src/views/home/index.ts b/src/views/home/index.ts index 96dfc34..827b83f 100644 --- a/src/views/home/index.ts +++ b/src/views/home/index.ts @@ -1,7 +1,7 @@ import { calendarOutline, chatbubblesOutline, peopleOutline, rocketOutline } from "ionicons/icons"; export const actions = [ - { id: "signup", name: "签到", icon: calendarOutline, color: "#c32120" }, + { id: "check_in", name: "签到", icon: calendarOutline, color: "#c32120" }, { id: "team", name: "团队中心", icon: peopleOutline, color: "#c32120" }, { id: "invite", name: "邀请好友", icon: rocketOutline, color: "#c32120" }, { id: "support", name: "在线客服", icon: chatbubblesOutline, color: "#c32120" }, diff --git a/src/views/home/index.vue b/src/views/home/index.vue index fff379e..efc33a5 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -37,8 +37,8 @@ async function handleInfinite(event: InfiniteScrollCustomEvent) { } function handleQuickAction(action: Action) { switch (action.id) { - case "signup": - router.push("/signup"); + case "check_in": + router.push("/check_in"); break; case "team": console.log("团队中心");