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

src/assets/styles/mixin.less

@@ -2127,8 +2127,8 @@ input:-internal-autofill-selected {
             .ant-table-thead {
                 tr {
                     th {
-                        background: #10251D;
-                        color: #556772;
+                        background: @m-green1;
+                        color: @m-grey17;
                     }
                 }
             }
@@ -2139,7 +2139,7 @@ input:-internal-autofill-selected {
             .ant-table-thead {
                 tr {
                     th {
-                        background: #271112;
+                        background: @m-red2;
                     }
                 }
             }

src/assets/styles/theme.css

@@ -59,6 +59,11 @@
     --m-grey53: #2C3842;
     --m-grey54: #2C3842;
     --m-grey55: #435564;
+    
+    --m-grey56: #516476;
+    --m-grey57: #869CA9;
+    --m-grey58: #3a454f;
+    --m-grey59: #2C3842;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -150,6 +155,8 @@
     --m-blue31-hover: rgba(38, 72, 124, .8);
     --m-blue32: #29538c;
     --m-blue32-hover: rgba(41, 83, 140, .8);
+    
+    --m-blue33: #3a87f7;
 
     --body-bg: #e9eef3;
     --m-white0: #ffffff;
@@ -176,6 +183,8 @@
     --m-yellow5: #fc9618;
     --m-yellow6: #FC9618;
     
+    --m-yellow7: #F39730;
+    
     --m-nodata: url("../images/nodata.png");
 
     --m-tabbg: url("../images/tabbg.png");
@@ -248,6 +257,11 @@
     --m-grey53: #2C3842;
     --m-grey54: #2C3842;
     --m-grey55: #435564;
+    
+    --m-grey56: #516476;
+    --m-grey57: #869CA9;
+    --m-grey58: #3a454f;
+    --m-grey59: #2C3842;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -338,6 +352,8 @@
     --m-blue31-hover: rgba(38, 72, 124, .8);
     --m-blue32: #29538c;
     --m-blue32-hover: rgba(41, 83, 140, .8);
+    
+    --m-blue33: #3a87f7;
 
     --body-bg: #e9eef3;
     --m-white0: #ffffff;
@@ -363,7 +379,8 @@
     --m-yellow4: #3a2215;
     --m-yellow5: #fc9618;
     --m-yellow6: #FC9618;
-
+    
+    --m-yellow7: #F39730;
     --m-nodata: url("../images/nodata.png");
 
     --m-tabbg: url("../images/tabbg.png");
@@ -435,6 +452,11 @@
     --m-grey53: #F6F8FA;
     --m-grey54: #B9D2E0;
     --m-grey55: #ACBBC5;
+    
+    --m-grey56: #5179E2;
+    --m-grey57: #7A8A94;
+    --m-grey58: #dbe7ef;
+    --m-grey59: #090a0a;
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;
@@ -524,6 +546,8 @@
     --m-blue31-hover: rgba(81, 121, 226, .8);
     --m-blue32: #5179E2;
     --m-blue32-hover: rgba(81, 121, 226, .8);
+     
+     --m-blue33: #ffffff;
 
     --body-bg: #FFFFFF;
     --m-white0: #ffffff;
@@ -549,6 +573,8 @@
     --m-yellow4: #FFE8DB;
     --m-yellow5: #FFC277;
     --m-yellow6: #FC9618;
+    
+    --m-yellow7: #FFFFFF;
 
     --m-nodata: url("../images/nodata_white.png");
 

src/assets/styles/variables.less

@@ -69,6 +69,11 @@
 @m-grey54: var(--m-grey54);
 @m-grey55: var(--m-grey55);
 
+@m-grey56: var(--m-grey56);
+@m-grey57: var(--m-grey57);
+@m-grey58: var(--m-grey58);
+@m-grey59: var(--m-grey59);
+
 @m-black: #000000;
 @m-black0: var(--m-black0);
 @m-black1: var(--m-black1);
@@ -160,6 +165,7 @@
 @m-blue31-hover: var(--m-blue31-hover);
 @m-blue32: var(--m-blue32);
 @m-blue32-hover: var(--m-blue32-hover);
+@m-blue33: var(--m-blue33);
 
 @body-bg: #e9eef3;
 @m-white0: var(--m-white0);
@@ -216,6 +222,7 @@
 @m-yellow4: var(--m-yellow4);
 @m-yellow5: var(--m-yellow5);
 @m-yellow6: var(--m-yellow6);
+@m-yellow7: var(--m-yellow7);
 
 @m-orange0: #F52929;
 

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/components/bargain_detail/index.vue

@@ -1,34 +1,40 @@
 <template>
-  <!-- 现货仓单 议价 议价单 -->
-  <Drawer :title="'议价单'"
-          :placement="'bottom'"
-          :visible="visible"
-          @cancel="cancel"
-          width="566px"
-          height="405px">
-    <a-table :columns="columns"
-             class="expandLeftTable"
-             :pagination="false"
-             :expandIcon="expandIcon"
-             :loading="loading"
-             :expandIconAsCell="false"
-             rowKey="applyprice"
-             :data-source="tableList">
-    </a-table>
-    <div>
-
-      <a-button class="ml10 cancelBtn"
-                v-if="isMy()"
-                @click="cancelAction">撤销</a-button>
-      <template v-else>
-        <a-button class="listedBtn"
-                  @click="submit">确认</a-button>
-        <a-button class="ml10 cancelBtn"
-                  @click="refuse">拒绝</a-button>
-      </template>
-
-    </div>
-  </Drawer>
+    <!-- 现货仓单 议价 议价单 -->
+    <Drawer
+        :title="'议价单'"
+        :placement="'right'"
+        class="delistingBottom"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <a-form class="inlineForm dialogForm">
+                <div class="formBar">
+                    <a-table
+                        :columns="columns"
+                        class="dialogTable dialogTable2"
+                        :pagination="false"
+                        :expandIcon="expandIcon"
+                        :loading="loading"
+                        :expandIconAsCell="false"
+                        rowKey="applyprice"
+                        :data-source="tableList"
+                    ></a-table>
+                </div>
+                <a-row :gutter="24" type="flex" justify="center">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="cancelBtn" v-if="isMy()" @click="cancelAction">撤销</a-button>
+                            <template v-else>
+                                <a-button class="listedBtn ml10" @click="submit">确认</a-button>
+                                <a-button class="ml10 cancelBtn" @click="refuse">拒绝</a-button>
+                            </template>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -124,6 +130,12 @@ export default defineComponent({
     .flex;
     flex-direction: column;
     overflow: hidden;
+    .ant-form {
+        height: 100%;
+        .formBar {
+            height: calc(100% - 70px);
+        }
+    }
     .condition {
         width: 100%;
         height: 48px;
@@ -151,61 +163,4 @@ export default defineComponent({
         }
     }
 }
-
-::v-deep.formProgress {
-    width: 140px;
-    // height: 3px;
-    // .rounded-corners(2px);
-    margin-left: 70px;
-    .ant-progress-outer {
-        margin-right: 0;
-        padding-right: 0;
-        .ant-progress-inner {
-            background: @m-grey14;
-            .rounded-corners(2px);
-            .ant-progress-bg {
-                height: 3px !important;
-                border-radius: 2px !important;
-                background-color: @m-blue0;
-            }
-        }
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
-.unit {
-    margin-left: 80px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey41;
-    height: 14px;
-    line-height: 14px;
-}
-.listedBtn {
-    width: 120px;
-    height: 30px;
-    line-height: 30px;
-    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-    border-radius: 3px;
-    color: @m-white0;
-    font-size: 14px;
-    text-align: center;
-    border: 0;
-    &:hover {
-        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.cancelBtn:extend(.listedBtn) {
-    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-    &:hover {
-        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.ml10 {
-    margin-left: 10px;
-}
 </style>;

src/views/order/spot_warran/components/spot_warrant_bargain/components/bargain_detail/index.vue

@@ -1,34 +1,40 @@
 <template>
-  <!-- 现货仓单 议价 议价单 -->
-  <Drawer :title="'议价单'"
-          :placement="'bottom'"
-          :visible="visible"
-          @cancel="cancel"
-          width="566px"
-          height="405px">
-    <a-table :columns="columns"
-             class="expandLeftTable"
-             :pagination="false"
-             :expandIcon="expandIcon"
-             :loading="loading"
-             :expandIconAsCell="false"
-             rowKey="applyprice"
-             :data-source="tableList">
-    </a-table>
-    <div>
-
-      <a-button class="ml10 cancelBtn"
-                v-if="isMy()"
-                @click="cancelAction">撤销</a-button>
-      <template v-else>
-        <a-button class="listedBtn"
-                  @click="submit">确认</a-button>
-        <a-button class="ml10 cancelBtn"
-                  @click="refuse">拒绝</a-button>
-      </template>
-
-    </div>
-  </Drawer>
+    <!-- 现货仓单 议价 议价单 -->
+    <Drawer
+        :title="'议价单'"
+        :placement="'right'"
+        class="delistingBottom"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <a-form class="inlineForm dialogForm">
+                <div class="formBar">
+                    <a-table
+                        :columns="columns"
+                        class="dialogTable dialogTable2"
+                        :pagination="false"
+                        :expandIcon="expandIcon"
+                        :loading="loading"
+                        :expandIconAsCell="false"
+                        rowKey="applyprice"
+                        :data-source="tableList"
+                    >></a-table>
+                </div>
+                <a-row :gutter="24" type="flex" justify="center">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="cancelBtn" v-if="isMy()" @click="cancelAction">撤销</a-button>
+                            <template v-else>
+                                <a-button class="listedBtn ml10" @click="submit">确认</a-button>
+                                <a-button class="ml10 cancelBtn" @click="refuse">拒绝</a-button>
+                            </template>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -124,6 +130,12 @@ export default defineComponent({
     .flex;
     flex-direction: column;
     overflow: hidden;
+    .ant-form {
+        height: 100%;
+        .formBar {
+            height: calc(100% - 70px);
+        }
+    }
     .condition {
         width: 100%;
         height: 48px;
@@ -151,61 +163,4 @@ export default defineComponent({
         }
     }
 }
-
-::v-deep.formProgress {
-    width: 140px;
-    // height: 3px;
-    // .rounded-corners(2px);
-    margin-left: 70px;
-    .ant-progress-outer {
-        margin-right: 0;
-        padding-right: 0;
-        .ant-progress-inner {
-            background: @m-grey14;
-            .rounded-corners(2px);
-            .ant-progress-bg {
-                height: 3px !important;
-                border-radius: 2px !important;
-                background-color: @m-blue0;
-            }
-        }
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
-.unit {
-    margin-left: 80px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey41;
-    height: 14px;
-    line-height: 14px;
-}
-.listedBtn {
-    width: 120px;
-    height: 30px;
-    line-height: 30px;
-    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-    border-radius: 3px;
-    color: @m-white0;
-    font-size: 14px;
-    text-align: center;
-    border: 0;
-    &:hover {
-        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.cancelBtn:extend(.listedBtn) {
-    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-    &:hover {
-        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.ml10 {
-    margin-left: 10px;
-}
 </style>;

src/views/setting/friends/index.vue

@@ -135,9 +135,9 @@ export default defineComponent({
         width: 100%;
         height: 40px;
         line-height: 40px;
-        color: #869ca9;
+        color: @m-grey57;
         font-size: 14px;
-        border-bottom: 1px solid #3b4651;
+        border-bottom: 1px solid @m-grey58;
         .flex;
         justify-content: space-between;
         .left {
@@ -148,17 +148,20 @@ export default defineComponent({
         .right {
             padding-right: 10px;
             .icon {
-                color: #f39730;
+                color: @m-yellow7;
                 font-size: 16px;
+                height: 40px;
+                line-height: 40px;
+                display: none;
             }
             .addFriBtn {
                 display: inline-block;
                 cursor: pointer;
                 width: 80px;
                 height: 26px;
-                border: 1px solid #3a87f7;
+                border: 1px solid @m-blue0;
                 .rounded-corners(13px);
-                color: #3a87f7;
+                color: @m-blue0;
                 font-size: 14px;
                 line-height: 24px;
                 text-align: center;
@@ -166,9 +169,26 @@ export default defineComponent({
         }
     }
     .item:hover {
-        background: #516476;
+        background: @m-grey56;
         .rounded-corners(5px);
-        color: #ffffff;
+        color: @m-white0;
+        .addFriBtn {
+            border: 1px solid @m-blue33;
+            color: @m-blue33;
+        }
+        .right {
+            .icon {
+                display: block;
+            }
+        }
+    }
+    .searchFriendInput {
+        border: 1px solid @m-grey59;
+        .ant-input-wrapper .searchFriendInput {
+            border: none;
+            height: 28px;
+            box-shadow: none !important;
+        }
     }
 }
 </style