修改终端菜单请求接口bug

config/mobile_menu.json

@@ -1999,5 +1999,85 @@
         "isshow": true,
         "remark": "我的",
         "children": []  
+    },
+    {
+        "code": "client_qhjmine",
+        "title": "仓单贸易",
+        "sort": 24,
+        "type": 1,
+        "rulekey": "client_hnstcdmy",
+        "isshow": true,
+        "remark": "仓单贸易",
+        "children": []  
+    },
+    {
+        "code": "client_hnstcdys",
+        "title": "仓单预售",
+        "sort": 25,
+        "type": 1,
+        "rulekey": "client_qhjmine",
+        "isshow": true,
+        "remark": "仓单预售",
+        "children": []  
+    },
+    {
+        "code": "client_hnsthyjy",
+        "title": "合约交易",
+        "sort": 26,
+        "type": 1,
+        "rulekey": "client_qhjmine",
+        "isshow": true,
+        "remark": "合约交易",
+        "children": []  
+    },
+    {
+        "code": "client_hnstmine",
+        "title": "我的",
+        "sort": 27,
+        "type": 1,
+        "rulekey": "client_qhjmine",
+        "isshow": true,
+        "remark": "我的",
+        "children": []  
+    },
+    {
+        "code": "client_hnstxhcx",
+        "title": "现货查询",
+        "sort": 28,
+        "type": 1,
+        "rulekey": "client_hnstxhcx",
+        "isshow": true,
+        "remark": "现货查询",
+        "children": []  
+    },
+    {
+        "code": "client_hnsthycx",
+        "title": "合约查询",
+        "sort": 29,
+        "type": 1,
+        "rulekey": "client_hnsthycx",
+        "isshow": true,
+        "remark": "合约查询",
+        "children": []  
+    },
+    {
+        "code": "client_hnstlygl",
+        "title": "履约管理",
+        "sort": 30,
+        "type": 1,
+        "rulekey": "client_hnstlygl",
+        "isshow": true,
+        "remark": "履约管理",
+        "children": []  
+    },
+    {
+        "code": "client_hnstcztx",
+        "title": "充值提现",
+        "sort": 31,
+        "type": 1,
+        "rulekey": "client_hnstcztx",
+        "isshow": true,
+        "remark": "充值提现",
+        "children": []  
     }
 ]

config/pc_menu.json

