From a6870ddd4f02cccabc76208dd2a3c54b6df2dea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Wed, 13 Nov 2024 23:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/index.ts                         |  38 +++++++++++-------
 src/assets/images/avatar.png                  | Bin 0 -> 4352 bytes
 .../NavBar/components/NavbarRight.vue         |   6 +--
 .../NavBar/components/NavbarRight2.vue        |   2 +-
 src/views/login/index.vue                     |  16 ++++----
 src/views/system/user/index.vue               |   2 +-
 6 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 src/assets/images/avatar.png

diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index a5fe283..8b3bd20 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -7,22 +7,30 @@ class UserAPI {
    */
   static getInfo() {
     return new Promise((resolve)=>{
-      resolve({
-            "userId": 2,
-            "username": "admin",
-            "nickname": "系统管理员",
-            "avatar": "",
-            "roles": [
-                "ADMIN"
-            ],
-            "perms": []
-        })
+      // resolve({
+      //       "userId": 2,
+      //       "username": "admin",
+      //       "nickname": "系统管理员",
+      //       "avatar": "",
+      //       "roles": [
+      //           "ADMIN"
+      //       ],
+      //       "perms": []
+      //   })
+      request<any, UserInfo>({
+        url: "/users/current",
+        method: "get",
+      }).then(res =>{
+        resolve({
+                "userId": res.data.data.user_id,
+                "username": res.data.data.user_name,
+                "nickname": "系统管理员",
+                "avatar": "",
+                "roles": res.data.data.user_role.split(','),
+                "perms": []
+            })
+      });
     })
-    /*
-    return request<any, UserInfo>({
-      url: "/api/v1/users/me",
-      method: "get",
-    });*/
   }
 
   /**
diff --git a/src/assets/images/avatar.png b/src/assets/images/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c38d8bd14e4089ce7d15b1e8451f5d0fae9caaed
GIT binary patch
literal 4352
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

literal 0
HcmV?d00001

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 4d75c6c..a335527 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -22,10 +22,10 @@
     <!-- 用户头像 -->
     <el-dropdown class="setting-item" trigger="click">
       <div class="flex-center h100% p10px">
-        <img
-          :src="userStore.user.avatar + '?imageView2/1/w/80/h/80'"
+        <img src="@/assets/images/avatar.png"
           class="rounded-full mr-10px w24px w24px"
         />
+        <!-- :src="userStore.user.avatar + '?imageView2/1/w/80/h/80'" -->
         <span>{{ userStore.user.username }}</span>
       </div>
       <template #dropdown>
@@ -100,7 +100,7 @@ function resetPassword() {
       return false;
     }
     debugger
-    UserAPI.updatePassword(userStore.user.userId, { password: md5(value) }).then((res) => {
+    UserAPI.updatePassword(userStore.user.userId, { user_password: md5(value) }).then((res) => {
       if (res.data.code == 0) {
         ElMessage.success("密码重置成功，新密码是：" + value);
       } else {
diff --git a/src/layout/components/NavBar/components/NavbarRight2.vue b/src/layout/components/NavBar/components/NavbarRight2.vue
index c49f191..606e558 100644
--- a/src/layout/components/NavBar/components/NavbarRight2.vue
+++ b/src/layout/components/NavBar/components/NavbarRight2.vue
@@ -95,7 +95,7 @@ function resetPassword() {
       return false;
     }
     debugger
-    UserAPI.updatePassword(userStore.user.userId, { password: md5(value) }).then((res) => {
+    UserAPI.updatePassword(userStore.user.userId, { user_password: md5(value) }).then((res) => {
       if (res.data.code == 0) {
         ElMessage.success("密码重置成功，新密码是：" + value);
       } else {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 22ba135..90f4198 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -84,7 +84,7 @@ const { t } = useI18n();
 
 // Reactive states
 const isDark = ref(settingsStore.theme === ThemeEnum.DARK);
-const icpVisible = ref(true);
+const icpVisible = ref(false);
 const loading = ref(false); // 按钮loading
 const isCapslock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
@@ -182,13 +182,13 @@ const toggleTheme = () => {
 };
 
 /** 根据屏幕宽度切换设备模式 */
-watchEffect(() => {
-  if (height.value < 600) {
-    icpVisible.value = false;
-  } else {
-    icpVisible.value = true;
-  }
-});
+// watchEffect(() => {
+//   if (height.value < 600) {
+//     icpVisible.value = false;
+//   } else {
+//     icpVisible.value = true;
+//   }
+// });
 
 /** 检查输入大小写 */
 function checkCapslock(event) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8d56cfc..0eefe6d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -178,7 +178,7 @@ function resetPassword(row) {
       ElMessage.warning("密码至少需要6位字符，请重新输入");
       return false;
     }
-    UserAPI.updatePassword(row.user_id, { password: md5(value) }).then((res) => {
+    UserAPI.updatePassword(row.user_id, { user_password: md5(value) }).then((res) => {
       if (res.data.code == 0) {
         ElMessage.success("密码重置成功，新密码是：" + value);
       } else {