修改bug

src/layouts/default/header/components/user-dropdown/index.vue

@@ -78,8 +78,9 @@
       const userStore = useUserStore();
       const { createConfirm } = useMessage();
       const getUserInfo = computed(() => {
-        const { nickName = '', avatar, desc } = userStore.getUserInfo || {};
-        return { realName:nickName, avatar: avatar || headerImg, desc };
+        const { head, desc ,agent } = userStore.getUserInfo || {};
+        let realName = agent.name + agent.userName
+        return { realName:realName, avatar: head || headerImg, desc };
       });
 
       const [register, { openModal }] = useModal();

src/locales/lang/en/code.ts

@@ -14,6 +14,7 @@ export default {
     '4014': '必须迁移至相同的类型的相机下面！',
     '4015': '权益类型不存在！',
     '4016': '"权益不存在！',
-    '4017': '权益数量不足！'
+    '4017': '权益数量不足！',
+    '4019': 'sn码不存在！',
   }
 };

src/locales/lang/zh-CN/code.ts

@@ -14,6 +14,7 @@ export default {
     '4014': '必须迁移至相同的类型的相机下面！',
     '4015': '权益类型不存在！',
     '4016': '"权益不存在！',
-    '4017': '权益数量不足！'
+    '4017': '权益数量不足！',
+    '4019': 'sn码不存在！',
   }
 };

src/views/finance/data.tsx

@@ -66,7 +66,7 @@ export const searchForm: Partial<FormProps> = {
   labelWidth: 100,
   schemas: [
     {
-      field: 'giveType',
+      field: 'type',
       label: t('routes.equity.Type'),
       component: 'ApiSelect',
       componentProps: {

src/views/scene/list.vue

@@ -14,7 +14,8 @@
         </template>
 
         <template #href="{ record }">
-          <a v-if="record.sceneName" target="_blank" :href="record.thumb">{{record.sceneName}}</a>
+          <a v-if="record.sceneName && record.thumb" target="_blank" :href="record.thumb">{{record.sceneName}}</a>
+          <span v-else-if="record.sceneName">{{record.sceneName}}</span>
           <span v-else>-</span>
         </template>
         <template #action="{ record }">

src/views/sys/login/LoginForm.vue

@@ -162,9 +162,10 @@
           localStorage.removeItem("password");
           localStorage.removeItem("username");
         }
+        console.log('login',userInfo)
         notification.success({
           message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.nickName}`,
+          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.agent?.name ||userInfo.nickName} ${userInfo.agent?.userName || userInfo.userName}`,
           duration: 3,
         });
       }

types/store.d.ts

@@ -54,6 +54,7 @@ export interface UserInfo {
   username: string;
   realName: string;
   avatar: string;
+  head: string;
   desc?: string;
   homePath?: string;
   roleId: number;