@@ -1,15 +1,818 @@
 [
   {
+    "code": "remark",
+    "title": "",
+    "sort": 1,
+    "type": 1,
+    "rulekey": "",
+    "isshow": false,
+    "url": "",
+    "remark": "type: 1 右侧主菜单或是上半部分tab子菜单； 2：操作按钮；3：tab下方明细；4：底部单据菜单；5：管理端路径；",
+    "children": []
+  },
+  {
+    "code": "bottom",
+    "title": "底部单据菜单",
+    "sort": 1,
+    "type": 4,
+    "rulekey": "client_pc_web_account",
+    "isshow": true,
+    "url": "",
+    "remark": "",
+    "children": [
+      {
+        "code": "spot_warrant",
+        "title": "现货仓单",
+        "sort": 1,
+        "type": 4,
+        "rulekey": "client_pc_web_spot_production_bottom_spot_warrant",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "spot_warrant_spot_summary",
+            "title": "现货汇总",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_summary",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_spot_summary_check",
+                "title": "查看库存",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_check_btn",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_warrant_inventory_summary",
+            "title": "库存汇总",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_inventory_summary",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_inventory_summary_detail",
+                "title": "仓单明细",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_warehouse_detail_btn",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_warrant_spot_details",
+            "title": "现货明细",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_details",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_spot_details_listed",
+                "title": "挂牌",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "spot_warrant_spot_details_pick_up",
+                "title": "提货",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_details_pick_up",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_warrant_pending_order",
+            "title": "挂单",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_pending_order",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_pending_order_cancel_order",
+                "title": "撤单",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_pending_order_cancel_order",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_warrant_deal",
+            "title": "成交",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_deal",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_deal_detail",
+                "title": "详情",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_deal_detail",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_warrant_designated_deal",
+            "title": "指定成交",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_designated_transaction",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_designated_deal_confirm_purchase",
+                "title": "确定购买",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_designated_transaction_confirm_purchase",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "spot_warrant_designated_deal_ignore",
+                "title": "忽略",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_designated_transaction_ignore",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "spot_warrant_designated_deal_resell",
+                "title": "撤销出售",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_designated_transaction_resell",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_warrant_in_and_out_warehouse",
+            "title": "出入库",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_warrant_in_and_out_warehouse_logistics_information",
+                "title": "物流信息",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse_logistics_information",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "spot_warrant_in_and_out_warehouse_revoke",
+                "title": "撤销",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse_revoke",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "code": "pre_sale_warehouse_receipt",
+        "title": "预售仓单",
+        "sort": 1,
+        "type": 4,
+        "rulekey": "client_pc_web_spot_production_bottom_warehouse_receipt",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "pre_sale_warehouse_receipt_order_summary",
+            "title": "订单汇总",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_warehouse_receipt_bottom_order_summary",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "pre_sale_warehouse_receipt_order_summary_listed",
+                "title": "挂牌",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_order_summary_listed",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "pre_sale_warehouse_receipt_pending_order",
+            "title": "挂单",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_warehouse_receipt_bottom_pending_order",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "pre_sale_warehouse_receipt_pending_order_cancel_order",
+                "title": "撤单",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_pending_order_cancel_order",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "pre_sale_warehouse_receipt_deal",
+            "title": "成交",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_warehouse_receipt_bottom_deal",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "pre_sale_warehouse_receipt_deal_detail",
+                "title": "详情",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_deal_detail",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "pre_sale_warehouse_receipt_designated_deal",
+            "title": "指定成交",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_warehouse_receipt_bottom_designated_deal",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "pre_sale_warehouse_receipt_designated_deal_resell",
+                "title": "撤销出售",
+                "sort": 1,
+                "type": 4,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_designated_deal_resell",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "pre_sale_warehouse_receipt_designated_deal_confirm_purchase",
+                "title": "确定购买",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_designated_deal_confirm_purchase",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "pre_sale_warehouse_receipt_designated_deal_ignore",
+                "title": "忽略",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_designated_deal_ignore",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "code": "performance_information",
+        "title": "履约信息",
+        "sort": 1,
+        "type": 4,
+        "rulekey": "client_pc_web_spot_production_bottom_performance",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "performance_information_buy_performance",
+            "title": "买履约",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "performance_information_buy_performance_pay",
+                "title": "付款",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_pay",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_buy_performance_extension",
+                "title": "延期",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_extension",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_buy_performance_breach_contract",
+                "title": "违约",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_breach_contract",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_buy_performance_detail",
+                "title": "详情",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_detail",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "performance_information_sell_performance",
+            "title": "卖履约",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "performance_information_sell_performance_pay",
+                "title": "付款",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_pay",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_sell_performance_extension",
+                "title": "延期",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_extension",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_sell_performance_breach_contract",
+                "title": "违约",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_breach_contract",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_sell_performance_detail",
+                "title": "详情",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_detail",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "code": "funding_information",
+        "title": "资金信息",
+        "sort": 1,
+        "type": 4,
+        "rulekey": "client_pc_web_spot_production_bottom_funding",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "funding_information_funding_summary",
+            "title": "资金汇总",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_funding_bottom_order_funding_summary",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "funding_information_funding_summary_recharge",
+                "title": "充值",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_funding_bottom_order_funding_summary_recharge",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "funding_information_funding_summary_withdraw",
+                "title": "提现",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_funding_bottom_order_funding_summary_withdraw",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "funding_information_funding_log",
+            "title": "资金流水",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_funding_bottom_order_funding_log",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
     "code": "market",
     "title": "市场",
     "sort": 1,
     "type": 1,
     "rulekey": "client_pc_web_market",
-    "isshow": false,
+    "isshow": true,
     "url": "",
     "remark": "",
     "children": [
       {
+        "code": "spot_trade",
+        "title": "现货贸易",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_spot_trading",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "warehouse_receipt_trade",
+            "title": "仓单贸易",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_spot_warehouse_receipt_trade",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "warehouse_receipt_trade_price",
+                "title": "一口价挂牌",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                  {
+                    "code": "warehouse_receipt_trade_price_post_buying",
+                    "title": "发布求购",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out_post_buying",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "warehouse_receipt_trade_price_detail",
+                    "title": "详情",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out_detail",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "warehouse_receipt_trade_price_delisting",
+                    "title": "摘牌",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out_delist",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  }
+                ]
+              },
+              {
+                "code": "warehouse_receipt_trade_floating_price",
+                "title": "浮动价挂牌",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                  {
+                    "code": "warehouse_receipt_trade_floating_price_post_buying",
+                    "title": "发布求购",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price_post_buying",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "warehouse_receipt_trade_floating_price_detail",
+                    "title": "详情",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price_detail",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "warehouse_receipt_trade_floating_price_delisting",
+                    "title": "摘牌",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price_delist",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "code": "warehouse_pre_sale",
+            "title": "仓单预售",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_spot_warehouse_capacity",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "warehouse_pre_sale_price",
+                "title": "一口价预售",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                  {
+                    "code": "capacity_pre_sale_purchase",
+                    "title": "发布求购",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_post_buying",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "capacity_pre_sale_detail",
+                    "title": "详情",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_detail",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "capacity_pre_sale_delisting",
+                    "title": "摘牌",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_delist",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  }
+                ]
+              },
+              {
+                "code": "warehouse_pre_sale_floating_price",
+                "title": "浮动价预售",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                  {
+                    "code": "capacity_pre_sale_purchase",
+                    "title": "发布求购",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_post_buying",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "capacity_pre_sale_detail",
+                    "title": "详情",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_detail",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  },
+                  {
+                    "code": "capacity_pre_sale_delisting",
+                    "title": "摘牌",
+                    "sort": 1,
+                    "type": 2,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_delist",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
         "code": "futures",
         "title": "期货",
         "sort": 1,

models/account.go

@@ -334,10 +334,14 @@ func (r *Arearole) GetAreaRolesByUserID(UserID int) ([]Arearole, error) {
 }
 
 // 获取目标账号的相关角色信息
-func (r *Arearole) GetAreaRoles(UserID int) ([]Arearole, error) {
+func (r *Arearole) GetAreaRoles(UserID int, RoleType int) ([]Arearole, error) {
 	areaRoles := make([]Arearole, 0)
 
-	if err := db.GetEngine().Where("ROLETYPE = 20 and USERID = ?", UserID).Find(&areaRoles); err != nil {
+	session := db.GetEngine().Where("USERID = ?", UserID)
+	if RoleType > 0 {
+		session = session.And("ROLETYPE = ?", RoleType)
+	}
+	if err := session.Find(&areaRoles); err != nil {
 		return nil, err
 	}
 

models/common.go

@@ -832,20 +832,18 @@ func GetErmcpRoleFuncMenuLists(loginID int, resourceCode string) ([]Funcmenulist
 	isTrader := false
 	// 查询机构角色表
 	var arearole Arearole
-	arearoles, err := arearole.GetAreaRoles(int(userAccount.Userid))
+	arearoles, err := arearole.GetAreaRoles(int(userAccount.Userid), 0)
 	if err != nil {
 		return nil, err
 	}
 	for _, v := range arearoles {
 		if v.Roletype == 6 {
 			isTrader = true
-			break
-		}
-	}
-	if len(arearoles) > 0 {
-		arearole = arearoles[0]
-		if arearole.Suborgtype == 0 {
-			isEnterprise = true
+		} else if v.Roletype == 20 {
+			arearole = arearoles[0]
+			if arearole.Suborgtype == 0 {
+				isEnterprise = true
+			}
 		}
 	}