带

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

@@ -1,33 +1,4 @@
 <template>
-<<<<<<< HEAD
-    <!-- 卖大厅 -->
-
-    <a-table
-        :columns="columns"
-        class="sellHallTable"
-        :scroll="{ x: '100%', y: 'calc(100vh - 470px)' }"
-        :pagination="false"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :customRow="Rowclick"
-        rowKey="key"
-        :data-source="tableList"
-    >
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
-        </template>
-    </a-table>
-    <component
-        :is="componentId"
-        v-if="componentId"
-        :selectedRow="selectedRow"
-        :enumName="enumName"
-        :buyOrSell="BuyOrSell.sell"
-        :parantSelectedRow="parantSelectedRow"
-        @cancel="closeComponent"
-    ></component>
-=======
   <!-- 卖大厅 -->
   <a-table :columns="columns"
            class="sellHallTable"
@@ -52,7 +23,6 @@
              :buyOrSell="BuyOrSell.sell"
              :parantSelectedRow="parantSelectedRow"
              @cancel="closeComponent"></component>
->>>>>>> 9da7742240d665a65bdcfef615364c3de97ef348
 </template>
 
 <script lang="ts">