合并代码

src/assets/styles/mixin.less

@@ -1867,7 +1867,6 @@ input:-internal-autofill-selected {
         }
     }
 }
-
 .tc {
     text-align: center;
 }

src/assets/styles/theme.css

@@ -67,6 +67,8 @@
     --m-grey60: #7a8a94;
     --m-grey61: #08131F;
     --m-grey62: #08131F;
+    --m-grey63: #08131F;
+    --m-grey64: #15202B;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -115,6 +117,7 @@
     --m-black42: #162738;
     --m-black43: #091a32;
     --m-black44: #1B2F41;
+    --m-black45: #10202F;
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -158,9 +161,10 @@
     --m-blue31: #26487c;
     --m-blue31-hover: rgba(38, 72, 124, .8);
     --m-blue32: #29538c;
-    --m-blue32-hover: rgba(41, 83, 140, .8);
-    
+    --m-blue32-hover: rgba(41, 83, 140, .8);  
     --m-blue33: #3a87f7;
+    --m-blue34: #102442;
+    --m-blue35: #18345C;
 
     --body-bg: #e9eef3;
     --m-white0: #ffffff;
@@ -269,6 +273,8 @@
     --m-grey60: #7a8a94;
     --m-grey61: #08131F;
     --m-grey62: #08131F;
+    --m-grey63: #08131F;
+    --m-grey64: #15202B;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -317,6 +323,7 @@
     --m-black42: #162738;
     --m-black43: #091a32;
     --m-black44: #1B2F41;
+    --m-black45: #10202F;
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -360,8 +367,9 @@
     --m-blue31-hover: rgba(38, 72, 124, .8);
     --m-blue32: #29538c;
     --m-blue32-hover: rgba(41, 83, 140, .8);
-    
     --m-blue33: #3a87f7;
+    --m-blue34: #102442;
+    --m-blue35: #18345C;
 
     --body-bg: #e9eef3;
     --m-white0: #ffffff;
@@ -468,6 +476,8 @@
     --m-grey60: #808E97;
     --m-grey61: #F6F8FA;
     --m-grey62: #ffffff;
+    --m-grey63: #F6F8FA;
+    --m-grey64: #FFFFFF;
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;
@@ -515,6 +525,7 @@
     --m-black42: #DAE5EC;
     --m-black43: #DEE8ED;
     --m-black44: #ebf1f5;
+    --m-black45: #D6E0F0;
 
     --m-blue0: #5179E2;
     --m-blue0-hover: rgba(81, 121, 226, .8);
@@ -558,8 +569,9 @@
     --m-blue31-hover: rgba(81, 121, 226, .8);
     --m-blue32: #5179E2;
     --m-blue32-hover: rgba(81, 121, 226, .8);
-     
-     --m-blue33: #ffffff;
+    --m-blue33: #ffffff;
+    --m-blue34: #ECF2F5;
+    --m-blue35: #D2DAEF;
 
     --body-bg: #FFFFFF;
     --m-white0: #ffffff;

src/assets/styles/variables.less

@@ -76,6 +76,8 @@
 @m-grey60: var(--m-grey60);
 @m-grey61: var(--m-grey61);
 @m-grey62: var(--m-grey62);
+@m-grey63: var(--m-grey63);
+@m-grey64: var(--m-grey64);
 
 @m-black: #000000;
 @m-black0: var(--m-black0);
@@ -124,6 +126,7 @@
 @m-black42: var(--m-black42);
 @m-black43: var(--m-black43);
 @m-black44: var(--m-black44);
+@m-black45: var(--m-black45);
 
 @m-blue0: var(--m-blue0);
 @m-blue0-hover: var(--m-blue0-hover);
@@ -170,6 +173,8 @@
 @m-blue32: var(--m-blue32);
 @m-blue32-hover: var(--m-blue32-hover);
 @m-blue33: var(--m-blue33);
+@m-blue34: var(--m-blue34);
+@m-blue35: var(--m-blue35);
 
 @body-bg: #e9eef3;
 @m-white0: var(--m-white0);

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/friend.vue

@@ -1,46 +1,46 @@
 <template>
