theme color update

src/assets/styles/mixin.less

@@ -111,6 +111,9 @@
     text-overflow: ellipsis;
     overflow: hidden;
 }
+.nowrap {
+    white-space: nowrap;
+}
 .dateInputStyle(@width: 12rem, @height: 2.2rem, @fontSize: 1.3rem) {
     width: @width;
     height: @height;
@@ -747,7 +750,7 @@
     position: absolute;
     top: -8px;
     right: -110px;
-    color: @m-grey10;
+    color: @m-grey41;
     margin-left: 5px;
     font-size: 14px;
     display: inline-block;
@@ -936,7 +939,7 @@
     color: @m-grey1;
 }
 .white {
-    color: @m-white0;
+    color: @m-white6;
 }
 .blue {
     color: @m-blue0;

src/views/information/goods/components/add/index.vue

@@ -506,9 +506,6 @@ export default defineComponent({
             color: @m-blue0;
         }
     }
-    .white {
-        color: @m-white0;
-    }
     .dialogTable {
         .ant-table {
             .ant-table-content {

src/views/information/goods/components/hedgingDetail/index.vue

@@ -1,106 +1,78 @@
 <template>
-  <!-- 套保品种详情 -->
-  <a-modal class="commonModal hedgingDetail"
-           title="详情"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="套保品种名称"
-                         name="deliverygoodsname">
-              <span class="white">{{selctedMG.mg.middlegoodsname}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="套保品种单位"
-                         name="deliverygoodscode">
-              <span class="white">{{selctedMG.mg.enumdicname}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>修改套保比例列表</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="5">
-            <span>
-              修改时间
-            </span>
-          </a-col>
-          <a-col :span="5">
-            <span>
-              修改前比例
-            </span>
-          </a-col>
-          <a-col :span="5">
-            <span>
-              修改后比例
-            </span>
-          </a-col>
-          <a-col :span="5">
-            <span>
-              备注
-            </span>
-          </a-col>
-          <a-col :span="4"
-                 class="tc">
-            <span>
-              修改人
-            </span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24"
-               class="dialogRowTitle"
-               v-for="(item, index) in list"
-               :key="index">
-          <a-col :span="5"
-                 class="nowrap">
-            <span class="white">
-              {{item.updatetime}}
-            </span>
-          </a-col>
-          <a-col :span="5">
-            <span class="white">
-              {{item.beforevalue}}
-            </span>
-          </a-col>
-          <a-col :span="5">
-            <span class="white">
-              {{item.aftervalue}}
-            </span>
-          </a-col>
-          <a-col :span="5"
-                 class="ellipse">
-            <span class="white">
-              {{item.logremark}}
-            </span>
-          </a-col>
-          <a-col :span="4"
-                 class="tc">
-            <span class="white">
-              {{item.applyname}}
-            </span>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+    <!-- 套保品种详情 -->
+    <a-modal
+        class="commonModal hedgingDetail"
+        title="详情"
+        v-if="visible"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef">
+            <fieldset class="formFieldSet">
+                <legend>基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="套保品种名称" name="deliverygoodsname">
+                            <span class="white">{{selctedMG.mg.middlegoodsname}}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="套保品种单位" name="deliverygoodscode">
+                            <span class="white">{{selctedMG.mg.enumdicname}}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>修改套保比例列表</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="5">
+                        <span>修改时间</span>
+                    </a-col>
+                    <a-col :span="5">
+                        <span>修改前比例</span>
+                    </a-col>
+                    <a-col :span="5">
+                        <span>修改后比例</span>
+                    </a-col>
+                    <a-col :span="5">
+                        <span>备注</span>
+                    </a-col>
+                    <a-col :span="4" class="tc">
+                        <span>修改人</span>
+                    </a-col>
+                </a-row>
+                <a-row
+                    :gutter="24"
+                    class="dialogRowTitle"
+                    v-for="(item, index) in list"
+                    :key="index"
+                >
+                    <a-col :span="5" class="nowrap">
+                        <span class="white">{{item.updatetime}}</span>
+                    </a-col>
+                    <a-col :span="5">
+                        <span class="white">{{item.beforevalue}}</span>
+                    </a-col>
+                    <a-col :span="5">
+                        <span class="white">{{item.aftervalue}}</span>
+                    </a-col>
+                    <a-col :span="5" class="ellipse">
+                        <span class="white">{{item.logremark}}</span>
+                    </a-col>
+                    <a-col :span="4" class="tc">
+                        <span class="white">{{item.applyname}}</span>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -156,9 +128,6 @@ export default defineComponent({
         width: 20%;
         text-overflow: ellipsis;
     }
-    .nowrap {
-        white-space: nowrap;
-    }
 }
 </style
 >;

src/views/information/goods/components/modify/index.vue

@@ -561,10 +561,6 @@ export default defineComponent({
         }
     }
 
-    .white {
-        color: @m-white0;
-    }
-
     .dialogTable {
         .ant-table {
             .ant-table-content {

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

@@ -10,13 +10,8 @@
         class="top"
     >
         <div class="delisting">
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
+            <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">
@@ -103,6 +98,7 @@
                                     v-model:value="formState.num"
                                     :max="selectedRow.orderqty"
                                     class="formSlider"
+                                    style="width: 260px;"
                                 />
                                 <div class="unit">
                                     <span>0</span>
@@ -122,37 +118,44 @@
                     <a-row :gutter="24">
                         <a-col :span="24" class="mt-20">
                             <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">
+                                <!-- <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="12">
+                                    <a-col :span="11">
                                         <span
                                             class="white ml8"
                                         >{{getCanUseMoney(getSelectedAccount())}}</span>
                                     </a-col>
-                                </a-row>
+                                </a-row>-->
                             </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 label="可用资金">
+                                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
                             </a-form-item>
                         </a-col>
                     </a-row>
-                </a-form>
-            </div>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <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>
     </Drawer>
 </template>
@@ -281,12 +284,13 @@ export default defineComponent({
 });
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 .delisting {
     width: 100%;
     height: 100%;
     .flex;
     flex-direction: column;
+    overflow: hidden;
     .condition {
         width: 100%;
         height: 48px;
@@ -314,6 +318,9 @@ export default defineComponent({
             margin-left: 10px;
         }
     }
+    .ant-form {
+        height: 100%;
+    }
 }
 ::v-deep.ant-slider.formSlider {
     width: 260px;

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

@@ -10,13 +10,8 @@
         class="topHigh"
     >
         <div class="delisting">
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
+            <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">
@@ -121,6 +116,7 @@
                                     v-model:value="formState.num"
                                     :max="selectedRow.orderqty"
                                     class="formSlider"
+                                    style="width: 260px;"
                                 />
                                 <div class="unit">
                                     <span>0</span>
@@ -138,39 +134,46 @@
                         </a-col>
                     </a-row>
                     <a-row :gutter="24">
-                        <a-col :span="24" class="mt-20">
+                        <a-col :span="24">
                             <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">
+                                <!-- <a-row> -->
+                                <!-- <a-col :span="8"> -->
+                                <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="12">
+                                    <a-col :span="11">
                                         <span
                                             class="white ml8"
                                         >{{getCanUseMoney(getSelectedAccount())}}</span>
                                     </a-col>
-                                </a-row>
+                                </a-row>-->
                             </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 label="可用资金">
+                                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
                             </a-form-item>
                         </a-col>
                     </a-row>
-                </a-form>
-            </div>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <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>
     </Drawer>
     <component
@@ -328,13 +331,14 @@ export default defineComponent({
 });
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 .delisting {
     width: 100%;
     height: 100%;
     .flex;
     flex-direction: column;
     z-index: 10;
+    overflow: hidden;
     .condition {
         width: 100%;
         height: 48px;
@@ -362,6 +366,9 @@ export default defineComponent({
             margin-left: 10px;
         }
     }
+    .ant-form {
+        height: 100%;
+    }
     .need {
         color: @m-grey0;
         font-size: 12px;

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

@@ -10,13 +10,8 @@
         class="top"
     >
         <div class="delisting">
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
+            <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">
@@ -101,9 +96,9 @@
                                 <a-slider
                                     ::min="0"
                                     v-model:value="formState.num"
-                                    style="width: 140px;"
                                     :max="selectedRow.orderqty"
                                     class="formSlider"
+                                    style="width: 260px"
                                 />
                                 <div class="unit">
                                     <span>0</span>
@@ -121,39 +116,46 @@
                         </a-col>
                     </a-row>
                     <a-row :gutter="24">
-                        <a-col :span="24" class="mt-20">
+                        <a-col :span="24">
                             <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">
+                                <!-- <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="12">
+                                    <a-col :span="11">
                                         <span
                                             class="white ml8"
                                         >{{getCanUseMoney(getSelectedAccount())}}</span>
                                     </a-col>
-                                </a-row>
+                                </a-row>-->
                             </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 label="可用资金">
+                                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
                             </a-form-item>
                         </a-col>
                     </a-row>
-                </a-form>
-            </div>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <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>
     </Drawer>
 </template>
@@ -282,12 +284,13 @@ export default defineComponent({
 });
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 .delisting {
     width: 100%;
     height: 100%;
     .flex;
     flex-direction: column;
+    overflow: hidden;
     .condition {
         width: 100%;
         height: 48px;
@@ -315,6 +318,9 @@ export default defineComponent({
             margin-left: 10px;
         }
     }
+    .ant-form {
+        height: 100%;
+    }
 }
 ::v-deep.ant-slider.formSlider {
     width: 260px;

src/views/market/warehouseTrade/components/trade/index.vue

@@ -235,9 +235,6 @@ export default defineComponent({
                     margin-left: 33px;
                 }
             }
-            .white {
-                color: @m-white0;
-            }
         }
         .ant-btn.numAndOperBtn {
             width: 80px;