解决冲突

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

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
     <!-- 仓单贸易 浮动价挂牌-->
     <div class="warehouse_receipt_trade_floating_price topTableHeight">
         <a-table
@@ -14,32 +13,14 @@
             :data-source="tableList"
         ></a-table>
         <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"></contextMenu>
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
     </div>
-=======
-  <!-- 仓单贸易 浮动价挂牌-->
-  <div class="warehouse_receipt_trade_floating_price">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
->>>>>>> 1dfb44957fac2bbd7eb2be1010fc4e0db8651b33
 </template>
 
 <script lang="ts">