Merge remote-tracking branch 'origin/master'

src/assets/styles/mixin.less

@@ -1802,6 +1802,10 @@ input:-internal-autofill-selected {
         .ant-btn+.ant-btn {
             margin-left: 10px;
         }
+        .btn-list {
+            position: absolute;
+            right: 10px;
+        }
     }
 }
 // 买卖大厅表格
@@ -1811,6 +1815,9 @@ input:-internal-autofill-selected {
         table {
             border: 0;
         }
+        .ant-table-content {
+            background: rgba(@m-red1, .1) !important;
+        }
         .ant-table-thead {
             tr {
                 box-shadow: 0px 1px 0px 0px #2E3539;
@@ -1827,6 +1834,9 @@ input:-internal-autofill-selected {
                     text-overflow: ellipsis;
                     overflow: hidden;
                 }
+                th:first-child {
+                    display: none;
+                }
             }
         }
         .ant-table-tbody {
@@ -1843,10 +1853,13 @@ input:-internal-autofill-selected {
                     text-overflow: ellipsis;
                     overflow: hidden;
                 }
-                td:not(:first-child) {
-                    background: rgba(@m-green0, .1);
+                td:not(:first-child :nth-child(2)) {
+                    background: rgba(@m-red1, .1) !important;
                     color: @m-white1;
                 }
+                td:first-child {
+                    display: none;
+                }
             }
             // tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row,
             //     td {
@@ -1879,10 +1892,13 @@ input:-internal-autofill-selected {
 
 .sellHallTable {
     .ant-table {
+        .ant-table-content {
+            background: rgba(@m-green0, .1);
+        }
         .ant-table-tbody {
             tr {
-                td:not(:first-child) {
-                    background: rgba(@m-red1, .1);
+                td:not(:first-child :nth-child(2)) {
+                    background: rgba(@m-green0, .1) !important;
                 }
             }
         }
@@ -1960,4 +1976,27 @@ input:-internal-autofill-selected {
     .ant-progress-text {
         display: none;
     }
+}
+
+// 暂无数据
+.noData {
+    width: 80px;
+    height: 80px;
+    background: url(../images/nodata.png) center center no-repeat;
+    background-size: cover;
+}
+
+.ant-empty.ant-empty-normal {
+    .ant-empty-image {
+        width: 80px;
+        height: 80px;
+        background: url(../images/nodata.png) center center no-repeat;
+        background-size: cover;
+        .ant-empty-img-simple {
+            display: none;
+        }
+    }
+    .ant-empty-description {
+        display: none;
+    }
 }

src/assets/styles/symbol_no_color/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe62d;</span>
+                <div class="name">用户</div>
+                <div class="code-name">&amp;#xe62d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe69e;</span>
+                <div class="name">用户</div>
+                <div class="code-name">&amp;#xe69e;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe66a;</span>
                 <div class="name">方案 (71)</div>
                 <div class="code-name">&amp;#xe66a;</div>
@@ -324,9 +336,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1627805731690') format('woff2'),
-       url('iconfont.woff?t=1627805731690') format('woff'),
-       url('iconfont.ttf?t=1627805731690') format('truetype');
+  src: url('iconfont.woff2?t=1627897449468') format('woff2'),
+       url('iconfont.woff?t=1627897449468') format('woff'),
+       url('iconfont.ttf?t=1627897449468') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -353,6 +365,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-yonghu4"></span>
+            <div class="name">
+              用户
+            </div>
+            <div class="code-name">.icon-yonghu4
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yonghu3"></span>
+            <div class="name">
+              用户
+            </div>
+            <div class="code-name">.icon-yonghu3
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-fangan"></span>
             <div class="name">
               方案 (71)
@@ -759,6 +789,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yonghu4"></use>
+                </svg>
+                <div class="name">用户</div>
+                <div class="code-name">#icon-yonghu4</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yonghu3"></use>
+                </svg>
+                <div class="name">用户</div>
+                <div class="code-name">#icon-yonghu3</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fangan"></use>
                 </svg>
                 <div class="name">方案 (71)</div>

src/assets/styles/symbol_no_color/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2293216 */
-  src: url('iconfont.woff2?t=1627805731690') format('woff2'),
-       url('iconfont.woff?t=1627805731690') format('woff'),
-       url('iconfont.ttf?t=1627805731690') format('truetype');
+  src: url('iconfont.woff2?t=1627897449468') format('woff2'),
+       url('iconfont.woff?t=1627897449468') format('woff'),
+       url('iconfont.ttf?t=1627897449468') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yonghu4:before {
+  content: "\e62d";
+}
+
+.icon-yonghu3:before {
+  content: "\e69e";
+}
+
 .icon-fangan:before {
   content: "\e66a";
 }

src/assets/styles/symbol_no_color/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "18789269",
+      "name": "用户",
+      "font_class": "yonghu4",
+      "unicode": "e62d",
+      "unicode_decimal": 58925
+    },
+    {
+      "icon_id": "9037996",
+      "name": "用户",
+      "font_class": "yonghu3",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
       "icon_id": "8594782",
       "name": "方案 (71)",
       "font_class": "fangan",

src/common/components/drawer/index.vue

@@ -1,25 +1,26 @@
 <template>
-  <a-drawer :placement="placement"
-            :closable="false"
-            :visible="visible"
-            :destroyOnClose="true"
-            class="bottomListed"
-            height="406px">
-    <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
-    <div class="collapse"
-         @click="cancel">
-      <DoubleRightOutlined />
-    </div>
-    <div class="collapseCont">
-      <div class="title">{{ title }}</div>
-      <div class="content highContent">
-        <!-- <Listed></Listed> -->
-        <!-- <Delisting></Delisting> -->
-        <slot></slot>
-        <!-- <Trade></Trade> -->
-      </div>
-    </div>
-  </a-drawer>
+    <a-drawer
+        :placement="placement"
+        :closable="false"
+        :visible="visible"
+        :destroyOnClose="true"
+        class="bottomListed"
+        height="406px"
+    >
+        <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
+        <div class="collapse" @click="cancel">
+            <DoubleRightOutlined />
+        </div>
+        <div class="collapseCont">
+            <div class="title">{{ title }}</div>
+            <div class="content highContent">
+                <!-- <Listed></Listed> -->
+                <!-- <Delisting></Delisting> -->
+                <slot></slot>
+                <!-- <Trade></Trade> -->
+            </div>
+        </div>
+    </a-drawer>
 </template>
 
 <script lang="ts">
@@ -92,7 +93,7 @@ export default defineComponent({
     }
 }
 .topHigh {
-    .position(fixed, 80px, 0, auto, auto);
+    .position(fixed, 101px, 0, auto, auto);
     width: 486px;
     height: 580px;
     background: transparent;

src/layout/components/bottom.vue

@@ -1,20 +1,17 @@
 <template>
-  <section :class="['layout-bottom', isShowBottom ? 'layout-bottom-all' : 'layout-bottom-hidden']">
-    <CapitalInfo class="capital-info-container"></CapitalInfo>
-    <main>
-      <firstMenu :list="orderList"
-                 :value="'title'"
-                 @selectMenu="selectMenu">
-        <div class="conditionIcon icon iconfont icon-shouqi"
-             @click="handleShowBottom"></div>
-      </firstMenu>
-      <div v-show="isShowBottom">
-        <component :is="componentId"
-                   v-if="componentId">
-        </component>
-      </div>
-    </main>
-  </section>
+    <section
+        :class="['layout-bottom', isShowBottom ? 'layout-bottom-all' : 'layout-bottom-hidden']"
+    >
+        <CapitalInfo class="capital-info-container"></CapitalInfo>
+        <main>
+            <firstMenu :list="orderList" :value="'title'" @selectMenu="selectMenu">
+                <div class="conditionIcon icon iconfont icon-shouqi" @click="handleShowBottom"></div>
+            </firstMenu>
+            <div v-show="isShowBottom">
+                <component :is="componentId" v-if="componentId"></component>
+            </div>
+        </main>
+    </section>
 </template>
 <script lang="ts">
 import { defineAsyncComponent, defineComponent, ref } from 'vue';
@@ -70,6 +67,7 @@ export default defineComponent({
     overflow: hidden;
     .capital-info-container {
         width: 180px;
+        border-right: 1px solid @m-black2;
     }
     main {
         max-width: calc(100% - 180px);

src/layout/components/header.vue

@@ -1,50 +1,51 @@
 <template>
-  <div>
-    <!-- <img src="../../assets/images/logoHeader.png" /> -->
-    <img src="../../assets/images/headLogo.jpg" />
-    <span>云融</span>
-    <!-- <span>深圳市多元世纪信息技术股份有限公司</span> -->
-  </div>
-  <div class="m-layout-header-right">
-    <div @click="openDrawer">
-      <span>{{ getUserName() }}，您好！</span>
+    <div>
+        <!-- <img src="../../assets/images/logoHeader.png" /> -->
+        <img src="../../assets/images/headLogo.jpg" />
+        <span>云融</span>
+        <!-- <span>深圳市多元世纪信息技术股份有限公司</span> -->
     </div>
-    <div class="relative">
-      <!-- <a-input-search ref="userNameInput"
+    <div class="m-layout-header-right">
+        <div @click="openDrawer">
+            <span>{{ getUserName() }}，您好！</span>
+        </div>
+        <div class="relative">
+            <!-- <a-input-search ref="userNameInput"
                           class="searchInput"
                           readonly
                           placeholder="请输入代码/名称"
                           @pressEnter="search">
-          </a-input-search> -->
-      <!-- <a-icon type="search" /> -->
-    </div>
-    <div class="news-container">
-      <a-badge @click="openNotice"
-               :dot="getUnReadNoticeLength() > 0">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-xiaoxi"></use>
-        </svg>
-      </a-badge>
-    </div>
-    <div>
-      <a-popover v-model:visible="visible"
-                 trigger="click"
-                 placement="bottomRight">
-        <template #content>
-          <div v-for="item in setMenu"
-               @click="chooseSetMenu(item.path)"
-               :key="item.path">{{ item.name }}</div>
-        </template>
-        <a-avatar :size="24">
-          <template #icon>
-            <UserOutlined />
-          </template>
-        </a-avatar>
-      </a-popover>
-      <Setting />
+            </a-input-search>-->
+            <!-- <a-icon type="search" /> -->
+        </div>
+        <div class="news-container">
+            <a-badge @click="openNotice" :dot="getUnReadNoticeLength() > 0">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-xiaoxi" />
+                </svg>
+            </a-badge>
+        </div>
+        <div>
+            <a-popover v-model:visible="visible" trigger="click" placement="bottomRight">
+                <template #content>
+                    <div
+                        v-for="item in setMenu"
+                        @click="chooseSetMenu(item.path)"
+                        :key="item.path"
+                    >{{ item.name }}</div>
+                </template>
+                <a-avatar :size="24">
+                    <template #icon>
+                        <!-- <SettingFilled /> -->
+                        <svg class="icon svg-icon" aria-hidden="true">
+                            <use xlink:href="#icon-yonghu4" />
+                        </svg>
+                    </template>
+                </a-avatar>
+            </a-popover>
+            <Setting />
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">

src/layout/components/top.vue

@@ -1,24 +1,25 @@
 <template>
-  <a-layout class="layout-top">
-    <a-layout-header class="m-layout-header">
-      <Header />
-    </a-layout-header>
-    <a-layout class="middleLayout">
-      <a-layout-sider class="m-layout-left"
-                      width="180"
-                      v-model:collapsed="collapsed"
-                      @collapse="collapse"
-                      collapsible>
-        <Menu @chooseMenu="chooseMenu"
-              :collapsed="collapsed" />
-      </a-layout-sider>
-      <a-layout-content :style="{ background: '#0E0E0F', flex: 1, }">
-        <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
-        <!-- <Main /> -->
-        <router-view />
-      </a-layout-content>
+    <a-layout class="layout-top">
+        <a-layout-header class="m-layout-header">
+            <Header />
+        </a-layout-header>
+        <a-layout class="middleLayout">
+            <a-layout-sider
+                class="m-layout-left"
+                width="180"
+                v-model:collapsed="collapsed"
+                @collapse="collapse"
+                collapsible
+            >
+                <Menu @chooseMenu="chooseMenu" :collapsed="collapsed" />
+            </a-layout-sider>
+            <a-layout-content :style="{ background: '#0E0E0F', flex: 1, }">
+                <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
+                <!-- <Main /> -->
+                <router-view />
+            </a-layout-content>
+        </a-layout>
     </a-layout>
-  </a-layout>
 </template>
 <script lang="ts">
 import { defineComponent, ref, provide } from 'vue';
@@ -195,6 +196,7 @@ export default defineComponent({
         .m-layout-left {
             min-height: calc(100vh - 376px);
             background: @m-black4;
+            border-right: 1px solid @m-black2;
             overflow: hidden;
             .ant-layout-sider-children {
                 ul.ant-menu.ant-menu-inline.left-menu {

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

@@ -1,28 +1,30 @@
 <template>
-  <!-- 买大厅 -->
-  <a-table :columns="columns"
-           class="buyHallTable"
-           :scroll="{ x: '100%', y: 'calc(100vh- 510px)' }"
-           :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"
-             :buyOrSell="BuyOrSell.buy"
-             :enumName="enumName"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!-- 买大厅 -->
+    <a-table
+        :columns="columns"
+        class="buyHallTable"
+        :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"
+        :buyOrSell="BuyOrSell.buy"
+        :enumName="enumName"
+        :parantSelectedRow="parantSelectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">

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

@@ -1,46 +1,52 @@
 <template>
-  <!-- 仓单贸易&仓单预售 融资-->
+    <!-- 仓单贸易&仓单预售 融资-->
 
-  <Drawer :title="'选择融资方案'"
-          :placement="'top'"
-          :visible="visible"
-          width="486px"
-          height="580px"
-          @cancel="update"
-          class="top financing">
-    <div class="financingCont">
-      <a-row class="f-t">
-        <a-col :span="7">融出方/名称</a-col>
-        <a-col :span="10">天数/保证金/利息</a-col>
-        <a-col :span="7">结息/起息天数</a-col>
-      </a-row>
-      <div class="contBar"
-           v-for="(item, index) in list"
-           :key="index + 11"
-           @click="choose(item)">
-        <a-row class="firstRow">
-          <a-col :span="7">{{item.productname}}</a-col>
-          <a-col :span="17"
-                 v-if="item.isautoloan">放款快</a-col>
-        </a-row>
-        <a-row class="secondRow">
-          <a-col :span="7">{{item.username}}</a-col>
-          <a-col :span="10">
-            <a-row class="middle">
-              <a-col :span="7">{{item.financingdays}}天</a-col>
-              <a-col :span="10">{{item.marginratio * 100}}%</a-col>
-              <a-col :span="7">{{item.interestrate * 100}}%</a-col>
+    <Drawer
+        :title="'选择融资方案'"
+        :placement="'right'"
+        :visible="visible"
+        width="486px"
+        height="580px"
+        @cancel="update"
+        class="top financing"
+    >
+        <div class="financingCont">
+            <a-row class="f-t">
+                <a-col :span="7">融出方/名称</a-col>
+                <a-col :span="10">天数/保证金/利息</a-col>
+                <a-col :span="7">结息/起息天数</a-col>
             </a-row>
-          </a-col>
-          <a-col :span="7">
-            <div class="settle">
-              <div>{{item.interestsettlemode === 1 ? '日' : '月'}}结</div>
-              <div>{{item.interestminlen}}天起息</div>
+            <div
+                class="contBar"
+                v-for="(item, index) in list"
+                :key="index + 11"
+                @click="choose(item)"
+            >
+                <a-row class="firstRow">
+                    <a-col :span="7">{{item.productname}}</a-col>
+                    <a-col :span="17" v-if="item.isautoloan">放款快</a-col>
+                </a-row>
+                <a-row class="secondRow">
+                    <a-col :span="7">{{item.username}}</a-col>
+                    <a-col :span="10">
+                        <a-row class="middle">
+                            <a-col :span="7">{{item.financingdays}}天</a-col>
+                            <a-col :span="10">{{item.marginratio * 100}}%</a-col>
+                            <a-col :span="7">{{item.interestrate * 100}}%</a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :span="7">
+                        <div class="settle">
+                            <div>{{item.interestsettlemode === 1 ? '日' : '月'}}结</div>
+                            <div>{{item.interestminlen}}天起息</div>
+                        </div>
+                    </a-col>
+                </a-row>
             </div>
-          </a-col>
-        </a-row>
-      </div>
-      <!-- <div class="contBar">
+            <div class="noDataContBar" v-if="!list.length">
+                <div class="noData"></div>
+            </div>
+            <!-- <div class="contBar">
         <a-row class="firstRow">
           <a-col :span="7">铜供应链金融</a-col>
           <a-col :span="17">放款快</a-col>
@@ -83,9 +89,9 @@
             </div>
           </a-col>
         </a-row>
-      </div> -->
-    </div>
-  </Drawer>
+            </div>-->
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -218,6 +224,14 @@ export default defineComponent({
                 }
             }
         }
+        .noDataContBar {
+            width: 100%;
+            text-align: center;
+            margin-top: 175px;
+            .noData {
+                margin: 0 auto;
+            }
+        }
     }
 }
 </style>;

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

@@ -1,28 +1,30 @@
 <template>
-  <!-- 卖大厅 -->
-  <a-table :columns="columns"
-           class="sellHallTable"
-           :scroll="{ x: '100%', y: 'calc(100vh - 510px)' }"
-           :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"
+        :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>
 </template>
 
 <script lang="ts">

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

@@ -1,89 +1,84 @@
 <template>
-  <!-- 买卖大厅 -->
-  <div class="buy-sell-market">
-    <div class="buy-sell-market-title">
-      <a class="backIcon"
-         @click="cancel">
-        <LeftOutlined />
-      </a>
-      <div class="titleBtn">
-        <div class="name">{{selectedRow.deliverygoodsname}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn2">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">{{selectedRow.wrgoodsname}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn3">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">{{selectedRow.warehousename}}</div>
-      </div>
-      <div class="green">
-        <div class="numBlock"
-             v-if="isFloatPrice()">
-          <div class="first">卖基差</div>
-          <div class="last">{{selectedRow.sellpricemove}}</div>
+    <!-- 买卖大厅 -->
+    <div class="buy-sell-market">
+        <div class="buy-sell-market-title">
+            <a class="backIcon" @click="cancel">
+                <LeftOutlined />
+            </a>
+            <div class="titleBtn">
+                <div class="name">{{selectedRow.deliverygoodsname}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn2">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">{{selectedRow.wrgoodsname}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn3">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">{{selectedRow.warehousename}}</div>
+            </div>
+            <div class="green">
+                <div class="numBlock" v-if="isFloatPrice()">
+                    <div class="first">卖基差</div>
+                    <div class="last">{{selectedRow.sellpricemove}}</div>
+                </div>
+                <div class="numBlock" v-else>
+                    <div class="first">卖价</div>
+                    <div class="last">{{selectedRow.sellprice}}</div>
+                </div>
+                <div class="numBlock">
+                    <div class="first">卖量</div>
+                    <div class="last">{{selectedRow.sellqty}}</div>
+                </div>
+            </div>
+            <div class="red ml35">
+                <div class="numBlock" v-if="isFloatPrice()">
+                    <div class="first">买基差</div>
+                    <div class="last">{{selectedRow.buypricemove}}</div>
+                </div>
+                <div class="numBlock" v-else>
+                    <div class="first">买价</div>
+                    <div class="last">{{selectedRow.buyprice}}</div>
+                </div>
+                <div class="numBlock">
+                    <div class="first">买量</div>
+                    <div class="last">{{selectedRow.buyqty}}</div>
+                </div>
+            </div>
+            <div class="market" v-if="isFloatPrice()">
+                <div class="first">{{selectedRow.goodscode}}</div>
+                <div class="last red">{{getGoodsPrice()}}</div>
+                <LineChartOutlined />
+            </div>
+            <BtnList :btnList="temp(firstBtn)" :record="selectedRow" @click="openComponent" />
         </div>
-        <div class="numBlock"
-             v-else>
-          <div class="first">卖价</div>
-          <div class="last">{{selectedRow.sellprice}}</div>
-        </div>
-        <div class="numBlock">
-          <div class="first">卖量</div>
-          <div class="last">{{selectedRow.sellqty}}</div>
-        </div>
-      </div>
-      <div class="red ml35">
-        <div class="numBlock"
-             v-if="isFloatPrice()">
-          <div class="first">买基差</div>
-          <div class="last">{{selectedRow.buypricemove}}</div>
-        </div>
-        <div class="numBlock"
-             v-else>
-          <div class="first">买价</div>
-          <div class="last">{{selectedRow.buyprice}}</div>
-        </div>
-        <div class="numBlock">
-          <div class="first">买量</div>
-          <div class="last">{{selectedRow.buyqty}}</div>
-        </div>
-      </div>
-      <div class="market"
-           v-if="isFloatPrice()">
-        <div class="first">{{selectedRow.goodscode}}</div>
-        <div class="last red">{{getGoodsPrice()}}</div>
-        <LineChartOutlined />
-      </div>
-      <BtnList :btnList="temp(firstBtn)"
-               :record="selectedRow"
-               @click="openComponent" />
+        <a-row class="buySellHall">
+            <a-col :span="12" v-if="sellMarket.isMarket">
+                <Sell
+                    :enumName="enumName"
+                    ref="sellRef"
+                    :parantSelectedRow="selectedRow"
+                    :btnList="sellMarket.btnList"
+                />
+            </a-col>
+            <a-col :span="12" v-if="buyMarket.isMarket">
+                <Buy
+                    :enumName="enumName"
+                    ref="buy"
+                    :parantSelectedRow="selectedRow"
+                    :btnList="buyMarket.btnList"
+                />
+            </a-col>
+        </a-row>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            :enumName="enumName"
+            @cancel="closeComponent"
+        ></component>
     </div>
-    <a-row>
-      <a-col :span="12"
-             v-if="sellMarket.isMarket">
-        <Sell :enumName="enumName"
-              ref="sellRef"
-              :parantSelectedRow="selectedRow"
-              :btnList="sellMarket.btnList" />
-      </a-col>
-      <a-col :span="12"
-             v-if="buyMarket.isMarket">
-        <Buy :enumName="enumName"
-             ref="buy"
-             :parantSelectedRow="selectedRow"
-             :btnList="buyMarket.btnList" />
-      </a-col>
-
-    </a-row>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               :enumName="enumName"
-               @cancel="closeComponent"></component>
-  </div>
 </template>
 
 <script lang="ts">
@@ -191,6 +186,14 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
-.buy-sell-market {
-}
+// .buy-sell-market {
+//     .ant-row.buySellHall {
+//         .ant-col:first-child {
+//             background: rgba(@m-green0, 0.1);
+//         }
+//         .ant-col:last-child {
+//             background: rgba(@m-red1, 0.1);
+//         }
+//     }
+// }
 </style>

src/views/order/performance_information/components/performance_information_sell_performance/index.vue

@@ -11,7 +11,7 @@
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
-      <template v-if="btnList.length"
+      <template v-if="btnList"
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
@@ -53,6 +53,7 @@ import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { onMounted } from 'vue';
 export default defineComponent({
     name: enumOrderComponents.performance_information_sell_performance,
     components: {

src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue

@@ -2,7 +2,7 @@
   <!-- 现货仓单 挂单 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
@@ -16,15 +16,15 @@
                  :record="record"
                  @click="openComponent" />
       </template>
-        <!--  委托状态-->
-        <template #wrtradeorderstatus="{ record }">
-            <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-        </template>
-        <!-- 挂牌类型 -->
-        <template #wrtradetype="{ record }">
-            <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-        </template>
-        <!-- 挂牌价格 -->
+      <!--  委托状态-->
+      <template #wrtradeorderstatus="{ record }">
+        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+      </template>
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+      <!-- 挂牌价格 -->
     </a-table>
     <component :is="componentId"
                v-if="componentId"

src/views/order/spot_warran/components/spot_warrant_spot_details/components/pick_up/index.vue

@@ -1,102 +1,103 @@
 <template>
-  <!-- 现货仓单 现货明细 提货 true -->
-  <Drawer :title="'提货'"
-          :placement="'bottom'"
-          :visible="visible"
-          @cancel="cancel">
-    <!-- 挂牌 -->
-    <div class="listed">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="提货数量"
-                           name="OutQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.OutQty"
-                                :max="selectedRow.enableqty"
-                                :suffix="selectedRow.enumdicname"
-                                style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="提货人"
-                           name="ContactName">
-                <a-input class="commonInput"
-                         v-model:value="formState.ContactName"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12"
-                   class="mt-20">
-              <a-form-item>
-                <a-progress class="formProgress"
-                            :percent="30" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="联系方式"
-                           name="ContactNum">
-                <a-input class="commonInput"
-                         v-model:value="formState.ContactNum"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="预约日期"
-                           name="AppointmentDate">
-                <a-date-picker class="commonDatePicker dialogDatePicker"
-                               v-model:value="formState.AppointmentDate"
-                               style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="备注"
-                           name="AppointmentRemark">
-                <a-input class="commonInput"
-                         v-model:value="formState.AppointmentRemark"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
-                          @click="submit">提货</a-button>
-                <a-button class="ml10 cancelBtn"
-                          @click="cancel">取消</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+    <!-- 现货仓单 现货明细 提货 true -->
+    <Drawer :title="'提货'" :placement="'right'" :visible="visible" @cancel="cancel">
+        <!-- 挂牌 -->
+        <div class="listed">
+            <div class="condition">
+                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+            </div>
+            <div class="formBar">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="提货数量" name="OutQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.OutQty"
+                                    :max="selectedRow.enableqty"
+                                    :suffix="selectedRow.enumdicname"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="提货人" name="ContactName">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.ContactName"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12" class="mt-20">
+                            <a-form-item>
+                                <a-progress class="formProgress" :percent="30" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="联系方式" name="ContactNum">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.ContactNum"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="预约日期" name="AppointmentDate">
+                                <a-date-picker
+                                    class="commonDatePicker dialogDatePicker"
+                                    v-model:value="formState.AppointmentDate"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="备注" name="AppointmentRemark">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.AppointmentRemark"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24" type="flex" justify="center">
+                        <a-col :span="24">
+                            <a-form-item class="tc">
+                                <a-button
+                                    class="listedBtn"
+                                    :loading="loading"
+                                    :disabled="loading"
+                                    @click="submit"
+                                >提货</a-button>
+                                <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </div>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_spot_details/index.vue

@@ -1,29 +1,27 @@
 <template>
-    <!-- 现货明细 -->
-    <section>
-        <a-table
-            :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: '227px' }"
-            :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"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+  <!-- 现货明细 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
+             :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"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">