Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	src/assets/css/style.scss
#	src/pages/pc/components/Logo.vue
#	src/pages/pc/components/dialog/DictDiglog.vue
#	src/pages/pc/components/list/DictItem.vue
#	src/pages/pc/components/toolbar/index.vue
#	src/pages/pc/index.vue
#	src/pages/pc/practice/practice-article/TypingArticle.vue
#	src/pages/pc/word/WordHome.vue
#	src/router.ts
#	vite.config.ts

src/components/BaseButton.vue

@@ -21,7 +21,7 @@ defineEmits(['click'])
 </script>
 
 <template>
-  <Tooltip :disabled="!keyboard" :title="`快捷键: ${keyboard}`">
+  <Tooltip :disabled="!keyboard" :title="`${keyboard}`">
     <div class="base-button"
          v-bind="$attrs"
          @click="e => (!disabled && !loading) && $emit('click',e)"
@@ -52,8 +52,8 @@ defineEmits(['click'])
 
 .base-button {
   cursor: pointer;
-  border-radius: 6rem;
-  padding: 0 15rem;
+  border-radius: .4rem;
+  padding: 0 1rem;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -61,7 +61,7 @@ defineEmits(['click'])
   //background: #999;
   //background: rgb(60, 63, 65);
   //background: var(--color-second-bg);
-  height: 36rem;
+  height: 2.5rem;
   line-height: 1;
   position: relative;
 
@@ -76,25 +76,25 @@ defineEmits(['click'])
   }
 
   &.small {
-    height: 30rem;
+    height: 2.4rem;
 
     & > span {
-      font-size: 13rem;
+      font-size: .8rem;
     }
   }
 
   &.large {
-    height: 50rem;
-    font-size: 18rem;
-    padding: 0 22rem;
+    height: 3rem;
+    font-size: 1.1rem;
+    padding: 0 1.4rem;
     & > span {
-      font-size: 18rem;
+      font-size: 1.1rem;
     }
   }
 
 
   & > span {
-    font-size: 16rem;
+    font-size: 1rem;
     color: white;
 
     :deep(a) {
@@ -126,11 +126,11 @@ defineEmits(['click'])
 }
 
 .key-notice {
-  margin-left: 10rem;
+  margin-left: .6rem;
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 12rem;
+  font-size: .8rem;
   color: white;
   //gap: 2rem;
 

src/components/Empty.vue

@@ -27,16 +27,16 @@ defineEmits<{
   justify-content: center;
   align-items: center;
   flex-direction: column;
-  font-size: 12rem;
-  gap: 20rem;
+  font-size: .7rem;
+  gap: 1.3rem;
 
   span {
     font-family: var(--font-family);
   }
 
   img {
-    margin-top: -50rem;
-    width: 120rem;
+    margin-top: -3rem;
+    width: 9rem;
   }
 }
 </style>

src/components/icon/Close.vue

@@ -25,6 +25,6 @@ defineProps<{
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 18rem;
+  font-size: 1.1rem;
 }
 </style>

src/components/icon/VolumeIcon.vue

@@ -75,7 +75,7 @@ defineExpose({play})
   display: flex;
   align-items: center;
   justify-content: center;
-  $w: 22rem;
+  $w: 1.6rem;
 
   :deep(svg) {
     width: $w;