Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/Configuration

ERMCP/PCWEB/Menu/cahe.txt

@@ -1,125 +0,0 @@
-      //   {
-      //     "code": "swap_the_order",
-      //     "title": "掉期订单",
-      //     "sort": 1,
-      //     "type": 4,
-      //     "rulekey": "clitent_web_pc_receipt_swap_the_order",
-      //     "isshow": true,
-      //     "url": "",
-      //     "remark": "",
-      //     "children": [
-      //       {
-      //         "code": "swap_commodity_contract_summary",
-      //         "title": "合约汇总",
-      //         "sort": 1,
-      //         "type": 4,
-      //         "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_summary",
-      //         "isshow": true,
-      //         "url": "",
-      //         "remark": "",
-      //         "children": [
-      //           {
-      //             "code": "swap_commodity_contract_summary_deal_closed",
-      //             "title": "协议平仓",
-      //             "sort": 1,
-      //             "type": 2,
-      //             "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_summary_deal_closed",
-      //             "isshow": true,
-      //             "url": "",
-      //             "remark": "",
-      //             "children": []
-      //           },
-      //           {
-      //             "code": "swap_commodity_contract_summary_order_closed",
-      //             "title": "平仓",
-      //             "sort": 1,
-      //             "type": 2,
-      //             "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_summary_order_closed",
-      //             "isshow": true,
-      //             "url": "",
-      //             "remark": "",
-      //             "children": []
-      //           }
-      //         ]
-      //       },
-      //       {
-      //         "code": "swap_commodity_contract_commission",
-      //         "title": "委托",
-      //         "sort": 1,
-      //         "type": 4,
-      //         "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_commission",
-      //         "isshow": true,
-      //         "url": "",
-      //         "remark": "",
-      //         "children": [
-      //           {
-      //             "code": "swap_commodity_contract_commission_cancel_order",
-      //             "title": "撤单",
-      //             "sort": 1,
-      //             "type": 2,
-      //             "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_commission_cancel_order",
-      //             "isshow": true,
-      //             "url": "",
-      //             "remark": "",
-      //             "children": []
-      //           }
-      //         ]
-      //       },
-      //       {
-      //         "code": "swap_commodity_contract_bargain",
-      //         "title": "协议单",
-      //         "sort": 1,
-      //         "type": 4,
-      //         "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_bargain",
-      //         "isshow": true,
-      //         "url": "",
-      //         "remark": "",
-      //         "children": [
-      //           {
-      //             "code": "swap_commodity_contract_bargain_cancel_order",
-      //             "title": "撤单",
-      //             "sort": 1,
-      //             "type": 2,
-      //             "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_bargain_cancel_order",
-      //             "isshow": true,
-      //             "url": "",
-      //             "remark": "",
-      //             "children": []
-      //           },
-      //           {
-      //             "code": "swap_commodity_contract_bargain_submit_order",
-      //             "title": "同意",
-      //             "sort": 1,
-      //             "type": 2,
-      //             "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_bargain_submit_order",
-      //             "isshow": true,
-      //             "url": "",
-      //             "remark": "",
-      //             "children": []
-      //           },
-      //           {
-      //             "code": "swap_commodity_contract_bargain_refuse_order",
-      //             "title": "拒绝",
-      //             "sort": 1,
-      //             "type": 2,
-      //             "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_bargain_refuse_order",
-      //             "isshow": true,
-      //             "url": "",
-      //             "remark": "",
-      //             "children": []
-      //           }
-      //         ]
-      //       },
-      //       {
-      //         "code": "swap_commodity_contract_make_deal",
-      //         "title": "成交",
-      //         "sort": 1,
-      //         "type": 4,
-      //         "rulekey": "clitent_web_pc_receipt_swap_the_order_commodity_contract_make_deal",
-      //         "isshow": true,
-      //         "url": "",
-      //         "remark": "",
-      //         "children": []
-      //       }
-      //     ]
-      //   },

ERMCP/PCWEB/Menu/pc_menu_shangpingdiaoqi.json

