1、右上角的登录信息改为优先显示真实姓名

2、修复已知bug

src/views/system/payment/components/paymentEdit.vue

@@ -59,11 +59,11 @@
           />
         </a-form-item>
         <a-form-item label="证书文件 (KEY)" name="apiclientKey" extra="请上传 apiclient_key.pem 文件">
-          <Upload accept=".crt" v-model:value="form.apiclientKey" />
+          <Upload accept=".crt,.pem" v-model:value="form.apiclientKey" />
           {{ form.apiclientKey }}
         </a-form-item>
         <a-form-item label="证书文件 (CERT)" name="apiclientCert" extra="请上传 apiclient_cert.pem 文件">
-          <Upload accept=".crt" v-model:value="form.apiclientCert" />
+          <Upload accept=".crt,.pem" v-model:value="form.apiclientCert" />
           {{ form.apiclientCert }}
         </a-form-item>
         <a-form-item label="商户证书序列号" name="merchantSerialNumber" extra="填写API证书里的证书序列号">
@@ -159,7 +159,7 @@
   const form = reactive<Payment>({
     id: 0,
     name: undefined,
-    type: undefined,
+    type: 1,
     code: '',
     image: '',
     wechatType: 0,
@@ -267,7 +267,7 @@
   const onPayMethod = (value: string, item: any) => {
     form.name = item.label
     form.code = item.value
-    form.type = item.type
+    form.type = item.value
   }
 
   const onUpload = (d: ItemType) => {
@@ -296,6 +296,7 @@
         const formData = {
           ...form
         };
+        console.log(form);
         const saveOrUpdate = isUpdate.value ? updatePayment : addPayment;
         saveOrUpdate(formData)
           .then((msg) => {

src/views/system/user/index.vue

@@ -84,11 +84,16 @@
             <span v-if="hasRole('superAdmin')">{{ record.phone }}</span>
             <span v-else>{{ record.mobile }}</span>
           </template>
-          <template v-else-if="column.key === 'roles'">
+          <template v-if="column.key === 'roles'">
             <a-tag v-for="item in record.roles" :key="item.roleId" color="blue">
               {{ item.roleName }}
             </a-tag>
           </template>
+          <template v-if="column.key === 'platform'">
+            <WechatOutlined v-if="record.platform === 'MP-WEIXIN'" />
+            <Html5Outlined v-if="record.platform === 'H5'" />
+            <ChromeOutlined v-if="record.platform === 'WEB'" />
+          </template>
           <template v-if="column.key === 'balance'">
             <span class="ele-text-success">
               ￥{{ formatNumber(record.balance) }}
@@ -99,13 +104,13 @@
               ￥{{ formatNumber(record.expendMoney) }}
             </span>
           </template>
-          <template v-else-if="column.key === 'isAdmin'">
+          <template v-if="column.key === 'isAdmin'">
             <a-switch
               :checked="record.isAdmin == 1"
               @change="updateIsAdmin(record)"
             />
           </template>
-          <template v-else-if="column.key === 'action'">
+          <template v-if="column.key === 'action'">
             <a-space>
               <a @click="openEdit(record)">修改</a>
               <a-divider type="vertical" />
@@ -146,6 +151,9 @@
     UploadOutlined,
     EditOutlined,
     UserOutlined,
+    Html5Outlined,
+    ChromeOutlined,
+    WechatOutlined,
     ExclamationCircleOutlined
   } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro/es';
@@ -158,13 +166,15 @@
   import UserEdit from './components/user-edit.vue';
   import UserImport from './components/user-import.vue';
   import UserInfo from './components/user-info.vue';
+  import { toDateString } from 'ele-admin-pro';
   import {
     pageUsers,
     removeUser,
     removeUsers,
     updateUserStatus,
-    updateUserPassword, updateUser
-  } from "@/api/system/user";
+    updateUserPassword,
+    updateUser
+  } from '@/api/system/user';
   import type { User, UserParam } from '@/api/system/user/model';
   import { toTreeData, uuid } from 'ele-admin-pro';
   import { listRoles } from '@/api/system/role';
@@ -257,11 +267,6 @@
       align: 'center',
       width: 90
     },
-    {
-      title: '用户名',
-      dataIndex: 'username',
-      showSorterTooltip: false
-    },
     {
       title: '手机号码',
       dataIndex: 'mobile',
@@ -269,56 +274,62 @@
       key: 'mobile',
       showSorterTooltip: false
     },
+    {
+      title: '真实姓名',
+      dataIndex: 'realName',
+      align: 'center',
+      showSorterTooltip: false
+    },
     {
       title: '昵称',
       key: 'nickname',
       align: 'center',
       dataIndex: 'nickname'
     },
-    // {
-    //   title: '客户分组',
-    //   dataIndex: 'type',
-    //   key: 'type',
-    //   align: 'center',
-    //   width: 120,
-    //   customRender: ({ text }) => typeName(text)
-    // },
     {
       title: '性别',
-      dataIndex: 'sexName',
+      dataIndex: 'sex',
       align: 'center',
       showSorterTooltip: false
     },
     {
       title: '邮箱',
       dataIndex: 'email',
+      align: 'center',
       hideInTable: true,
       showSorterTooltip: false
     },
+    {
+      title: '可用余额',
+      dataIndex: 'balance',
+      align: 'center'
+    },
+    {
+      title: '可用积分',
+      dataIndex: 'points',
+      align: 'center',
+      sorter: true
+    },
     {
       title: '实际消费金额',
       dataIndex: 'expendMoney',
       key: 'expendMoney',
       sorter: true,
+      align: 'center',
       hideInTable: true,
       showSorterTooltip: false
     },
-    {
-      title: '可用积分',
-      dataIndex: 'points',
-      hideInTable: true,
-      sorter: true
-    },
     {
       title: '注册来源',
       key: 'platform',
+      align: 'center',
       dataIndex: 'platform',
-      width: 120,
-      customRender: ({ text }) => ['未知', '网站', '小程序', 'APP'][text]
+      width: 120
     },
     {
       title: '证件号码',
       dataIndex: 'idCard',
+      align: 'center',
       hideInTable: true
     },
     {
@@ -365,9 +376,7 @@
       title: '角色',
       dataIndex: 'roles',
       key: 'roles',
-      align: 'center',
-      filterMultiple: false,
-      filters: roles.value
+      align: 'center'
     },
     {
       title: '管理员',
@@ -383,7 +392,7 @@
       sorter: true,
       showSorterTooltip: false,
       ellipsis: true,
-      customRender: ({ text }) => timeAgo(text)
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
     },
     {
       title: '操作',