Merge branch 'develop' of https://gitea.joylink.club/joylink/rtsa-client into develop

src/api/UserApi.ts

@@ -10,10 +10,10 @@ interface RegisterInfo {
   email?: string;
 }
 
-const PasswordSult = '4a6d74126bfd06d69406fcccb7e7d5d9'; // 密码加盐
+//const PasswordSult = '4a6d74126bfd06d69406fcccb7e7d5d9'; // 密码加盐
 function encryptPassword(password: string): string {
   const md5 = new Md5();
-  return md5.appendStr(`${password}${PasswordSult}`).end() as string;
+  return md5.appendStr(password).end() as string;
 }
 
 /**
@@ -152,7 +152,7 @@ export async function userPageQuery(
     userPaging(page: $page, query: $query) {
       total
       items {
-        id username nickname mobile email roles
+        id username nickname mobile email roles createdAt updatedAt
       }
     }
   }

src/pages/UserManage.vue

@@ -17,7 +17,12 @@
     >
       <template v-slot:top-right>
         <div class="q-gutter-md q-mt-none row justify-center items-start">
-          <q-input dense debounce="1000" v-model="filter.username" label="名称" />
+          <q-input
+            dense
+            debounce="1000"
+            v-model="filter.username"
+            label="名称"
+          />
           <q-select
             dense
             v-model="filter.roles"
@@ -76,9 +81,16 @@ onMounted(() => {
 const columnDefs: QTableColumn[] = [
   { name: 'id', label: '用户ID', field: 'id', align: 'center' },
   {
-    name: 'name',
+    name: 'username',
     label: '用户名',
-    field: 'name',
+    field: 'username',
+    required: true,
+    align: 'center',
+  },
+  {
+    name: 'nickname',
+    label: '昵称',
+    field: 'nickname',
     required: true,
     align: 'center',
   },