Merge remote-tracking branch 'origin/master'

src/layout/components/top.vue

@@ -163,10 +163,13 @@ export default defineComponent({
         .inlineflex;
         border-bottom: 1px solid @m-black2;
         .m-layout-left {
-            height: 100%;
+            height: calc(100vh - 40px);
             background: @m-black4;
+            overflow: hidden;
             .ant-layout-sider-children {
-                ul.ant-menu.ant-menu-inline {
+                ul.ant-menu.ant-menu-inline.left-menu {
+                    height: calc(100vh - 80px);
+                    overflow-y: auto;
                     li.ant-menu-submenu {
                         padding-bottom: 0;
                         .ant-menu-submenu-title {

src/services/go/ermcp/account/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 账户管理 ================================**/
 import APP from "@/services";
-import {commonSearch_go} from "@/services/go";
+import { commonSearch_go } from "@/services/go";
 import {
     ErmcpBizGroupEx,
     ErmcpBizGroupReq,
@@ -24,7 +24,7 @@ export function QueryAccMgrBizGroupSet(req: ErmcpBizGroupReq): Promise<ErmcpBizG
  * 查询账户管理期货账号(账户管理/期货账号)  /Ermcp/QueryAccMgrTaaccount
  * @constructor
  */
-export function QueryAccMgrTaaccount(): Promise<ErmcpTaAccountEx>{
+export function QueryAccMgrTaaccount(): Promise<ErmcpTaAccountEx> {
     const userid = APP.get('userAccount').memberuserid;
     return commonSearch_go('/Ermcp/QueryAccMgrTaaccount', { userid }).catch((err) => {
         throw new Error(`查询账户管理期货账号: ${err.message}`);
@@ -38,7 +38,7 @@ export function QueryAccMgrTaaccount(): Promise<ErmcpTaAccountEx>{
  * @param querytype 查询类型 1-业务账户 2-交易账户 3-管理账户
  * @constructor
  */
-export function QueryAccMgrLoginUser(querytype: number): Promise<ErmcpLoginUserEx>{
+export function QueryAccMgrLoginUser(querytype: number): Promise<ErmcpLoginUserEx[]> {
     const userid = APP.get('userAccount').memberuserid;
     return commonSearch_go('/Ermcp/QueryAccMgrLoginUser', { userid, querytype }).catch((err) => {
         throw new Error(`查询账户管理登录账号: ${err.message}`);

src/views/information/spot-contract/components/check/setup.ts

@@ -0,0 +1,18 @@
+// import {  QueryAccMgrLoginUser }  from '@/services/go/ermcp/account'
+
+export function handleAccountManager() {
+    // function getList(arr) {
+    //     arr.forEach(el => {
+
+    //     });
+    // }
+    // QueryAccMgrLoginUser(1).then(res => {
+    //     const map = new Set<number>([])
+    //     res.forEach(e => {
+
+    //     })
+    //     if (res.length) {
+
+    //     }
+    // })
+}