更新依赖

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
         "element-plus": "^2.6.1",
-        "hc-vue3-ui": "^3.4.6",
+        "hc-vue3-ui": "^3.4.7",
         "js-base64": "^3.7.7",
         "js-fast-way": "0.4.6",
         "js-md5": "^0.8.3",

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240313174411"
+  "value": "20240314145449"
 }

src/views/login/index.vue

@@ -151,8 +151,8 @@ const formValidateClick = async () => {
     //登录请求
     loading.value = true
     const { error, msg } = await useAppLogin(formValue.value)
-    loading.value = false
     if (error) {
+        loading.value = false
         window?.$message?.error(msg)
         return false
     }
@@ -166,8 +166,6 @@ const formValidateClick = async () => {
             router.push({ path: '/home/index/static' })
         }
     }, 1500)
-
-    loading.value = false
 }
 
 //游客登录

src/views/uni-app/table-form.vue

@@ -47,26 +47,21 @@ onMounted(() => {
 
 //请求授权登录
 const useAppLoginApi = async (form) => {
-    const { error, status, res } = await userLogin(form)
-    if (!error && status === 200) {
-        //设置token和用户信息
-        store.setTokenVal(res['access_token'])
-        store.setRefreshTokenVal(res['refresh_token'])
-        store.setTenantId(res['tenant_id'])
-        store.setUserInfo(res)
-        //设置主题
-        store.setTheme('light')
-        store.setThemeVal('light')
-        //处理其他数据
-        setTimeout(() => {
-            setFormType()
-            isErrorShow.value = false
-        }, 1000)
-    } else {
+    const { error } = await userLogin(form)
+    if (error) {
         formRender()
         isErrorShow.value = true
         postMsg('身份验证异常', 'error')
+        return false
     }
+    //设置主题
+    store.setTheme('light')
+    store.setThemeVal('light')
+    //处理其他数据
+    setTimeout(() => {
+        setFormType()
+        isErrorShow.value = false
+    }, 1000)
 }
 
 const formRender = () => {

yarn.lock

@@ -1366,10 +1366,10 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^3.4.6:
-  version "3.4.6"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.4.6.tgz#d590df95852ece36a94553a08c7290ef3dc19145"
-  integrity sha512-usCu5o5AIkSVoSvQdMt7Eu8lzbNlu4xi9toDUVjLmgU5Hdqo1ACfOWiXoupRaepAM4usavXWqhX4JCPFYa3F6Q==
+hc-vue3-ui@^3.4.7:
+  version "3.4.7"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.4.7.tgz#1955dc75684030a87dd79b7611d1e545ae6a2f99"
+  integrity sha512-lBOkk9tWt1Kw8YxMlAnOIaD10YfdCzjlDdboNUZdwhIxorFxFkyp1XDS1lBl/GaryyZRmUed4lFmnBUYvVxy8Q==
   dependencies:
     axios "^1.6.7"
     dayjs "^1.11.10"