@@ -988,7 +988,7 @@
     "children": [
       {
         "code": "spot_trade",
-        "title": "现货贸易",
+        "title": "掉期市场",
         "sort": 1,
         "type": 1,
         "rulekey": "spot_trade",
@@ -997,6 +997,51 @@
         "remark": "",
         "children": [
           {
+            "code": "spot_trade_order_transaction",
+            "title": "掉期市场",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "spot_trade_order_transaction",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_trade_order_transaction_listing_transfer",
+                "title": "挂牌转让",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "spot_trade_order_transaction_listing_transfer",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": []
+              },
+              {
+                "code": "spot_trade_order_transaction_basis_difference",
+                "title": "基差点价",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "spot_trade_order_transaction_basis_difference",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": []
+              },
+              {
+                "code": "spot_trade_order_transaction_swap",
+                "title": "商品掉期",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "spot_trade_order_transaction_swap",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": []
+              }
+            ]
+          },
+          {
             "code": "warehouse_receipt_trade",
             "title": "仓单贸易",
             "sort": 1,
@@ -1249,7 +1294,7 @@
                 "title": "指定挂牌",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "",
+                "rulekey": "warehouse_receipt_trade_designate_ddd",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -1609,51 +1654,6 @@
             ]
           },
           {
-            "code": "spot_trade_order_transaction",
-            "title": "订单交易",
-            "sort": 1,
-            "type": 1,
-            "rulekey": "spot_trade_order_transaction",
-            "isshow": true,
-            "url": "",
-            "remark": "",
-            "children": [
-              {
-                "code": "spot_trade_order_transaction_listing_transfer",
-                "title": "挂牌转让",
-                "sort": 1,
-                "type": 1,
-                "rulekey": "spot_trade_order_transaction_listing_transfer",
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": []
-              },
-              {
-                "code": "spot_trade_order_transaction_basis_difference",
-                "title": "基差点价",
-                "sort": 1,
-                "type": 1,
-                "rulekey": "spot_trade_order_transaction_basis_difference",
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": []
-              },
-              {
-                "code": "spot_trade_order_transaction_swap",
-                "title": "商品掉期",
-                "sort": 1,
-                "type": 1,
-                "rulekey": "spot_trade_order_transaction_swap",
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": []
-              }
-            ]
-          },
-          {
             "code": "spot_trade_reference_market",
             "title": "参考行情",
             "sort": 1,
@@ -1687,55 +1687,55 @@
         "remark": "",
         "children": [
           {
-            "code": "search_spot_warrant",
-            "title": "现货仓单",
+            "code": "search_commodity_contract",
+            "title": "商品合约",
             "sort": 1,
             "type": 1,
-            "rulekey": "search_spot_warrant",
+            "rulekey": "search_commodity_contract",
             "isshow": true,
             "url": "",
             "remark": "",
             "children": [
               {
-                "code": "search_spot_warrant_warehouse_receipt_details",
-                "title": "仓单明细",
+                "code": "search_document_records_contract_summary",
+                "title": "合约汇总",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_spot_warrant_warehouse_receipt_details",
+                "rulekey": "search_document_records_contract_summary",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_spot_warrant_listing_record",
-                "title": "挂牌记录",
+                "code": "search_document_records_commission_record",
+                "title": "委托记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_spot_warrant_listing_record",
+                "rulekey": "search_document_records_commission_record",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_spot_warrant_transaction_record",
+                "code": "search_document_records_transaction_record",
                 "title": "成交记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_spot_warrant_transaction_record",
+                "rulekey": "search_document_records_transaction_record",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_spot_warrant_protocol_specified_record",
-                "title": "协议指定记录",
+                "code": "search_document_records_delivery_record",
+                "title": "交收记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_spot_warrant_protocol_specified_record",
-                "isshow": false,
+                "rulekey": "search_document_records_delivery_record",
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
@@ -1743,54 +1743,54 @@
             ]
           },
           {
-            "code": "search_pre_sale_warehouse_receipt",
-            "title": "预售仓单",
+            "code": "search_spot_warrant",
+            "title": "现货仓单",
             "sort": 1,
             "type": 1,
-            "rulekey": "search_pre_sale_warehouse_receipt",
+            "rulekey": "search_spot_warrant",
             "isshow": true,
             "url": "",
             "remark": "",
             "children": [
               {
-                "code": "search_pre_sale_warehouse_receipt_order_summary",
-                "title": "订单汇总",
+                "code": "search_spot_warrant_warehouse_receipt_details",
+                "title": "仓单明细",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_pre_sale_warehouse_receipt_order_summary",
+                "rulekey": "search_spot_warrant_warehouse_receipt_details",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_pre_sale_warehouse_receipt_commission_record",
-                "title": "委托记录",
+                "code": "search_spot_warrant_listing_record",
+                "title": "挂牌记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_pre_sale_warehouse_receipt_commission_record",
+                "rulekey": "search_spot_warrant_listing_record",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_pre_sale_warehouse_receipt_transaction_record",
+                "code": "search_spot_warrant_transaction_record",
                 "title": "成交记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_pre_sale_warehouse_receipt_transaction_record",
+                "rulekey": "search_spot_warrant_transaction_record",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_pre_sale_warehouse_receipt_protocol_specified_record",
+                "code": "search_spot_warrant_protocol_specified_record",
                 "title": "协议指定记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_pre_sale_warehouse_receipt_protocol_specified_record",
+                "rulekey": "search_spot_warrant_protocol_specified_record",
                 "isshow": false,
                 "url": "",
                 "remark": "",
@@ -1799,55 +1799,55 @@
             ]
           },
           {
-            "code": "search_commodity_contract",
-            "title": "商品合约",
+            "code": "search_pre_sale_warehouse_receipt",
+            "title": "预售仓单",
             "sort": 1,
             "type": 1,
-            "rulekey": "search_commodity_contract",
+            "rulekey": "search_pre_sale_warehouse_receipt",
             "isshow": true,
             "url": "",
             "remark": "",
             "children": [
               {
-                "code": "search_document_records_contract_summary",
-                "title": "合约汇总",
+                "code": "search_pre_sale_warehouse_receipt_order_summary",
+                "title": "订单汇总",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_document_records_contract_summary",
+                "rulekey": "search_pre_sale_warehouse_receipt_order_summary",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_document_records_commission_record",
+                "code": "search_pre_sale_warehouse_receipt_commission_record",
                 "title": "委托记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_document_records_commission_record",
+                "rulekey": "search_pre_sale_warehouse_receipt_commission_record",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_document_records_transaction_record",
+                "code": "search_pre_sale_warehouse_receipt_transaction_record",
                 "title": "成交记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_document_records_transaction_record",
+                "rulekey": "search_pre_sale_warehouse_receipt_transaction_record",
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": []
               },
               {
-                "code": "search_document_records_delivery_record",
-                "title": "交收记录",
+                "code": "search_pre_sale_warehouse_receipt_protocol_specified_record",
+                "title": "协议指定记录",
                 "sort": 1,
                 "type": 1,
-                "rulekey": "search_document_records_delivery_record",
-                "isshow": true,
+                "rulekey": "search_pre_sale_warehouse_receipt_protocol_specified_record",
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": []