-  <!--选择朋友-->
-  <Drawer :title="'选择朋友'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <a-spin :spinning="loading">
-      <div class="listed">
-        <a-form class="inlineForm dialogForm">
-          <a-input-search placeholder="搜索朋友编码或名称"
-                          class="searchFriendInput noSuffixInput"
-                          enter-button
-                          v-model:value="searchValue"
-                          @search="handleSearch">
-            <template #prefix>
-              <SearchOutlined />
-            </template>
-          </a-input-search>
-          <div class="formBar">
-            <!-- <a-checkbox-group class="commonCheckboxGroup"> -->
-            <div class="item"
-                 v-for="(item, index) in getViewFriends()"
-                 :key="index + '11'">
-              <a-checkbox v-model:checked="item.checked">
-                <span>{{item.frienduserid}} {{ item.friendname }}</span>
-              </a-checkbox>
+    <!--选择朋友-->
+    <Drawer :title="'选择朋友'" :placement="'right'" :visible="visible" @cancel="cancel" class="top486">
+        <a-spin :spinning="loading">
+            <div class="listed">
+                <a-form class="inlineForm dialogForm">
+                    <a-input-search
+                        placeholder="搜索朋友编码或名称"
+                        class="searchFriendInput noSuffixInput"
+                        enter-button
+                        v-model:value="searchValue"
+                        @search="handleSearch"
+                    >
+                        <template #prefix>
+                            <SearchOutlined />
+                        </template>
+                    </a-input-search>
+                    <div class="formBar ant-checkbox-group commonCheckboxGroup whitebgCheckbox">
+                        <!-- <a-checkbox-group class="commonCheckboxGroup"> -->
+                        <div class="ant-checkbox-wrapper" style="width: 100%">
+                            <div
+                                class="item"
+                                v-for="(item, index) in getViewFriends()"
+                                :key="index + '11'"
+                            >
+                                <a-checkbox v-model:checked="item.checked">
+                                    <span class="txt">{{item.frienduserid}} {{ item.friendname }}</span>
+                                </a-checkbox>
+                            </div>
+                        </div>
+                        <!-- </a-checkbox-group> -->
+                    </div>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="fixedBtns">
+                            <a-form-item class="btnCenter">
+                                <a-button class="listedBtn" @click="submit">确定</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
             </div>
-            <!-- </a-checkbox-group> -->
-          </div>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="fixedBtns">
-              <a-form-item class="btnCenter">
-                <a-button class="listedBtn"
-                          @click="submit">确定</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </a-spin>
-  </Drawer>
+        </a-spin>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -133,15 +133,22 @@ export default defineComponent({
         height: calc(100% - 120px);
         padding: 0 20px 0 13px;
         margin-top: 16px;
-        background: #08131f;
-        border: 1px solid #10202f;
+        background: @m-grey63;
+        border: 1px solid @m-black45;
         .item {
             width: 100%;
             height: 50px;
             line-height: 50px;
-            border-bottom: 1px solid #10202f;
+            border-bottom: 1px solid @m-black45;
             font-size: 16px;
-            color: #ffffff;
+            color: @m-white6;
+        }
+    }
+}
+.ant-checkbox-group.commonCheckboxGroup {
+    .ant-checkbox-wrapper {
+        span.txt {
+            color: @m-white11;
         }
     }
 }

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/index.vue

@@ -1,131 +1,123 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
-  <Drawer :title="'挂牌求购'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top">
-    <div class="post_buying">
-      <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">
-                <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-col :span="24">
-              <a-form-item label="挂牌价格"
-                           name="FixedPrice">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.FixedPrice" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.OrderQty" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
+    <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
+    <Drawer :title="'挂牌求购'" :placement="'right'" :visible="visible" @cancel="cancel" class="top486">
+        <div class="post_buying">
+            <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">
+                                <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-col :span="24">
+                            <a-form-item label="挂牌价格" name="FixedPrice">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.FixedPrice"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量" name="OrderQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.OrderQty"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="起摘数量"
-                           name="delistingQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.delistingQty"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金"
-                           name="margin">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.margin"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">%</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌有效期"
-                           name="DeliveryMonth">
-                <a-date-picke style="width: 260px"
-                              v-model:value="formState.DeliveryMonth"
-                              :allowClear="false"
-                              class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="起摘数量" name="delistingQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.delistingQty"
+                                    :min="0"
+                                    style="width: 260px"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金" name="margin">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.margin"
+                                    :min="0"
+                                    style="width: 260px"
+                                />
+                                <span class="input-enumdicname">%</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌有效期" name="DeliveryMonth">
+                                <a-date-picker
+                                    style="width: 260px"
+                                    v-model:value="formState.DeliveryMonth"
+                                    :allowClear="false"
+                                    class="commonDatePicker dialogDatePicker"
+                                />
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24"
-                   @click="openPermance">
-              <a-form-item label="履约方式">
-                <span class="white ml8">选择履约模板</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   @click="openFriend">
-              <a-form-item label="指定朋友">
-                <span class="white ml8">选择朋友</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌金额">
-                <span class="white ml8">55555</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金">
-                <span class="white ml8">55555</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">55555</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                        <a-col :span="24" @click="openPermance">
+                            <a-form-item label="履约方式">
+                                <span class="white ml8">选择履约模板</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" @click="openFriend">
+                            <a-form-item label="指定朋友">
+                                <span class="white ml8">选择朋友</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌金额">
+                                <span class="white ml8">55555</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金">
+                                <span class="white ml8">55555</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">55555</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" @click="submit">买入</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        @click="submit">买入</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance v-if="showPermance" @cancel="choosePermance" @update="choosePermance" />
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/permancePlanTmp.vue

