From b470f116088523eae4d70e6cb21ee0d6e01dc756 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 22 Apr 2025 11:24:23 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login/index.vue | 106 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 26 deletions(-)

diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index afa27ba..c439743 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -7,6 +7,7 @@ import { getServerInfo } from '@/utils/getServerInfo.ts'
 import router from '@/router/router.ts'
 import { isBoardParamInited, login } from '@/services'
 import circleUrl from '@/assets/avatar.png'
+import { eMessage } from '@/pages/Index/utils'
 
 const stateUrl = getServerInfo('/api/v1/app/ws/state')
 const wsState = createWebSocket(stateUrl.wsUrl)
@@ -59,21 +60,14 @@ const inputPin = (pin: string) => {
   }
 }
 
-const errorMsg = ref('')
+
+const passwordError = ref(false)
 
 const submitPin = async () => {
-  if (!activeUser.value?.id) {
-    errorMsg.value = '请选择用户'
-    return
-  }
-  if (password.value.length !== 4) {
-    errorMsg.value = '请输入密码'
-    return
-  }
   let resData = await isBoardParamInited()
   if (!resData.data) {
     //设备正在初始化
-    errorMsg.value = '设备正在初始化，请稍候重试'
+    eMessage.error('设备正在初始化，请稍候重试')
     return
   }
   const params = {
@@ -85,15 +79,27 @@ const submitPin = async () => {
     sessionStorage.setItem('token', JSON.stringify(res.data))
     await router.push('/index')
   } else {
-    errorMsg.value = res.info
-    // password.value = ''
+    passwordError.value = true // 触发抖动动画
+    // 动画结束后重置状态（2次抖动共0.6秒）
+    setTimeout(() => {
+      passwordError.value = false
+    }, 600)
+    password.value = ''
   }
 }
+
+const showPassword = ref(false)
+const  next = () => {
+  showPassword.value = true
+}
+const  back = () => {
+  showPassword.value = false
+}
 </script>
 <template>
   <div class="login-box">
     <p class="login-title">登录</p>
-    <div class="user-box">
+    <div class="user-box" v-if="!showPassword">
       <p class="title">选择用户</p>
       <div class="user-list">
         <div class="user-info" v-for="user in userList" :key="user.id" @click="activeUser = user" :class="{ 'user-info-active': activeUser?.id === user.id }">
@@ -102,11 +108,15 @@ const submitPin = async () => {
           <el-icon v-show="activeUser?.id === user.id" color="#fff"><Select /></el-icon>
         </div>
       </div>
+      <div class="next-box" :class="{'next-box-active': activeUser?.id}" @click="next">
+        <el-icon><Right /></el-icon>
+      </div>
     </div>
-    <div class="password-box">
+
+    <div class="password-box" v-else>
       <p class="title">请输入4位PIN码</p>
       <div class="password-list">
-        <div v-for="i in 4" :key="i" class="password-item" :class="{'password-item-fill': i <= password.length}"></div>
+        <div v-for="i in 4" :key="i" class="password-item" :class="{'password-item-fill': i <= password.length, 'password-error': passwordError}"></div>
       </div>
       <div class="pin-keypad">
         <div
@@ -117,11 +127,12 @@ const submitPin = async () => {
         >
           {{ n }}
         </div>
-        <div class="key" @click="password = '';errorMsg = ''">重输</div>
+        <div></div>
         <div class="key" @click="inputPin('0')">0</div>
-        <div class="key" @click="submitPin">确定</div>
       </div>
-      <div class="error-box">{{errorMsg}}</div>
+      <div class="next-box next-box-active" @click="back">
+        <el-icon><Back /></el-icon>
+      </div>
     </div>
   </div>
 
@@ -131,6 +142,25 @@ const submitPin = async () => {
   0% { transform: scale(0.8); opacity: 0; }
   100% { transform: scale(1); opacity: 1; }
 }
+
+@keyframes shake {
+  0%, 100% {
+    transform: translateX(0);
+    opacity: 1;
+  }
+  25% {
+    transform: translateX(-10px);
+    opacity: 0.7;
+  }
+  50% {
+    transform: translateX(10px);
+    opacity: 0.7;
+  }
+  75% {
+    transform: translateX(-7px);
+    opacity: 0.7;
+  }
+}
 .login-title {
   position: absolute;
   top: 10%;
@@ -146,14 +176,14 @@ const submitPin = async () => {
   justify-content: center;
   position: relative;
   .user-box {
-    width: 35%;
-    height: 40%;
-    margin-right: 20px;
+    width: 50%;
+    height: 50%;
     background: #fff;
     border-radius: 30px;
-    padding: 60px 30px;
+    padding: 40px 30px;
     display: flex;
     flex-direction: column;
+    align-items: center;
     .user-list {
       width: 100%;
       flex: 1;
@@ -182,14 +212,15 @@ const submitPin = async () => {
     }
   }
   .password-box {
-    margin-left: 20px;
-    width: 35%;
-    height: 40%;
+    width: 50%;
+    height: 50%;
     background: #fff;
     border-radius: 30px;
-    padding: 60px 30px;
+    padding: 40px 30px;
     display: flex;
     flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
   }
 }
 .title {
@@ -245,4 +276,27 @@ const submitPin = async () => {
   font-size: 20px;
   color: #ff0000;
 }
+.password-error {
+  animation: shake 0.3s ease-in-out 2;
+}
+.next-box {
+  width: 80px;
+  height: 80px;
+  border-radius: 50%;
+  background: #ddd;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 20px auto;
+  .el-icon {
+    font-size: 30px;
+    color: #bbb
+  }
+}
+.next-box-active {
+  background: #3E8ED1;
+  .el-icon {
+    color: #fff;
+  }
+}
 </style>
\ No newline at end of file

From c594b03736c3ff9f9b5c86608d97fe4210397256 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 22 Apr 2025 11:28:55 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login/index.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index c439743..2889288 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -114,6 +114,10 @@ const  back = () => {
     </div>
 
     <div class="password-box" v-else>
+      <div class="user-info user-info-active">
+        <el-avatar :size="40" :src="circleUrl" />
+        <span class="name">{{activeUser!.account}}</span>
+      </div>
       <p class="title">请输入4位PIN码</p>
       <div class="password-list">
         <div v-for="i in 4" :key="i" class="password-item" :class="{'password-item-fill': i <= password.length, 'password-error': passwordError}"></div>
@@ -221,6 +225,21 @@ const  back = () => {
     flex-direction: column;
     align-items: center;
     justify-content: space-between;
+    .user-info {
+      width: 50%;
+      padding: 10px 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 20px;
+      background: #3E8ED1;
+      color: #fff;
+      .name {
+        margin-left: 30px;
+        font-size: 25px;
+        font-weight: bold;
+      }
+    }
   }
 }
 .title {

From 7efcc2d2b87a59a9fc2a294ca3e16aa39bb1f303 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 22 Apr 2025 11:34:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login/index.vue | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index 2889288..53589cb 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -98,7 +98,7 @@ const  back = () => {
 </script>
 <template>
   <div class="login-box">
-    <p class="login-title">登录</p>
+    <transition name="flip-card" mode="out-in">
     <div class="user-box" v-if="!showPassword">
       <p class="title">选择用户</p>
       <div class="user-list">
@@ -138,6 +138,7 @@ const  back = () => {
         <el-icon><Back /></el-icon>
       </div>
     </div>
+    </transition>
   </div>
 
 </template>
@@ -172,6 +173,7 @@ const  back = () => {
   font-weight: bold;
 }
 .login-box {
+  perspective: 1000px;
   width: 100%;
   height: 100%;
   background: #A0CEF2;
@@ -318,4 +320,42 @@ const  back = () => {
     color: #fff;
   }
 }
+
+
+.flip-card-leave-active,
+.flip-card-enter-active {
+  transition: all 0.5s ease;
+  backface-visibility: hidden; /* 隐藏背面 */
+}
+
+.flip-card-enter-from,
+.flip-card-leave-to {
+  transform: rotateY(90deg);
+  opacity: 0;
+}
+
+.flip-card-enter-active .user-box,
+.flip-card-leave-active .user-box,
+.flip-card-enter-active .password-box,
+.flip-card-leave-active .password-box {
+  position: absolute;
+  backface-visibility: hidden;
+  transition: transform 0.5s ease;
+}
+
+.flip-card-enter .user-box {
+  transform: rotateY(-90deg);
+}
+
+.flip-card-leave-to .user-box {
+  transform: rotateY(90deg);
+}
+
+.flip-card-enter .password-box {
+  transform: rotateY(90deg);
+}
+
+.flip-card-leave-to .password-box {
+  transform: rotateY(-90deg);
+}
 </style>
\ No newline at end of file

From f5214ed78344d52f5b812d49c11bbbd46754935a Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 22 Apr 2025 11:44:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E7=89=88=E6=9C=AC=E5=8F=B7=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=92=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 increment-version.js      | 23 +++++++++++++++++++++++
 package.json              |  8 ++++++--
 src/pages/Login/index.vue |  8 ++++++++
 src/vite-env.d.ts         |  1 +
 vite.config.ts            |  4 ++++
 5 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 increment-version.js

diff --git a/increment-version.js b/increment-version.js
new file mode 100644
index 0000000..3239813
--- /dev/null
+++ b/increment-version.js
@@ -0,0 +1,23 @@
+import fs from 'node:fs'
+import path, { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import semver from 'semver'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+const packagePath = path.resolve(__dirname, 'package.json')
+const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf-8'))
+
+// 读取命令行参数（默认使用 'patch'）
+const versionType = process.argv[2] || 'patch'
+
+// 递增版本
+const newVersion = semver.inc(packageJson.version, versionType)
+if (!newVersion) {
+  throw new Error(`Invalid version type: ${versionType}`)
+}
+
+packageJson.version = newVersion
+fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2))
+console.log(`Version updated to: ${newVersion}`)
diff --git a/package.json b/package.json
index ae3f7ff..026215f 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,14 @@
 {
   "name": "a8000-plus",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc -b && vite build",
+    "build:patch": "node increment-version.js patch && vite build",
+    "build:minor": "node increment-version.js minor && vite build",
+    "build:major": "node increment-version.js major && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -25,6 +28,7 @@
     "ramda": "^0.30.1",
     "rxjs": "^7.8.1",
     "sass": "^1.79.5",
+    "semver": "^7.7.1",
     "simple-keyboard": "^3.8.17",
     "simple-keyboard-layouts": "^3.4.41",
     "vue": "^3.5.10",
@@ -56,4 +60,4 @@
     "vite": "^5.4.11",
     "vue-tsc": "^2.1.6"
   }
-}
+}
\ No newline at end of file
diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index 53589cb..27af65f 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -95,6 +95,8 @@ const  next = () => {
 const  back = () => {
   showPassword.value = false
 }
+
+const version = __APP_VERSION__
 </script>
 <template>
   <div class="login-box">
@@ -139,6 +141,7 @@ const  back = () => {
       </div>
     </div>
     </transition>
+    <div class="version">版本号：v {{version}}</div>
   </div>
 
 </template>
@@ -358,4 +361,9 @@ const  back = () => {
 .flip-card-leave-to .password-box {
   transform: rotateY(-90deg);
 }
+.version {
+  position: absolute;
+  bottom: 10px;
+  color: rgba(0,0,0,0.25);
+}
 </style>
\ No newline at end of file
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 11f02fe..85b9599 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -1 +1,2 @@
 /// <reference types="vite/client" />
+declare const __APP_VERSION__: string;
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index e47006a..96ecea7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,9 +4,13 @@ import { fileURLToPath, URL } from 'url'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+import packageJson from './package.json'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  define: {
+    __APP_VERSION__: JSON.stringify(packageJson.version),
+  },
   base: './',
   plugins: [
     vue(),