theme color update

src/assets/styles/mixin.less

@@ -1201,6 +1201,16 @@
         }
     }
 }
+.conditionPicker.ant-calendar-picker {
+    .ant-input {
+        border: 0;
+    }
+    &:focus{
+       .ant-input {
+            border: 0;
+        }
+    }
+}
 .ant-popover {
     .ant-popover-content {
         border: 1px solid @m-grey23;

src/common/components/drawer/index.vue

@@ -110,8 +110,8 @@ export default defineComponent({
 }
 .topHigh {
     .position(fixed, 101px, 0, auto, auto);
-    width: 486px;
-    height: 580px;
+    width: 580px;
+    height: 450px;
     background: transparent;
     z-index: 10;
     .ant-drawer-content-wrapper {

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

@@ -115,22 +115,14 @@
                             </a-form-item>
                         </a-col>
                     </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24" class="mt-20">
+                    <a-row :gutter="24" v-if="getMargin()">
+                        <a-col :span="24">
                             <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                                <!-- <a-row>
-                                <a-col :span="8" v-if="getMargin()">-->
-                                <span class="white ml8" v-if="getMargin()">{{getMargin()}}</span>
-                                <!-- </a-col> -->
-                                <!-- <a-col :span="5" class="tr">
-                                        <span class="grey1">可用资金</span>
-                                    </a-col>
-                                    <a-col :span="11">
-                                        <span
-                                            class="white ml8"
-                                        >{{getCanUseMoney(getSelectedAccount())}}</span>
+                                <a-row>
+                                    <a-col :span="24">
+                                        <span class="white ml8">{{getMargin()}}</span>
                                     </a-col>
-                                </a-row>-->
+                                </a-row>
                             </a-form-item>
                         </a-col>
                     </a-row>

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

@@ -1,55 +1,57 @@
 <template>
-  <!-- 仓单贸易&仓单预售 融资-->
+    <!-- 仓单贸易&仓单预售 融资-->
 
-  <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>
-      <div class="contBar"
-           v-for="(item, index) in list"
-           :key="index + 11"
-           @click="choose(item)">
-        <a-row class="firstRow">
-          <a-col :span="17">{{item.username}}</a-col>
-          <a-col :span="7"
-                 v-if="item.isautoloan">放款快</a-col>
-        </a-row>
-        <a-row class="secondRow">
-          <a-col :span="7">{{item.productname}}</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).toFixed(2)}}%</a-col>
-              <a-col :span="7">
-                <!-- <div class="two">{{item.interestrate * 100}}%</div>
-                                <div class="two">{{item.interestrate * 100}}%</div>-->
-                {{item.interestratemode === 3 ? item.interestrate : (item.interestrate * 10000).toFixed(2)}}{{item.interestratemode === 3 ? '' : '‱'}}
-              </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="17">{{item.username}}</a-col>
+                    <a-col :span="7" v-if="item.isautoloan">放款快</a-col>
+                </a-row>
+                <a-row class="secondRow">
+                    <a-col :span="7">{{item.productname}}</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).toFixed(2)}}%</a-col>
+                            <a-col :span="7">
+                                <!-- <div class="two">{{item.interestrate * 100}}%</div>
+                                <div class="two">{{item.interestrate * 100}}%</div>-->
+                                {{item.interestratemode === 3 ? item.interestrate : (item.interestrate * 10000).toFixed(2)}}{{item.interestratemode === 3 ? '' : '‱'}}
+                            </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>
+            <div class="noDataContBar" v-if="!list.length">
+                <div class="noData"></div>
             </div>
-          </a-col>
-        </a-row>
-      </div>
-      <div class="noDataContBar"
-           v-if="!list.length">
-        <div class="noData"></div>
-      </div>
-    </div>
-  </Drawer>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">

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

@@ -7,7 +7,7 @@
         width="486px"
         height="580px"
         @cancel="cancel"
-        class="topHigh"
+        class="top"
     >
         <div class="delisting">
             <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
@@ -133,14 +133,14 @@
                             </a-form-item>
                         </a-col>
                     </a-row>
-                    <a-row :gutter="24">
+                    <a-row :gutter="24" v-if="getMargin()">
                         <a-col :span="24">
                             <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                                <!-- <a-row> -->
-                                <!-- <a-col :span="8"> -->
-                                <span class="white ml8" v-if="getMargin()">{{getMargin()}}</span>
-                                <!-- </a-col> -->
-                                <!-- <a-col :span="5" class="tr">
+                                <!-- <a-row>
+                                <a-col :span="8">-->
+                                <span class="white ml8">{{getMargin()}}</span>
+                                <!-- </a-col>
+                                    <a-col :span="5" class="tr">
                                         <span class="grey1">可用资金</span>
                                     </a-col>
                                     <a-col :span="11">

src/views/market/spot_trade/components/post_buying/index.vue

@@ -100,12 +100,12 @@
                                 <span class="white ml8">{{getMoney()}}</span>
                             </a-form-item>
                         </a-col>
-                        <a-col :span="24" class="relative">
+                        <a-col :span="24" v-if="getMargin()">
                             <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                                <a-row>
-                                    <a-col :span="8" v-if="getMargin()">
-                                        <span class="white ml8">{{getMargin()}}</span>
-                                    </a-col>
+                                <!-- <a-row>
+                                <a-col :span="8">-->
+                                <span class="white ml8">{{getMargin()}}</span>
+                                <!-- </a-col>
                                     <a-col :span="4" class="tr">
                                         <span class="grey1">可用资金</span>
                                     </a-col>
@@ -114,7 +114,12 @@
                                             class="white ml8"
                                         >{{getCanUseMoney(getSelectedAccount())}}</span>
                                     </a-col>
-                                </a-row>
+                                </a-row>-->
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
                             </a-form-item>
                         </a-col>
                     </a-row>

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

@@ -138,21 +138,26 @@
                                 <span class="white ml8">{{getMoney()}}</span>
                             </a-form-item>
                         </a-col>
-                        <a-col :span="24" class="relative">
+                        <a-col :span="24" v-if="getMargin()">
                             <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                                <a-row>
-                                    <a-col :span="8" v-if="getMargin()">
-                                        <span class="white ml8">{{getMargin()}}</span>
-                                    </a-col>
-                                    <a-col :span="4" class="tr">
-                                        <span class="grey1">可用资金</span>
-                                    </a-col>
+                                <!-- <a-row>
+                                <a-col :span="8">-->
+                                <span class="white ml8">{{getMargin()}}</span>
+                                <!-- </a-col>
+                                <a-col :span="4" class="tr">-->
+                                <span class="grey1">可用资金</span>
+                                <!-- </a-col>
                                     <a-col :span="12">
                                         <span
                                             class="white ml8"
                                         >{{getCanUseMoney(handleSelectedAccount())}}</span>
                                     </a-col>
-                                </a-row>
+                                </a-row>-->
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{getCanUseMoney(handleSelectedAccount())}}</span>
                             </a-form-item>
                         </a-col>
                     </a-row>