@@ -1,43 +1,36 @@
 <template>
-  <!--选择履约模板-->
-  <Drawer :title="'选择履约模板'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <span class="add-permance"
-          @click="open">
-      <svg class="icon svg-icon"
-           aria-hidden="true">
-        <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
-      </svg>
-    </span>
-    <a-spin :spinning="loading">
-      <div class="moduleContent">
-        <div class="itemBar"
-             v-for="item in tableList"
-             :key="item.autoid">
-          <div class="itemName">{{item.templatename}}</div>
-          <div class="rulesCont">
-            <a-row>
-              <a-col :span="24"
-                     class="ruleCol">
-                <div class="line"
-                     v-for="sub in item.LstStep"
-                     :key="sub.autoid">
-                  <div class="name">{{sub.steptypename}}</div>
-                  <div class="time">{{sub.stepdate}}</div>
+    <!--选择履约模板-->
+    <Drawer
+        :title="'选择履约模板'"
+        :placement="'right'"
+        :visible="visible"
+        @cancel="cancel"
+        class="top486"
+    >
+        <span class="add-permance" @click="open">
+            <svg class="icon svg-icon" aria-hidden="true">
+                <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
+            </svg>
+        </span>
+        <a-spin :spinning="loading">
+            <div class="moduleContent">
+                <div class="itemBar" v-for="item in tableList" :key="item.autoid">
+                    <div class="itemName">{{item.templatename}}</div>
+                    <div class="rulesCont">
+                        <a-row>
+                            <a-col :span="24" class="ruleCol">
+                                <div class="line" v-for="sub in item.LstStep" :key="sub.autoid">
+                                    <div class="name">{{sub.steptypename}}</div>
+                                    <div class="time">{{sub.stepdate}}</div>
+                                </div>
+                            </a-col>
+                        </a-row>
+                    </div>
                 </div>
-              </a-col>
-            </a-row>
-          </div>
-        </div>
-      </div>
-    </a-spin>
-  </Drawer>
-  <Add v-if="show"
-       @cancel="close"
-       @update="close" />
+            </div>
+        </a-spin>
+    </Drawer>
+    <Add v-if="show" @cancel="close" @update="close" />
 </template>
 
 <script lang="ts">
@@ -85,6 +78,7 @@ export default defineComponent({
 });
 </script>
 
+
 <style lang="less" scoped>
 .add-permance {
     position: absolute;
@@ -106,16 +100,40 @@ export default defineComponent({
         margin-bottom: 10px;
         .flex;
         flex-direction: column;
-        background: #102442;
+        background: @m-blue34;
         .rounded-corners(5px);
         .itemName {
             width: 100%;
             height: 40px;
             line-height: 40px;
-            border-bottom: 1px solid #122d55;
-            color: #ffffff;
+            border-bottom: 1px solid @m-blue20;
+            color: @m-white11;
             font-size: 16px;
         }
     }
 }
+/*滚动条样式*/
+::-webkit-scrollbar {
+    //width: 10px;
+    height: 4px;
+}
+/* 滚动的滑块 */
+::-webkit-scrollbar-thumb {
+    border-radius: 2px;
+    background-color: @m-blue35;
+}
+/* 滚动条两端的按钮 */
+::-webkit-scrollbar-button {
+    background-color: transparent;
+    display: none;
+}
+/* 内层滚动槽 */
+::-webkit-scrollbar-track-piece {
+    background-color: transparent;
+}
+/* 边角 */
+::-webkit-scrollbar-corner,
+.el-input::-webkit-scrollbar-corner {
+    background-color: @m-blue35;
+}
 </style>