update

src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -71,7 +71,10 @@ export default defineComponent({
     },
     components: {
         BtnList,
-        [ModalEnum.spot_trade_warehouse_delisting]: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_delisting_buy: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_receipt_trade_price_spot_trade_warehouse_delisting_buy: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_pre_sale_price_spot_trade_warehouse_delisting_buy: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_delisting_buy: defineAsyncComponent(() => import('../delisting/index.vue')),
     },
     setup(props, context) {
         const isBottom = getShowBottomValue();

src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -70,7 +70,13 @@ export default defineComponent({
     components: {
         BtnList,
         warehouse_receipt_trade_price_spot_trade_warehouse_delisting_sell: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_delisting_sell: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_pre_sale_price_spot_trade_warehouse_delisting_sell: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_delisting_sell: defineAsyncComponent(() => import('../delisting/index.vue')),
         warehouse_receipt_trade_price_spot_trade_warehouse_financing_delisting_sell: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_financing_delisting: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
+        warehouse_pre_sale_price_spot_spot_trade_warehouse_financing_delisting: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_financing_delisting: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
     },
     setup(props, context) {
         const isBottom = getShowBottomValue();

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -154,8 +154,16 @@ export default defineComponent({
         LeftOutlined,
         DownOutlined,
         LineChartOutlined,
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../detail/index.vue')),
         warehouse_receipt_trade_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../detail/index.vue')),
+        warehouse_pre_sale_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../detail/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../detail/index.vue')),
+
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../post_buying/index.vue')),
         warehouse_receipt_trade_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../post_buying/index.vue')),
+        warehouse_pre_sale_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../post_buying/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../post_buying/index.vue')),
+
         HisChart: defineAsyncComponent(() => import('../history-chart/index.vue')),
         GoodsChart: defineAsyncComponent(() => import('../goods-chart/index.vue')), // 待优化
     },
@@ -195,8 +203,9 @@ export default defineComponent({
         const { componentId, closeComponent, openComponent } = handleModalComponent(queryFn, ref({}));
         const { hasFinacing } = handleFinacing(loading, props.selectedRow.wrfactortypeid);
         function handleBtnList(list: BtnListType[]) {
+            console.log('list', list);
             if (!hasFinacing()) {
-                return list.filter((e) => e.code !== 'spot_trade_warehouse_financing_delisting');
+                return list.filter((e) => e.code !== 'warehouse_receipt_trade_floating_price_spot_trade_warehouse_financing_delisting');
             } else {
                 return list;
             }

src/views/market/spot_trade/setup.ts

@@ -62,9 +62,9 @@ export function handleSpotBtnList(menuType: EnumRouterName) {
         }
 
         // 处理买大厅
-        Object.assign(buyMarket, fn('buy'))
+        Object.assign(buyMarket, fn('buy_hall'))
         // 处理卖大厅
-        Object.assign(sellMarket, fn('sell'))
+        Object.assign(sellMarket, fn('sell_hall'))
     }
     return { firstBtn, buyMarket, sellMarket }
 }

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_floating_price/index.vue

@@ -43,8 +43,8 @@ export default defineComponent({
     components: {
         contextMenu,
         Filter,
-        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
-        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        warehouse_pre_sale_floating_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
         buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_price/index.vue

@@ -40,8 +40,8 @@ export default defineComponent({
     components: {
         contextMenu,
         Filter,
-        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
-        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        warehouse_pre_sale_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        warehouse_pre_sale_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
         buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_floating_price/index.vue

@@ -43,8 +43,8 @@ export default defineComponent({
     components: {
         contextMenu,
         Filter,
-        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
-        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        warehouse_receipt_trade_floating_price_spot_trade_warehouse_post_buying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
         buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },