Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -747,6 +747,13 @@
         border-color: @m-blue10;
     }
 }
+.yellowInput {
+    .ant-input,.ant-input-number-input {
+        color: @m-yellow1;
+        font-size: 16px;
+        text-align: center;
+    }
+}
 .suffixGrey {
     .ant-input-suffix {
         color: @m-grey2;
@@ -1810,6 +1817,10 @@ input:-internal-autofill-selected {
 }
 // 买卖大厅表格
 .buyHallTable,.sellHallTable {
+    .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
+        min-height: calc(100vh - 470px);
+        background: transparent;
+    }
     .ant-table {
         width: 100%;
         table {
@@ -1852,16 +1863,15 @@ input:-internal-autofill-selected {
                     text-overflow: ellipsis;
                     overflow: hidden;
                 }
+                td:first-child {
+                    background: @m-black8;
+                    color: @m-grey17;
+                }
                 td:not(:first-child :nth-child(1)) {
                     background: @m-red2;
                     color: @m-white1;
                 }
             }
-            // tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row,
-            //     td {
-            //         background-color: @m-black2;
-            //     }
-            // }
             tr.ant-table-expanded-row, tr.ant-table-expanded-row:hover {
                 td {
                     background-color: @m-black2;
@@ -1898,6 +1908,10 @@ input:-internal-autofill-selected {
         .ant-table-tbody {
             background: @m-green1;
             tr {
+                td:first-child {
+                    background: @m-black8;
+                    color: @m-grey17;
+                }
                 td:not(:first-child :nth-child(1)) {
                     background: @m-green1;
                 }

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

@@ -1,130 +1,137 @@
 <template>
-  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
-  <Drawer :title="'摘牌'"
-          :placement="'top'"
-          :visible="visible"
-          width="486px"
-          height="479px"
-          @cancel="cancel"
-          class="top">
-    <div class="delisting">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <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-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="基差"
-                           v-if="isFloat()">
-                <span class="yellow">{{selectedRow.pricemove}}</span>
-              </a-form-item>
-              <a-form-item label="挂牌价格"
-                           v-if="!isFloat()">
-                <span class="yellow">{{selectedRow.fixedprice}}</span>
-              </a-form-item>
-              <a-row :gutter="24">
-                <a-col :span="24"></a-col>
-              </a-row>
-              <a-form-item label="挂牌数量">
-                <span class="white">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="isBuy() && !isSale()">
-            <a-col :span="24">
-              <a-form-item label="现货仓单"
-                           name="LadingBillId">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.LadingBillId"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in wrHoldList"
-                                   :value="item.id"
-                                   :key="item.id">
-                    {{item.name}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           name="num">
-                <a-input-number class="dialogInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.num"
-                                :suffix="selectedRow.enumdicname" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider ::min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider" />
-                <div class="unit">
-                  <span>1</span>
-                  <span>{{selectedRow.orderqty}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item label="挂牌金额">
-                <span class="white">--</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
-                          @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
-                <a-button class="ml10 cancelBtn"
-                          @click="cancel">取消</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+    <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+    <Drawer
+        :title="'摘牌'"
+        :placement="'top'"
+        :visible="visible"
+        width="486px"
+        height="479px"
+        @cancel="cancel"
+        class="top"
+    >
+        <div class="delisting">
+            <div class="formBar">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <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-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white">{{selectedRow.username}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="基差" v-if="isFloat()">
+                                <span class="yellow">{{selectedRow.pricemove}}</span>
+                            </a-form-item>
+                            <a-form-item label="挂牌价格" v-if="!isFloat()">
+                                <span class="yellow">{{selectedRow.fixedprice}}</span>
+                            </a-form-item>
+                            <a-row :gutter="24">
+                                <a-col :span="24"></a-col>
+                            </a-row>
+                            <a-form-item label="挂牌数量">
+                                <span
+                                    class="white"
+                                >{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="isBuy() && !isSale()">
+                        <a-col :span="24">
+                            <a-form-item label="现货仓单" name="LadingBillId">
+                                <a-select
+                                    class="inlineFormSelect"
+                                    style="width: 260px"
+                                    v-model:value="formState.LadingBillId"
+                                    placeholder="请选择"
+                                >
+                                    <a-select-option
+                                        v-for="item in wrHoldList"
+                                        :value="item.id"
+                                        :key="item.id"
+                                    >{{item.name}}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" name="num">
+                                <a-input-number
+                                    class="dialogInput yellowInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.num"
+                                    :suffix="selectedRow.enumdicname"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider
+                                    ::min="0"
+                                    v-model:value="formState.num"
+                                    :max="selectedRow.orderqty"
+                                    class="formSlider"
+                                />
+                                <div class="unit">
+                                    <span>1</span>
+                                    <span>{{selectedRow.orderqty}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item label="挂牌金额">
+                                <span class="white">--</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item class="tc">
+                                <a-button
+                                    class="listedBtn"
+                                    :loading="loading"
+                                    :disabled="loading"
+                                    @click="submit"
+                                >{{isBuy() ? '卖出' : '买入'}}</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/market/spot_trade/components/buy-sell-market/components/financing_delisting/components/choose-finance/index.vue

@@ -1,50 +1,56 @@
 <template>
-  <!-- 仓单贸易&仓单预售 融资-->
+    <!-- 仓单贸易&仓单预售 融资-->
 
-  <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>
-      <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="topHigh 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">
+                                <!-- <div class="two">{{item.interestrate * 100}}%</div>
+                                <div class="two">{{item.interestrate * 100}}%</div>-->
+                                {{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="noDataContBar"
-           v-if="!list.length">
-        <div class="noData"></div>
-      </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>
@@ -88,8 +94,8 @@
           </a-col>
         </a-row>
             </div>-->
-    </div>
-  </Drawer>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -204,6 +210,10 @@ export default defineComponent({
                     }
                     .ant-col:nth-child(3) {
                         text-align: right;
+                        .two {
+                            height: 20px;
+                            line-height: 20px;
+                        }
                     }
                 }
             }

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

@@ -58,7 +58,7 @@
               <a-form-item label="摘牌数量"
                            name="num"
                            class="relative">
-                <a-input-number class="dialogInput"
+                <a-input-number class="dialogInput yellowInput"
                                 style="width: 260px"
                                 :min="0"
                                 v-model:value="formState.num"