From 8686b47587625909e8a243266421e407fa0e2078 Mon Sep 17 00:00:00 2001
From: Kuizuo <hi@kuizuo.cn>
Date: Fri, 8 Sep 2023 17:20:34 +0800
Subject: [PATCH] pref: enhance sign type tips

---
 app.vue                                      |  6 +++++-
 components/AccountItem.vue                   |  9 +++++----
 components/CodeOrGestureSignModal.client.vue | 17 ++++++++++++++---
 components/Operation.vue                     | 17 +++++++----------
 components/QrCodeSignModal.client.vue        | 14 ++++++++------
 nuxt.config.ts                               |  2 --
 types/account.d.ts                           |  4 +---
 7 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/app.vue b/app.vue
index 0e42465..53caa87 100644
--- a/app.vue
+++ b/app.vue
@@ -5,6 +5,10 @@ import { darkTheme, dateZhCN, lightTheme, zhCN } from 'naive-ui'
 const colorMode = useColorMode()
 const { title, keywords, description } = useAppConfig()
 
+const theme = computed(() => {
+  return colorMode.value === 'system' ? (colorMode.value ? lightTheme : darkTheme) : colorMode.value === 'light' ? lightTheme : darkTheme
+})
+
 const themeColor = ref('#e70012')
 
 const themeOverrides = computed(() => {
@@ -50,7 +54,7 @@ useHead({
 <template>
   <n-config-provider
     :locale="zhCN" :date-locale="dateZhCN"
-    :theme="colorMode.preference === 'dark' ? darkTheme : lightTheme"
+    :theme="theme"
     :theme-overrides="themeOverrides"
     :inline-theme-disabled="true"
   >
diff --git a/components/AccountItem.vue b/components/AccountItem.vue
index cfc6afc..f716f2f 100644
--- a/components/AccountItem.vue
+++ b/components/AccountItem.vue
@@ -37,6 +37,7 @@ async function oneClickSign(uid: string) {
   const QrCodeSignActivity = data.find(item => item.signType === SignTypeEnum.QRCode)?.activity
 
   if (QrCodeSignActivity) {
+    doingActivity.value = QrCodeSignActivity
     ms.warning(`检测到有二维码签到的课程[${QrCodeSignActivity.course?.name}],请扫码`, { duration: 20 * 1000, closable: true })
     showQrCodeModal.value = true
     return
@@ -124,7 +125,7 @@ async function handleUnMonitor() {
           <n-ellipsis class="!max-w-[10ch]">
             {{ info.siteName }}
           </n-ellipsis>
-          <span>{{ info.realname }}</span>
+          <span cllass="text-sm">{{ info.realname }}</span>
           <n-popover v-if="monitor" trigger="hover">
             <template #trigger>
               <n-popconfirm
@@ -211,8 +212,8 @@ async function handleUnMonitor() {
           </n-tooltip>
         </n-space>
       </template>
-      <QrCodeSignModal v-model:show="showQrCodeModal" @success="handleQrCodeSignSuccess" />
-      <CodeOrGestureSignModal v-model:show="showCodeOrGestureModal" :loading="loading" @success="handleCodeOrGestureSignSuccess" />
+      <QrCodeSignModal v-model:show="showQrCodeModal" :title="doingActivity?.course.name" @success="handleQrCodeSignSuccess" />
+      <CodeOrGestureSignModal v-model:show="showCodeOrGestureModal" :activity="doingActivity!" :loading="loading" @success="handleCodeOrGestureSignSuccess" />
       <SignHistory v-model:show="showSignHistory" :uid="uid" />
       <SettingModal v-if="showSettingModal" v-model:show="showSettingModal" :uid="uid" :setting="setting" />
     </n-card>
@@ -223,7 +224,7 @@ async function handleUnMonitor() {
 </template>
 
 <style lang="scss" scoped>
-.icon{
+.icon {
   --at-apply: cursor-pointer transition hover:text-red-4
 }
 
diff --git a/components/CodeOrGestureSignModal.client.vue b/components/CodeOrGestureSignModal.client.vue
index e5508e4..b1116f1 100644
--- a/components/CodeOrGestureSignModal.client.vue
+++ b/components/CodeOrGestureSignModal.client.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
+import { signTypeMap } from '~/constants/cx'
+
 const props = defineProps<{
+  activity: CX.ActivityItem
   loading: boolean
 }>()
 
@@ -7,9 +10,17 @@ const emit = defineEmits<{
   (e: 'success', text: string): void
 }>()
 
-const ms = useMessage()
+console.log('activity', props.activity)
+
 const text = ref('')
 
+const signPlaceholder = computed(() => {
+  return {
+    3: '请输入手势轨迹',
+    5: '请输入签到码',
+  }[props.activity?.otherId]
+})
+
 async function handleCodeSign(text: string) {
   emit('success', text)
 }
@@ -30,7 +41,7 @@ function handleClose() {
     :mask-closable="false"
     preset="card"
     size="large"
-    title="签到码或手势签到"
+    :title="`${activity?.course?.name} | ${signTypeMap?.[activity?.otherId]}`"
     :bordered="false"
     :closable="true"
     :style="{ 'max-width': '360px' }"
@@ -39,7 +50,7 @@ function handleClose() {
     @after-leave="handleClose"
   >
     <n-input-group>
-      <n-input v-model:value="text" placeholder="请输入签到码或手势轨迹" clearable />
+      <n-input v-model:value="text" :placeholder="signPlaceholder" clearable />
       <n-button type="primary" :loading="loading" @click="handleCodeSign(text)">
         签到
       </n-button>
diff --git a/components/Operation.vue b/components/Operation.vue
index 8ce5755..7a28f34 100644
--- a/components/Operation.vue
+++ b/components/Operation.vue
@@ -40,7 +40,7 @@ async function handleSignAll() {
   if (toAccounts.length === 0)
     return logStore.log('请先选择账号', { type: 'warning' })
 
-  logStore.log(`共 ${toAccounts.length} 个账号正在签到`, { type: 'loading' })
+  logStore.log(`共 ${toAccounts.length} 个账号准备签到`, { type: 'loading' })
 
   const data = await Promise.allSettled(
     toAccounts.map((account) => {
@@ -52,8 +52,8 @@ async function handleSignAll() {
 
   // // 如果一键签到中有二维码签到的课程,则弹出二维码扫码签到的弹窗
   const QrCodeSignActivity = oneData.find(item => item.signType === SignTypeEnum.QRCode)?.activity
-
   if (QrCodeSignActivity) {
+    doingActivity.value = QrCodeSignActivity
     ms.warning(`检测到有二维码签到的课程[${QrCodeSignActivity.course?.name}],请扫码`, { duration: 20 * 1000, closable: true })
     showQrCodeModal.value = true
     return
@@ -61,7 +61,6 @@ async function handleSignAll() {
 
   // 检测到签到码签到
   const CodeSignActivity = oneData.find(item => item.signType === SignTypeEnum.Code)?.activity
-
   if (CodeSignActivity) {
     doingActivity.value = CodeSignActivity
     ms.warning(`检测到有签到码签到的课程[${CodeSignActivity.course?.name}],请输入签到码, 如 1234`, { duration: 20 * 1000, closable: true })
@@ -71,15 +70,13 @@ async function handleSignAll() {
 
   // 检测到手势签到
   const GestureSignActivity = oneData.find(item => item.signType === SignTypeEnum.Gesture)?.activity
-
   if (GestureSignActivity) {
     doingActivity.value = GestureSignActivity
     ms.warning(`检测到有手势签到的课程[${GestureSignActivity.course?.name}],请输入手势轨迹, 如 123654789`, { duration: 20 * 1000, closable: true })
     showCodeOrGestureModal.value = true
-    return
   }
 
-  logStore.log(`共 ${toAccounts.length} 个账号签到完成`, { type: 'success' })
+  // logStore.log(`共 ${toAccounts.length} 个账号签到完成`, { type: 'success' })
 }
 
 async function openQrCodeSignModal() {
@@ -94,7 +91,7 @@ async function openQrCodeSignModal() {
 async function handleSuccess(result: string) {
   const toAccounts = unref(selectAccounts)
 
-  logStore.log(`共 ${toAccounts.length} 个账号正在签到`, { type: 'loading' })
+  logStore.log(`共 ${toAccounts.length} 个账号准备签到`, { type: 'loading' })
 
   await Promise.allSettled(
     toAccounts.map((account) => {
@@ -152,13 +149,13 @@ async function handleCodeOrGestureSignSuccess(result: string) {
         全部二维码扫码签到
       </n-tooltip>
     </n-space>
-    <QrCodeSignModal v-model:show="showQrCodeModal" @success="handleSuccess" />
-    <CodeOrGestureSignModal v-model:show="showCodeOrGestureModal" :loading="loading" @success="handleCodeOrGestureSignSuccess" />
+    <QrCodeSignModal v-model:show="showQrCodeModal" :title="doingActivity?.course.name" @success="handleSuccess" />
+    <CodeOrGestureSignModal v-model:show="showCodeOrGestureModal" :activity="doingActivity!" :loading="loading" @success="handleCodeOrGestureSignSuccess" />
   </n-card>
 </template>
 
 <style scoped>
-.icon{
+.icon {
   --at-apply: cursor-pointer transition hover:text-red-4
 }
 </style>
diff --git a/components/QrCodeSignModal.client.vue b/components/QrCodeSignModal.client.vue
index 3191f73..1cacd25 100644
--- a/components/QrCodeSignModal.client.vue
+++ b/components/QrCodeSignModal.client.vue
@@ -23,11 +23,13 @@ export interface BoundingBox {
   left: number
 }
 
-interface Emit {
-  (e: 'success', text: string): void
-}
+const props = defineProps<{
+  title?: string
+}>()
 
-const emit = defineEmits<Emit>()
+const emit = defineEmits<{
+  (e: 'success', text: string): void
+}>()
 
 const ms = useMessage()
 const text = ref('')
@@ -92,7 +94,7 @@ async function onDetect(detectedCodes: DetectedBarcode[]) {
   if (firstCode) {
     const rawValue = firstCode.rawValue
 
-    ms.success('二维码识别成功,正在签到...')
+    ms.success('二维码识别成功,准备签到...')
     text.value = rawValue
     showScan.value = false
 
@@ -131,7 +133,7 @@ watch(text, () => {
     :mask-closable="false"
     preset="card"
     size="large"
-    title="上传二维码图片"
+    :title="title ?? '二维码签到'"
     :bordered="false"
     :closable="true"
     :style="{ 'max-width': '360px' }"
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6d83825..c931939 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -66,8 +66,6 @@ export default defineNuxtConfig({
   ],
   colorMode: {
     classSuffix: '',
-    preference: 'light',
-    fallback: 'light',
   },
   unocss: {
     uno: true,
diff --git a/types/account.d.ts b/types/account.d.ts
index fa288f2..3fd9b8c 100644
--- a/types/account.d.ts
+++ b/types/account.d.ts
@@ -20,9 +20,7 @@ export interface Course extends CX.Course {
   isLoadActivity?: boolean
 }
 
-export interface Activity extends CX.ActivityDetail {
-  result?: string
-}
+export interface Activity extends CX.ActivityItem & CX.Course {}
 
 export interface History {
   id: stringÏ