提交代码

src/api/user/index.ts

@@ -7,22 +7,30 @@ class UserAPI {
    */
   static getInfo() {
     return new Promise((resolve)=>{
-      resolve({
+      // resolve({
-            "userId": 2,
+      //       "userId": 2,
-            "username": "admin",
+      //       "username": "admin",
-            "nickname": "系统管理员",
+      //       "nickname": "系统管理员",
-            "avatar": "",
+      //       "avatar": "",
-            "roles": [
+      //       "roles": [
-                "ADMIN"
+      //           "ADMIN"
-            ],
+      //       ],
-            "perms": []
+      //       "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",
-    });*/
   }
 
   /**

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
+        <img src="@/assets/images/avatar.png"
-          :src="userStore.user.avatar + '?imageView2/1/w/80/h/80'"
           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 {

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 {

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(() => {
+// watchEffect(() => {
-  if (height.value < 600) {
+//   if (height.value < 600) {
-    icpVisible.value = false;
+//     icpVisible.value = false;
-  } else {
+//   } else {
-    icpVisible.value = true;
+//     icpVisible.value = true;
-  }
+//   }
-});
+// });
 
 /** 检查输入大小写 */
 function checkCapslock(event) {

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 {