Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 6ac6ef7765f8543f2f51f1522313fb51a641382e
+  newTag: 447d12dbdee9f99dc061ad6ac4c8d47280fa3f16

src/api/interface/commonType.ts

 import { InterFunction, InterListFunction } from '~/api/interface';
 // 用户登录
 export type BackEndLoginType = InterFunction<
-  { accountNo: string; passWord: string; remember?: boolean },
+  { accountNo?: string; passWord?: string; remember?: boolean },
   {
     token: string;
     userAccountId: number;
     accountNo: string;
-    portType: null;
-    uid: null;
-    phoneNum: null;
-    userName: null;
-    nickName: null;
+    portType: number;
+    uid: string;
+    phoneNum: string;
+    userName: string;
+    nickName: string;
+    companyInfoVO: {
+      id: number;
+      companyType: number;
+      companyName: string;
+      fullName: string;
+      province: string;
+      city: string;
+      district: string;
+      address: string;
+      companyUserName: string;
+      phoneNum: string;
+      remark: string;
+    };
   }
 >;
 // 上传图片

src/api/interface/systemManageType.ts

@@ -31,6 +31,7 @@ export type listBAccountPageType = InterListFunction<
     createTime: string;
     companyAuthStatus: null;
     cooperationTagId: null;
+    companyName: string;
   }
 >;
 // 账号-新增

src/components/layout/index.scss

@@ -151,7 +151,7 @@ $page-background: #f3f6ff;
     .user-content {
       line-height: normal;
       margin-right: 10px;
-      text-align: left;
+      text-align: right;
 
       .user-company {
         font-size: 12px;

src/components/layout/title/index.tsx

@@ -76,8 +76,8 @@ export function TitleView() {
       </div>
       <div className='title-user'>
         <div className='user-content'>
-          <div className='user-company'>科比特</div>
-          <div className='user-name'>{userInfo.accountNo}</div>
+          <div className='user-company'>{userInfo?.companyInfoVO?.companyName}</div>
+          <div className='user-name'>{userInfo?.accountNo}</div>
         </div>
         <Dropdown
           overlayStyle={{ textAlign: 'center' }}

src/pages/common/login/index.tsx

@@ -34,8 +34,8 @@ function LoginView() {
       const { token } = res.result;
       await Cookies.set('SHAREFLY-TOKEN', token);
       // 记住密码
-      Cookies.set('password', values?.passWord);
-      Cookies.set('username', values?.accountNo);
+      Cookies.set('password', values?.passWord || '');
+      Cookies.set('username', values?.accountNo || '');
       Cookies.set('remember', String(values?.remember));
       // 存用户信息
       dispatch(SET_USERINFO(res.result));

src/pages/systemManage/accountManage/index.tsx

@@ -105,7 +105,9 @@ function AccountManageView() {
     {
       title: '所属单位',
       align: 'center',
-      width: '10%',
+      dataIndex: 'companyName',
+      width: '150px',
+      ellipsis: true,
     },
     {
       title: '渠道等级',