style update

src/assets/styles/mixin.less

@@ -2117,6 +2117,43 @@ input:-internal-autofill-selected {
             }
         }
     }
+    .condSecondTabTableHalfTop {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc((100vh - 443px)/2 - 13px);
+                max-height: calc((100vh - 443px)/2 - 13px);
+                background: @m-black2;
+            }
+            .ant-table-thead {
+                tr {
+                    th {
+                        background: #10251D;
+                        color: #556772;
+                    }
+                }
+            }
+        }
+    }
+    .halfBottom {
+        .ant-table {
+            .ant-table-thead {
+                tr {
+                    th {
+                        background: #271112;
+                    }
+                }
+            }
+        }
+    }
+    .condSecondTabTableHalfTopNoBottom {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc((100vh - 196px)/2 - 16px);
+                max-height: calc((100vh - 196px)/2 - 16px);
+                background: @m-black2;
+            }
+        }
+    }
 }
 // 买卖大厅表格
 .buyHallTable,.sellHallTable {
@@ -2692,10 +2729,18 @@ input:-internal-autofill-selected {
     .anticon-search {
         color: @m-grey55;
     }
-    .ant-input-group {
-        .ant-input {
-            background: @m-grey53;
+    .ant-input {
+        background: @m-grey53;
+        color: @m-white6;
+        font-size: 14px;
+        font-weight: 400;
+    }
+    .ant-input-suffix {
+        .ant-input-search-icon {
+            display: none;
         }
+    }
+    .ant-input-group {
         .ant-input-group-addon {
             background: @m-grey53;
             .rounded-corners(0, 15px, 15px, 0);
@@ -2721,6 +2766,14 @@ input:-internal-autofill-selected {
     }
 }
 
+.ant-input-search.noSuffixInput {
+    .ant-input-group {
+        .ant-input-group-addon {
+            display: none;
+        }
+    }
+}
+
 .ant-popover.friendPopover {
     .ant-popover-content {
         .ant-popover-inner {

src/common/components/drawer/index.vue

@@ -120,7 +120,11 @@ export default defineComponent({
     }
 }
 .top486 {
+    .position(fixed, 101px, 0, auto, auto);
     width: 486px;
+    height: 450px;
+    background: transparent;
+    z-index: 11;
     .ant-drawer-content-wrapper {
         width: 486px !important;
     }

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/buy/index.vue

@@ -1,41 +1,43 @@
 <template>
-  <!-- 仓单贸易 贸易圈挂牌 买-->
-  <div>
-    <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
-             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <template #index="{ index }">
-        <span>{{ index + 1  }}</span>
-      </template>
-      <!-- 议价 -->
-      <template #canbargain="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 整单 -->
-      <template #canpart="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="filterBtn(firstBtn)"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单贸易 贸易圈挂牌 卖-->
+    <div>
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom', 'halfBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc((100vh- 443px)/2 - 14px)' : 'calc((100vh - 196px)/2 - 16px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <template #index="{ index }">
+                <span>{{ index + 1 }}</span>
+            </template>
+            <!-- 议价 -->
+            <template #canbargain="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 整单 -->
+            <template #canpart="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 挂牌有效期 -->
+            <template #validtime="{ text }">
+                <span>{{ formatTime(text, 'd') }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="filterBtn(firstBtn)"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/index.vue

@@ -1,126 +1,124 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
-  <Drawer :title="'挂牌求购'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top">
-    <div class="post_buying">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌价格"
-                           name="FixedPrice">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.FixedPrice" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.OrderQty" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
+    <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
+    <Drawer :title="'挂牌求购'" :placement="'right'" :visible="visible" @cancel="cancel" class="top">
+        <div class="post_buying">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select
+                                    class="inlineFormSelect"
+                                    style="width: 260px"
+                                    v-model:value="formState.accountid"
+                                    placeholder="请选择"
+                                >
+                                    <a-select-option
+                                        v-for="item in accountList"
+                                        :value="item.accountid"
+                                        :key="item.accountid"
+                                    >{{item.accountid}}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌价格" name="FixedPrice">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.FixedPrice"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量" name="OrderQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.OrderQty"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="起摘数量"
-                           class="relative">
-                <a-input class="commonInput"
-                         :suffix="selectedRow.enumdicname"
-                         :min="selectedRow.minivalue"
-                         style="width: 260px" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金"
-                           class="relative">
-                <a-input class="commonInput"
-                         :suffix="selectedRow.enumdicname"
-                         :min="selectedRow.minivalue"
-                         style="width: 260px" />
-                <span class="input-enumdicname">%</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌有效期"
-                           name="DeliveryMonth">
-                <a-date-picke style="width: 260px"
-                              v-model:value="formState.DeliveryMonth"
-                              :allowClear="false"
-                              class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="起摘数量" class="relative">
+                                <a-input
+                                    class="commonInput"
+                                    :suffix="selectedRow.enumdicname"
+                                    :min="selectedRow.minivalue"
+                                    style="width: 260px"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金" class="relative">
+                                <a-input
+                                    class="commonInput"
+                                    :suffix="selectedRow.enumdicname"
+                                    :min="selectedRow.minivalue"
+                                    style="width: 260px"
+                                />
+                                <span class="input-enumdicname">%</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌有效期" name="DeliveryMonth">
+                                <a-date-picke
+                                    style="width: 260px"
+                                    v-model:value="formState.DeliveryMonth"
+                                    :allowClear="false"
+                                    class="commonDatePicker dialogDatePicker"
+                                />
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="履约方式">
-                <span class="white ml8">选择履约模板</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="指定朋友">
-                <span class="white ml8">选择朋友</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="指定朋友">
-                <span class="white ml8">选择朋友</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌金额">
-                <span class="white ml8">55555</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金">
-                <span class="white ml8">55555</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">55555</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                        <a-col :span="24">
+                            <a-form-item label="履约方式">
+                                <span class="white ml8">选择履约模板</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="指定朋友">
+                                <span class="white ml8">选择朋友</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="指定朋友">
+                                <span class="white ml8">选择朋友</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌金额">
+                                <span class="white ml8">55555</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金">
+                                <span class="white ml8">55555</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">55555</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" @click="submit">买入</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        @click="submit">买入</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/sell/index.vue

@@ -1,41 +1,43 @@
 <template>
-  <!-- 仓单贸易 贸易圈挂牌 买-->
-  <div>
-    <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
-             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <template #index="{ index }">
-        <span>{{ index + 1  }}</span>
-      </template>
-      <!-- 议价 -->
-      <template #canbargain="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 整单 -->
-      <template #canpart="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="filterBtn(firstBtn)"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单贸易 贸易圈挂牌 买-->
+    <div>
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc((100vh- 443px)/2 - 14px)' : 'calc((100vh - 196px)/2 - 16px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <template #index="{ index }">
+                <span>{{ index + 1 }}</span>
+            </template>
+            <!-- 议价 -->
+            <template #canbargain="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 整单 -->
+            <template #canpart="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 挂牌有效期 -->
+            <template #validtime="{ text }">
+                <span>{{ formatTime(text, 'd') }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="filterBtn(firstBtn)"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/buy/index.vue

@@ -1,41 +1,43 @@
 <template>
-  <!-- 仓单贸易 贸易圈挂牌 买-->
-  <div>
-    <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
-             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <template #index="{ index }">
-        <span>{{ index + 1  }}</span>
-      </template>
-      <!-- 议价 -->
-      <template #canbargain="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 整单 -->
-      <template #canpart="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="filterBtn(firstBtn)"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单贸易 贸易圈挂牌 卖-->
+    <div>
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom', 'halfBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc((100vh- 443px)/2 - 14px)' : 'calc((100vh - 196px)/2 - 16px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <template #index="{ index }">
+                <span>{{ index + 1 }}</span>
+            </template>
+            <!-- 议价 -->
+            <template #canbargain="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 整单 -->
+            <template #canpart="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 挂牌有效期 -->
+            <template #validtime="{ text }">
+                <span>{{ formatTime(text, 'd') }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="filterBtn(firstBtn)"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/friend.vue

@@ -1,41 +1,44 @@
 <template>
-  <!--选择朋友-->
-  <Drawer :title="'选择朋友'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top">
-    <a-spin :spinning="loading">
-      <div class="my-friend">
-        <a-input-search placeholder="搜索"
+    <!--选择朋友-->
+    <Drawer :title="'选择朋友'" :placement="'right'" :visible="visible" @cancel="cancel" class="top486">
+        <a-spin :spinning="loading">
+            <div class="listed">
+                <a-form class="inlineForm dialogForm">
+                    <a-input-search
+                        placeholder="搜索朋友编码或名称"
+                        class="searchFriendInput noSuffixInput"
                         enter-button
                         v-model:value="searchValue"
-                        @search="handleSearch" />
-        <div v-for="(item, index) in getViewFriends()"
-             :key="index + '11'">
-          <a-row type="flex">
-            <a-col :span="24">
-              <a-checkbox v-model:checked="item.checked">
-                <span>{{item.frienduserid}} {{ item.friendname }}</span>
-              </a-checkbox>
-            </a-col>
-          </a-row>
-          <a-divider />
-        </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        @click="submit">买入</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </div>
-    </a-spin>
-  </Drawer>
+                        @search="handleSearch"
+                    >
+                        <template #prefix>
+                            <SearchOutlined />
+                        </template>
+                    </a-input-search>
+                    <div class="formBar">
+                        <a-checkbox-group class="commonCheckboxGroup">
+                            <div
+                                class="item"
+                                v-for="(item, index) in getViewFriends()"
+                                :key="index + '11'"
+                            >
+                                <a-checkbox v-model:checked="item.checked">
+                                    <span>{{item.frienduserid}} {{ item.friendname }}</span>
+                                </a-checkbox>
+                            </div>
+                        </a-checkbox-group>
+                    </div>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="fixedBtns">
+                            <a-form-item class="btnCenter">
+                                <a-button class="listedBtn" @click="submit">确定</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </div>
+        </a-spin>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -43,7 +46,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { Des } from '@/common/components/commonDes';
 import { _closeModal } from '@/common/setup/modal/modal';
 import Drawer from '@/common/components/drawer/index.vue';
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
+import { PlusOutlined, MinusOutlined, SearchOutlined } from '@ant-design/icons-vue';
 import { QueryWrFriendApplyRsp } from '@/services/go/wrtrade/interface';
 import { TempWrOrderQuoteDetail } from '@/views/market/spot_trade/components/post_buying/interface';
 import { queryQueryWrFriend } from '@/services/go/wrtrade';
@@ -56,7 +59,7 @@ interface FriendList extends QueryWrFriendApplyRsp {
 export default defineComponent({
     emits: ['cancel', 'update'],
     name: 'warehouse_receipt_trade_blocs_delisting',
-    components: { Des, Drawer, PlusOutlined, MinusOutlined },
+    components: { Des, Drawer, PlusOutlined, MinusOutlined, SearchOutlined },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
@@ -121,5 +124,23 @@ export default defineComponent({
 });
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
+.listed {
+    padding: 18px 20px 0;
+    .formBar {
+        height: calc(100% - 120px);
+        padding: 0 20px 0 13px;
+        margin-top: 16px;
+        background: #08131f;
+        border: 1px solid #10202f;
+        .item {
+            width: 100%;
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #10202f;
+            font-size: 16px;
+            color: #ffffff;
+        }
+    }
+}
 </style>

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/sell/index.vue

@@ -1,41 +1,43 @@
 <template>
-  <!-- 仓单贸易 贸易圈挂牌 买-->
-  <div>
-    <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
-             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <template #index="{ index }">
-        <span>{{ index + 1  }}</span>
-      </template>
-      <!-- 议价 -->
-      <template #canbargain="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 整单 -->
-      <template #canpart="{ text }">
-        <span>{{ text ? '是' : '否' }}</span>
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="filterBtn(firstBtn)"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单贸易 贸易圈挂牌 买-->
+    <div>
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc((100vh- 443px)/2 - 14px)' : 'calc((100vh - 196px)/2 - 16px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <template #index="{ index }">
+                <span>{{ index + 1 }}</span>
+            </template>
+            <!-- 议价 -->
+            <template #canbargain="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 整单 -->
+            <template #canpart="{ text }">
+                <span>{{ text ? '是' : '否' }}</span>
+            </template>
+            <!-- 挂牌有效期 -->
+            <template #validtime="{ text }">
+                <span>{{ formatTime(text, 'd') }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="filterBtn(firstBtn)"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/setting/friends/index.vue

@@ -18,12 +18,12 @@
                         <span>{{item.frienduserid}} {{ item.friendname }}</span>
                     </div>
                     <div class="right" @click="operate(item)">
-                        <!-- <span v-if="item.isfriend">
+                        <span v-if="item.isfriend">
                             <svg class="icon svg-icon" aria-hidden="true">
                                 <use xlink:href="#icon-shanchu" />
                             </svg>
-                        </span>-->
-                        <span class="addFriBtn">加为好友</span>
+                        </span>
+                        <span v-else class="addFriBtn">加为好友</span>
                     </div>
                 </div>
             </div>