Browse Source

style update

marymelisa 4 năm trước cách đây
mục cha
commit
8ed2a04adf

+ 22 - 6
src/assets/styles/mixin.less

@@ -797,18 +797,20 @@
 }
 .dialogInput34.ant-input-number {
     position: relative;
+    height: 34px;
     .ant-input-number-input {
         height: 34px;
-        line-height: 36px;
+        line-height: 34px;
         font-size: 16px;
-        color: #ffffff;
+        color: @m-white6;
         text-align: center;
+        padding: 0 26px;
     }
 }
 .dialogInput34.ant-input-number-disabled { 
-    background: #1E304A;
+    background: @m-grey52;
     .ant-input-number-input {
-        color: #354859;
+        color: @m-grey51;
     }
 }
 .block {
@@ -2061,6 +2063,17 @@ input:-internal-autofill-selected {
         }
     }
 }
+// 下半部分表格高度
+.layout-bottom {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-tbody {
+                min-height: 190px;
+                background: @m-black33;
+            }
+        }
+    }
+}
 // 上半部分表格带二级tab筛选
 .topTableHeight {
     .secondTabTable {
@@ -2296,7 +2309,7 @@ input:-internal-autofill-selected {
         left: 8px;
         right: 8px;
         padding-top: 18px;
-        background: #162738;
+        background: @m-black40;
     }
 }
 .ant-slider.formSlider {
@@ -2619,6 +2632,9 @@ input:-internal-autofill-selected {
             z-index: 2;
         }
     }
+    .ant-tabs-content-animated {
+        margin-left: 0 !important;
+    }
 }
 
 .watchMore {
@@ -2649,7 +2665,7 @@ input:-internal-autofill-selected {
     }
     .middle {
         text-align: center;
-        color: #FF2B2B;
+        color: @m-red11;
     }
     .right {
         text-align: right;

+ 21 - 0
src/assets/styles/theme.css

@@ -54,6 +54,8 @@
     --m-grey48: #171B1D;
     --m-grey49: #3C454B;
     --m-grey50: #ACB8C0;
+    --m-grey51: #354859;
+    --m-grey52: #1E304A;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -97,6 +99,10 @@
     --m-black37: #2794ff;
     --m-black38: #15293a;
     --m-black39: #171B1D;
+    --m-black40: #162738;
+    --m-black41: #0F1A25;
+    --m-black42: #162738;
+    --m-black43: #091a32;
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -165,6 +171,7 @@
 
     --m-yellow4: #3a2215;
     --m-yellow5: #fc9618;
+    --m-yellow6: #FC9618;
     
     --m-nodata: url("../images/nodata.png");
 
@@ -233,6 +240,8 @@
     --m-grey48: #171B1D;
     --m-grey49: #3C454B;
     --m-grey50: #ACB8C0;
+    --m-grey51: #354859;
+    --m-grey52: #1E304A;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -276,6 +285,10 @@
     --m-black37: #2794ff;
     --m-black38: #15293a;
     --m-black39: #171B1D;
+    --m-black40: #162738;
+    --m-black41: #0F1A25;
+    --m-black42: #162738;
+    --m-black43: #091a32;
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -343,6 +356,7 @@
 
     --m-yellow4: #3a2215;
     --m-yellow5: #fc9618;
+    --m-yellow6: #FC9618;
 
     --m-nodata: url("../images/nodata.png");
 
@@ -410,6 +424,8 @@
     --m-grey48: #FFFFFF;
     --m-grey49: #7A8A94;
     --m-grey50: #3C454B;
+    --m-grey51: #CCCCCC;
+    --m-grey52: #E4E8EE;
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;
@@ -452,6 +468,10 @@
     --m-black37: #73BAFF;
     --m-black38: #ECF2F5;
     --m-black39: #ECF2F5;
+    --m-black40: #F2F5F6;
+    --m-black41: #ffffff;
+    --m-black42: #DAE5EC;
+    --m-black43: #DEE8ED;
 
     --m-blue0: #5179E2;
     --m-blue0-hover: rgba(81, 121, 226, .8);
@@ -519,6 +539,7 @@
 
     --m-yellow4: #FFE8DB;
     --m-yellow5: #FFC277;
+    --m-yellow6: #FC9618;
 
     --m-nodata: url("../images/nodata_white.png");
 

+ 7 - 0
src/assets/styles/variables.less

@@ -63,6 +63,8 @@
 @m-grey48: var(--m-grey48);
 @m-grey49: var(--m-grey49);
 @m-grey50: var(--m-grey50);
+@m-grey51: var(--m-grey51);
+@m-grey52: var(--m-grey52);
 
 @m-black: #000000;
 @m-black0: var(--m-black0);
@@ -106,6 +108,10 @@
 @m-black37: var(--m-black37);
 @m-black38: var(--m-black38);
 @m-black39: var(--m-black39);
+@m-black40: var(--m-black40);
+@m-black41: var(--m-black41);
+@m-black42: var(--m-black42);
+@m-black43: var(--m-black43);
 
 @m-blue0: var(--m-blue0);
 @m-blue0-hover: var(--m-blue0-hover);
@@ -206,6 +212,7 @@
 @m-yellow3: #653f0d;
 @m-yellow4: var(--m-yellow4);
 @m-yellow5: var(--m-yellow5);
+@m-yellow6: var(--m-yellow6);
 
 @m-orange0: #F52929;
 

+ 29 - 45
src/views/market/spot_trade/spot_trade_order_transaction/components/chart/index.vue

@@ -1,50 +1,34 @@
 <template>
-  <!-- 交易图表  -->
-  <div class="chart-container">
-    <div class="chart-content"></div>
-    <div class="chart-tips">
-      <a-tabs class="chartTabs"
-              v-model:activeKey="activeKey"
-              @change="change">
-        <a-tab-pane key="1"
-                    ref="tabRef1"
-                    tab="卖挂">
-          <div class="chartRow"
-               v-for="(item, index) in sellList"
-               :key="index + '11'">
-            <div class="left">{{item.username}}</div>
-            <div class="middle">{{item.orderqty}}</div>
-            <div class="right">{{item.orderprice}}</div>
-          </div>
-        </a-tab-pane>
-        <a-tab-pane key="2"
-                    class="chartTabs"
-                    tab="买挂">
-          <div class="chartRow"
-               v-for="(item, index) in buyList"
-               :key="index + '11'">
-            <div class="left">{{item.username}}</div>
-            <div class="middle">{{item.orderqty}}</div>
-            <div class="right">{{item.orderprice}}</div>
-          </div>
-        </a-tab-pane>
-        <a-tab-pane key="3"
-                    class="chartTabs"
-                    tab="成交">
-          成交
-          <div class="chartRow"
-               v-for="(item, index) in tradedList"
-               :key="index + '11'">
-            <div class="left">{{formatTime(item.TS, 'hm')}}</div>
-            <div class="middle">{{item.PE}}</div>
-            <div class="right">{{item.Vol}}</div>
-          </div>
-        </a-tab-pane>
-      </a-tabs>
-      <div @click="watchMore"
-           class="watchMore">查看更多</div>
+    <!-- 交易图表  -->
+    <div class="chart-container">
+        <div class="chart-content"></div>
+        <div class="chart-tips">
+            <a-tabs class="chartTabs" v-model:activeKey="activeKey" @change="change">
+                <a-tab-pane key="1" ref="tabRef1" tab="卖挂">
+                    <div class="chartRow" v-for="(item, index) in sellList" :key="index + '11'">
+                        <div class="left">{{item.username}}</div>
+                        <div class="middle">{{item.orderqty}}</div>
+                        <div class="right">{{item.orderprice}}</div>
+                    </div>
+                </a-tab-pane>
+                <a-tab-pane key="2" tab="买挂">
+                    <div class="chartRow" v-for="(item, index) in buyList" :key="index + '11'">
+                        <div class="left">{{item.username}}</div>
+                        <div class="middle">{{item.orderqty}}</div>
+                        <div class="right">{{item.orderprice}}</div>
+                    </div>
+                </a-tab-pane>
+                <a-tab-pane key="3" tab="成交">
+                    <div class="chartRow" v-for="(item, index) in tradedList" :key="index + '11'">
+                        <div class="left">{{formatTime(item.TS, 'hm')}}</div>
+                        <div class="middle">{{item.PE}}</div>
+                        <div class="right">{{item.Vol}}</div>
+                    </div>
+                </a-tab-pane>
+            </a-tabs>
+            <div @click="watchMore" class="watchMore">查看更多</div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">

+ 173 - 150
src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_settlement/index.vue

@@ -1,97 +1,104 @@
 <template>
-  <!-- 交收-->
-  <Drawer :title="'交收'"
-          :placement="'right'"
-          class="bottom486"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed c_c_s_s">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <div class="formtop">
-            <div class="firstTitle">
-              <span>合约数量 10,</span>
-              <span>可交收数量 50 吨</span>
-            </div>
-            <div class="secondLine">
-              <div class="left">持有人/商品/仓库</div>
-              <div class="middle">升贴水/数量</div>
-              <div class="right">选择数量</div>
-            </div>
-            <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="checked"
-                              @change="change">
-              <div class="lineBar"
-                   v-for="(item, index) in tableList"
-                   :key="index + '11'">
-                <div class="line1">
-                  <div class>
-                    <a-checkbox :value="item.ladingbillid"></a-checkbox>
-                  </div>
-                  <div class="name">{{item.username}}</div>
+    <!-- 交收-->
+    <Drawer
+        :title="'交收'"
+        :placement="'right'"
+        class="bottom486"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed c_c_s_s">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <div class="formtop">
+                        <div class="firstTitle">
+                            <span>合约数量 10,</span>
+                            <span>可交收数量 50 吨</span>
+                        </div>
+                        <div class="secondLine">
+                            <div class="left">持有人/商品/仓库</div>
+                            <div class="middle">升贴水/数量</div>
+                            <div class="right">选择数量</div>
+                        </div>
+                        <a-checkbox-group
+                            class="commonCheckboxGroup"
+                            v-model:value="checked"
+                            @change="change"
+                        >
+                            <div
+                                class="lineBar"
+                                v-for="(item, index) in tableList"
+                                :key="index + '11'"
+                            >
+                                <div class="line1">
+                                    <div class>
+                                        <a-checkbox :value="item.ladingbillid"></a-checkbox>
+                                    </div>
+                                    <div class="name">{{item.username}}</div>
+                                </div>
+                                <div class="line2">
+                                    <div class="left">
+                                        <div>{{item.wrtypename}}</div>
+                                        <div>{{item.warehousename}}</div>
+                                    </div>
+                                    <div class="middle">
+                                        <div>{{item.pricemove}}</div>
+                                        <div>{{item.avalidqty}}{{item.enumdicname}}</div>
+                                    </div>
+                                    <div class="right">
+                                        <template
+                                            class="inputNumberBlock"
+                                            :class="isChecked(item.ladingbillid) ? '' : 'disabled'"
+                                        >
+                                            <a-input-number
+                                                class="dialogInput dialogInput34"
+                                                v-model:value="item.num"
+                                                style="width: 130px !important; height: 34px;"
+                                                :disabled="!isChecked(item.ladingbillid)"
+                                                :min="0"
+                                            ></a-input-number>
+                                            <MinusOutlined />
+                                            <PlusOutlined />
+                                        </template>
+                                    </div>
+                                </div>
+                            </div>
+                        </a-checkbox-group>
+                    </div>
                 </div>
-                <div class="line2">
-                  <div class="left">
-                    <div>{{item.wrtypename}}</div>
-                    <div>{{item.warehousename}}</div>
-                  </div>
-                  <div class="middle">
-                    <div>{{item.pricemove}}</div>
-                    <div>{{item.avalidqty}}{{item.enumdicname}}</div>
-                  </div>
-                  <div class="right">
-                    <template class="inputNumberBlock"
-                              :class="isChecked(item.ladingbillid) ? '' : 'disabled'">
-                      <a-input-number class="dialogInput dialogInput34"
-                                      v-model:value="item.num"
-                                      style="width: 100px !important; height: 34px;"
-                                      :disabled="!isChecked(item.ladingbillid)"
-                                      :min="0"></a-input-number>
-                      <MinusOutlined />
-                      <PlusOutlined />
-                    </template>
-                  </div>
+                <div class="fixedBtns">
+                    <div class="formbottom">
+                        <div class="line1">
+                            <div>
+                                <span>已点选数量</span>
+                                <span class="white">40吨</span>
+                                <span>,需合约数量</span>
+                                <span class="white">8</span>
+                            </div>
+                            <div class="yellow">升贴水1100</div>
+                        </div>
+                        <div class="line2">
+                            <div>点价合约</div>
+                            <div class="right">
+                                <div>C2109</div>
+                                <div>1398.00</div>
+                            </div>
+                        </div>
+                        <div class="line3">预估贷款:71,000.00</div>
+                    </div>
+
+                    <a-form-item class="btnCenter mt10">
+                        <a-button
+                            class="listedBtn"
+                            :loading="loading"
+                            :disabled="loading"
+                            @click="submit"
+                        >提交</a-button>
+                    </a-form-item>
                 </div>
-              </div>
-            </a-checkbox-group>
-          </div>
-          <div class="formbottom">
-            <div class="line1">
-              <div>
-                <span>已点选数量</span>
-                <span class="white">40吨</span>
-                <span>,需合约数量</span>
-                <span class="white">8</span>
-              </div>
-              <div class="yellow">升贴水1100</div>
-            </div>
-            <div class="line2">
-              <div>点价合约</div>
-              <div class="right">
-                <div>C2109</div>
-                <div>1398.00</div>
-              </div>
-            </div>
-            <div class="line3">预估贷款:71,000.00</div>
-          </div>
+            </a-form>
         </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">提交</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -195,15 +202,19 @@ export default defineComponent({
 
 <style lang="less" scoped>
 .c_c_s_s {
-    background: #162738;
+    background: @m-black40;
+    width: 100%;
+    height: 100%;
+    position: relative;
     .formBar {
         padding: 0;
+        height: calc(100% - 172px);
+        background: @m-black41;
         .formtop {
             width: 100%;
             padding: 0 20px;
             .flex;
             flex-direction: column;
-            background: #0f1a25;
             .firstTitle {
                 width: calc(100% + 40px);
                 height: 40px;
@@ -211,8 +222,8 @@ export default defineComponent({
                 margin-left: -20px;
                 padding: 0 20px;
                 font-size: 14px;
-                color: #ffffff;
-                border-bottom: 1px solid #162738;
+                color: @m-white6;
+                border-bottom: 1px solid @m-black42;
             }
             .secondLine {
                 width: 100%;
@@ -222,7 +233,7 @@ export default defineComponent({
                 > div {
                     flex: 1;
                     font-size: 14px;
-                    color: #7a8a94;
+                    color: @m-grey1;
                 }
                 .left {
                     text-align: left;
@@ -239,7 +250,7 @@ export default defineComponent({
                 min-height: 100px;
                 padding-left: 15px;
                 padding-right: 10px;
-                background: #102442;
+                background: @m-blue19;
                 margin-bottom: 10px;
                 .rounded-corners(5px);
                 .line1 {
@@ -248,8 +259,11 @@ export default defineComponent({
                     height: 40px;
                     line-height: 40px;
                     font-size: 16px;
-                    color: #ffffff;
-                    border-bottom: 1px solid #122d55;
+                    color: @m-white6;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    border-bottom: 1px solid @m-blue20;
                     > div {
                         align-self: center;
                         align-items: center;
@@ -263,36 +277,40 @@ export default defineComponent({
                     padding: 12px 0 14px 0;
                     display: inline-flex;
                     > div {
-                        flex: 1;
-                        max-width: 33.33%;
+                        flex: 2;
                     }
                     .left {
                         .flex;
                         flex-direction: column;
+                        max-width: 40%;
                         > div {
                             width: 100%;
                             height: 17px;
                             line-height: 17px;
-                            color: #ffffff;
+                            color: @m-white6;
                             font-size: 14px;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                            overflow: hidden;
                         }
                     }
                     .middle {
+                        flex: 1;
                         display: inline-flex;
                         justify-content: space-between;
                         padding: 0 10px;
                         font-size: 16px;
-                        color: #ffffff;
+                        color: @m-white6;
                         line-height: 34px;
                     }
                     .right {
                         .inputNumberBlock {
                             float: right;
                             display: block;
-                            width: 100px;
+                            width: 130px;
                             position: relative;
                             .anticon {
-                                color: #0d8aeb;
+                                color: @m-blue15;
                                 font-size: 15px;
                                 z-index: 2;
                                 line-height: 34px;
@@ -307,63 +325,68 @@ export default defineComponent({
                         }
                         .disabled {
                             .anticon {
-                                color: #354859;
+                                color: @m-grey51;
                             }
                         }
                     }
                 }
             }
         }
-        .formbottom {
+    }
+    .fixedBtns {
+        padding-top: 0;
+        left: 0;
+        right: 0;
+    }
+    .formbottom {
+        width: 100%;
+        .flex;
+        flex-direction: column;
+        background: @m-black40;
+        padding: 0 18px 0 20px;
+        .line1 {
             width: 100%;
-            .flex;
-            flex-direction: column;
-            background: #162738;
-            padding: 0 18px 0 20px;
-            .line1 {
-                width: 100%;
-                padding: 0 12px 0 16px;
-                height: 36px;
-                line-height: 36px;
-                display: inline-flex;
-                justify-content: space-between;
-                color: #7a8a94;
-                font-size: 14px;
+            padding: 0 12px 0 16px;
+            height: 36px;
+            line-height: 36px;
+            display: inline-flex;
+            justify-content: space-between;
+            color: @m-grey1;
+            font-size: 14px;
+        }
+        .line2 {
+            width: 100%;
+            height: 35px;
+            line-height: 34px;
+            padding-left: 15px;
+            padding-right: 10px;
+            background: @m-black43;
+            .rounded-corners(5px);
+            font-size: 14px;
+            color: @m-grey1;
+            display: inline-flex;
+            justify-content: space-between;
+            > div {
+                align-self: baseline;
+                align-items: baseline;
             }
-            .line2 {
-                width: 100%;
-                height: 35px;
-                line-height: 34px;
-                padding-left: 15px;
-                padding-right: 10px;
-                background: #091a32;
-                .rounded-corners(5px);
-                font-size: 14px;
-                color: #7a8a94;
+            .right {
                 display: inline-flex;
-                justify-content: space-between;
-                > div {
-                    align-self: baseline;
-                    align-items: baseline;
-                }
-                .right {
-                    display: inline-flex;
-                    color: #fc9618;
-                    div:last-child {
-                        font-size: 16px;
-                        margin-left: 2px;
-                    }
+                color: @m-yellow6;
+                div:last-child {
+                    font-size: 16px;
+                    margin-left: 2px;
                 }
             }
-            .line3 {
-                margin-top: 16px;
-                width: 100%;
-                height: 15px;
-                line-height: 15px;
-                font-size: 14px;
-                text-align: right;
-                color: #ffffff;
-            }
+        }
+        .line3 {
+            margin-top: 16px;
+            width: 100%;
+            height: 15px;
+            line-height: 15px;
+            font-size: 14px;
+            text-align: right;
+            color: @m-white6;
         }
     }
 }