Bladeren bron

优化锁屏登录

ahjung 2 jaren geleden
bovenliggende
commit
149b13bf0c
3 gewijzigde bestanden met toevoegingen van 404 en 301 verwijderingen
  1. 5 5
      package.json
  2. 392 291
      pnpm-lock.yaml
  3. 7 5
      src/components/Lockscreen/Lockscreen.vue

+ 5 - 5
package.json

@@ -43,7 +43,7 @@
     "cropperjs": "^1.5.12",
     "dayjs": "^1.11.4",
     "echarts": "^5.3.3",
-    "element-plus": "^2.2.30",
+    "element-plus": "^2.3.5",
     "element-resize-detector": "^1.2.4",
     "lodash-es": "^4.17.21",
     "mockjs": "^1.1.0",
@@ -53,7 +53,7 @@
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
     "qs": "^6.11.0",
-    "vue": "^3.2.45",
+    "vue": "^3.3.4",
     "vue-router": "^4.1.2",
     "vue-types": "^4.1.1",
     "vuedraggable": "^4.1.0",
@@ -71,7 +71,7 @@
     "@typescript-eslint/parser": "^5.30.7",
     "@vitejs/plugin-vue": "^2.3.3",
     "@vitejs/plugin-vue-jsx": "^1.3.10",
-    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/compiler-sfc": "^3.3.4",
     "autoprefixer": "^10.4.7",
     "colors": "^1.4.0",
     "commitizen": "^4.2.5",
@@ -100,10 +100,10 @@
     "stylelint-config-standard": "^25.0.0",
     "stylelint-order": "^5.0.0",
     "stylelint-scss": "^4.3.0",
-    "tailwindcss": "^3.1.6",
+    "tailwindcss": "^3.3.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4",
-    "vite": "^3.2.5",
+    "vite": "^3.2.6",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-mock": "^2.9.6",

File diff suppressed because it is too large
+ 392 - 291
pnpm-lock.yaml


+ 7 - 5
src/components/Lockscreen/Lockscreen.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref, computed } from 'vue';
   import { ResultEnum } from '@/enums/httpEnum';
   import { Recharge } from './index';
   import {
@@ -107,14 +107,16 @@
 
   const { battery, batteryStatus, calcDischargingTime, calcChargingTime } = useBattery();
   const userInfo: object = userStore.getUserInfo || {};
-  const username = userInfo['username'] || '';
+  const username = computed(() => {
+    return userInfo['username'] || '';
+  });
 
   const showLogin = ref(false);
   const loginLoading = ref(false);
   const isLoginError = ref(false);
   const errorMsg = ref('密码错误');
   const loginParams = ref({
-    username: username || '',
+    username: username.value,
     password: '',
   });
 
@@ -131,12 +133,12 @@
       ...loginParams.value,
     };
     loginLoading.value = true;
-    const { code, message } = await userStore.login(params);
+    const { code, msg } = await userStore.login(params);
     if (code === ResultEnum.SUCCESS) {
       onLockLogin(false);
       useLockscreen.setLock(false);
     } else {
-      errorMsg.value = message;
+      errorMsg.value = msg;
       isLoginError.value = true;
     }
     loginLoading.value = false;