Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

config/mobile_menu.json

@@ -2001,7 +2001,7 @@
         "children": []  
     },
     {
-        "code": "client_mobile_qhjmine",
+        "code": "client_mobile_hnstcdmy",
         "title": "仓单贸易",
         "sort": 24,
         "type": 1,
@@ -2015,7 +2015,7 @@
         "title": "仓单预售",
         "sort": 25,
         "type": 1,
-        "rulekey": "client_mobile_qhjmine",
+        "rulekey": "client_mobile_hnstcdys",
         "isshow": true,
         "remark": "仓单预售",
         "children": []  
@@ -2025,7 +2025,7 @@
         "title": "合约交易",
         "sort": 26,
         "type": 1,
-        "rulekey": "client_mobile_qhjmine",
+        "rulekey": "client_mobile_hnsthyjy",
         "isshow": true,
         "remark": "合约交易",
         "children": []  
@@ -2035,7 +2035,7 @@
         "title": "我的",
         "sort": 27,
         "type": 1,
-        "rulekey": "client_mobile_qhjmine",
+        "rulekey": "client_mobile_hnstmine",
         "isshow": true,
         "remark": "我的",
         "children": []  

config/pc_menu.json

@@ -64,18 +64,7 @@
             "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": [
-                ]
-              }
+
             ]
           },
           {
@@ -83,7 +72,7 @@
             "title": "现货明细",
             "sort": 1,
             "type": 4,
-            "rulekey": "client_pc_web_spot_production_bottom_spot_details",
+            "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
             "isshow": true,
             "url": "",
             "remark": "",
@@ -615,7 +604,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "warehouse_receipt_trade_price_post_buying",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -627,7 +616,7 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_price_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -639,15 +628,51 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_price_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out_delist",
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_price_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_price_buy_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_price_sell_hall",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_price_sell_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]
@@ -663,7 +688,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "warehouse_receipt_trade_floating_price_post_buying",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -675,7 +700,7 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_floating_price_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -687,15 +712,51 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_floating_price_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price_delist",
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_floating_price_sell_hall",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_floating_price_sell_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]
@@ -723,7 +784,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "capacity_pre_sale_purchase",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -735,7 +796,7 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -747,15 +808,51 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_delist",
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_sell_hall",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_sell_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]
@@ -771,7 +868,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "capacity_pre_sale_purchase",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -783,7 +880,7 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -795,15 +892,51 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_delist",
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_sell_hall",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_sell_hall_delist",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]