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

src/assets/styles/mixin.less

@@ -858,6 +858,9 @@
 .mt20 {
     margin-top: 20px;
 }
+.mt25 {
+    margin-top: 25px;
+}
 .mt30 {
     margin-top: 30px;
 }
@@ -1509,7 +1512,7 @@ input:-internal-autofill-selected {
             margin-right: 2px;
             .ant-checkbox-inner {
                 background: #15202B;
-                border: 1px solid #2B3F52;
+                border: 1px solid @m-grey14;
                 border-radius: 3px;
             }
         }

src/assets/styles/symbol_no_color/demo_index.html

@@ -55,6 +55,54 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe66a;</span>
+                <div class="name">方案 (71)</div>
+                <div class="code-name">&amp;#xe66a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe625;</span>
+                <div class="name">快进</div>
+                <div class="code-name">&amp;#xe625;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe69b;</span>
+                <div class="name">图表</div>
+                <div class="code-name">&amp;#xe69b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">提示</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe659;</span>
+                <div class="name">关  闭</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe641;</span>
+                <div class="name">叉</div>
+                <div class="code-name">&amp;#xe641;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63c;</span>
+                <div class="name">交易所</div>
+                <div class="code-name">&amp;#xe63c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe60e;</span>
+                <div class="name">用户</div>
+                <div class="code-name">&amp;#xe60e;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xeb2c;</span>
                 <div class="name">树状图</div>
                 <div class="code-name">&amp;#xeb2c;</div>
@@ -276,9 +324,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1620268291007') format('woff2'),
-       url('iconfont.woff?t=1620268291007') format('woff'),
-       url('iconfont.ttf?t=1620268291007') format('truetype');
+  src: url('iconfont.woff2?t=1627805731690') format('woff2'),
+       url('iconfont.woff?t=1627805731690') format('woff'),
+       url('iconfont.ttf?t=1627805731690') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -305,6 +353,78 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-fangan"></span>
+            <div class="name">
+              方案 (71)
+            </div>
+            <div class="code-name">.icon-fangan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-kuaijin"></span>
+            <div class="name">
+              快进
+            </div>
+            <div class="code-name">.icon-kuaijin
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tubiao"></span>
+            <div class="name">
+              图表
+            </div>
+            <div class="code-name">.icon-tubiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tishi1"></span>
+            <div class="name">
+              提示
+            </div>
+            <div class="code-name">.icon-tishi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-guanbi"></span>
+            <div class="name">
+              关  闭
+            </div>
+            <div class="code-name">.icon-guanbi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-cha"></span>
+            <div class="name">
+              叉
+            </div>
+            <div class="code-name">.icon-cha
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiaoyisuo"></span>
+            <div class="name">
+              交易所
+            </div>
+            <div class="code-name">.icon-jiaoyisuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yonghu2"></span>
+            <div class="name">
+              用户
+            </div>
+            <div class="code-name">.icon-yonghu2
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-shuzhuangtu"></span>
             <div class="name">
               树状图
@@ -639,6 +759,70 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fangan"></use>
+                </svg>
+                <div class="name">方案 (71)</div>
+                <div class="code-name">#icon-fangan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-kuaijin"></use>
+                </svg>
+                <div class="name">快进</div>
+                <div class="code-name">#icon-kuaijin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tubiao"></use>
+                </svg>
+                <div class="name">图表</div>
+                <div class="code-name">#icon-tubiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tishi1"></use>
+                </svg>
+                <div class="name">提示</div>
+                <div class="code-name">#icon-tishi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+                <div class="name">关  闭</div>
+                <div class="code-name">#icon-guanbi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cha"></use>
+                </svg>
+                <div class="name">叉</div>
+                <div class="code-name">#icon-cha</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiaoyisuo"></use>
+                </svg>
+                <div class="name">交易所</div>
+                <div class="code-name">#icon-jiaoyisuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yonghu2"></use>
+                </svg>
+                <div class="name">用户</div>
+                <div class="code-name">#icon-yonghu2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shuzhuangtu"></use>
                 </svg>
                 <div class="name">树状图</div>

src/assets/styles/symbol_no_color/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2293216 */
-  src: url('iconfont.woff2?t=1620268291007') format('woff2'),
-       url('iconfont.woff?t=1620268291007') format('woff'),
-       url('iconfont.ttf?t=1620268291007') format('truetype');
+  src: url('iconfont.woff2?t=1627805731690') format('woff2'),
+       url('iconfont.woff?t=1627805731690') format('woff'),
+       url('iconfont.ttf?t=1627805731690') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,38 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-fangan:before {
+  content: "\e66a";
+}
+
+.icon-kuaijin:before {
+  content: "\e625";
+}
+
+.icon-tubiao:before {
+  content: "\e69b";
+}
+
+.icon-tishi1:before {
+  content: "\e65e";
+}
+
+.icon-guanbi:before {
+  content: "\e659";
+}
+
+.icon-cha:before {
+  content: "\e641";
+}
+
+.icon-jiaoyisuo:before {
+  content: "\e63c";
+}
+
+.icon-yonghu2:before {
+  content: "\e60e";
+}
+
 .icon-shuzhuangtu:before {
   content: "\eb2c";
 }

src/assets/styles/symbol_no_color/iconfont.json

@@ -6,6 +6,62 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "8594782",
+      "name": "方案 (71)",
+      "font_class": "fangan",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "2690757",
+      "name": "快进",
+      "font_class": "kuaijin",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
+    {
+      "icon_id": "6053147",
+      "name": "图表",
+      "font_class": "tubiao",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "8949031",
+      "name": "提示",
+      "font_class": "tishi1",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "7823874",
+      "name": "关  闭",
+      "font_class": "guanbi",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "9092042",
+      "name": "叉",
+      "font_class": "cha",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "5948242",
+      "name": "交易所",
+      "font_class": "jiaoyisuo",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "8965030",
+      "name": "用户",
+      "font_class": "yonghu2",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
       "icon_id": "5387669",
       "name": "树状图",
       "font_class": "shuzhuangtu",

src/assets/styles/variables.less

@@ -73,6 +73,9 @@
 @m-blue15: #0D8AEB;
 @m-blue16: #334c5c;
 @m-blue17: #1F3245;
+@m-blue18: #1b3356;
+@m-blue19: #102442;
+@m-blue20: #122d55;
 @body-bg: #e9eef3;
 @m-white0: #ffffff;
 @m-white0-hover: rgba(@m-white0, .8);

src/common/components/drawer/index.vue

@@ -92,6 +92,16 @@ export default defineComponent({
         width: 486px !important;
     }
 }
+.topHigh {
+    .position(fixed, 80px, 0, auto, auto);
+    width: 486px;
+    height: 580px;
+    background: transparent;
+    z-index: 10;
+    .ant-drawer-content-wrapper {
+        width: 580px !important;
+    }
+}
 .tradeDialog {
     .position(fixed, 116px, 0, auto, auto);
     width: 467px;

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

@@ -1,19 +1,89 @@
 <template>
-  <!-- 仓单贸易&仓单预售 融资-->
+    <!-- 仓单贸易&仓单预售 融资-->
 
-  <Drawer :title="'选择融资方案'"
-          :placement="'top'"
-          :visible="visible"
-          width="486px"
-          height="479px"
-          @cancel="update"
-          class="top financing">
-    <div class="delisting">
-      <div class="formBar">
-        下
-      </div>
-    </div>
-  </Drawer>
+    <Drawer
+        :title="'选择融资方案'"
+        :placement="'top'"
+        :visible="visible"
+        width="486px"
+        height="479px"
+        @cancel="update"
+        class="top 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">
+                <a-row class="firstRow">
+                    <a-col :span="7">铜供应链金融</a-col>
+                    <a-col :span="17">放款快</a-col>
+                </a-row>
+                <a-row class="secondRow">
+                    <a-col :span="7">铜杆帮你采</a-col>
+                    <a-col :span="10">
+                        <a-row class="middle">
+                            <a-col :span="7">30天</a-col>
+                            <a-col :span="10">30%</a-col>
+                            <a-col :span="7">11%</a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :span="7">
+                        <div class="settle">
+                            <div>日结</div>
+                            <div>1天起息</div>
+                        </div>
+                    </a-col>
+                </a-row>
+            </div>
+            <div class="contBar">
+                <a-row class="firstRow">
+                    <a-col :span="7">铜供应链金融</a-col>
+                    <a-col :span="17">放款快</a-col>
+                </a-row>
+                <a-row class="secondRow">
+                    <a-col :span="7">铜杆帮你采</a-col>
+                    <a-col :span="10">
+                        <a-row class="middle">
+                            <a-col :span="7">30天</a-col>
+                            <a-col :span="10">30%</a-col>
+                            <a-col :span="7">11%</a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :span="7">
+                        <div class="settle">
+                            <div>日结</div>
+                            <div>1天起息</div>
+                        </div>
+                    </a-col>
+                </a-row>
+            </div>
+            <div class="contBar">
+                <a-row class="firstRow">
+                    <a-col :span="7">铜供应链金融</a-col>
+                    <a-col :span="17">放款快</a-col>
+                </a-row>
+                <a-row class="secondRow">
+                    <a-col :span="7">铜杆帮你采</a-col>
+                    <a-col :span="10">
+                        <a-row class="middle">
+                            <a-col :span="7">30天</a-col>
+                            <a-col :span="10">30%</a-col>
+                            <a-col :span="7">11%</a-col>
+                        </a-row>
+                    </a-col>
+                    <a-col :span="7">
+                        <div class="settle">
+                            <div>日结</div>
+                            <div>1天起息</div>
+                        </div>
+                    </a-col>
+                </a-row>
+            </div>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -67,132 +137,79 @@ export default defineComponent({
 <style lang="less" scoped>
 .financing {
     z-index: 99;
-}
-.delisting {
-    width: 100%;
-    height: 100%;
-    .flex;
-    flex-direction: column;
-    .condition {
-        width: 100%;
-        height: 48px;
-        margin: 0 16px;
-        padding: 10px 0;
-        border-bottom: 1px solid @m-black6;
-        .inlineflex;
-        .conditionBtn {
-            align-self: center;
-            align-items: center;
-            border: 0;
-            min-width: 80px;
-            height: 28px;
-            line-height: 28px;
-            background: @m-black7;
-            .rounded-corners(3px);
-            font-size: 14px;
-            color: @m-blue0;
-            &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+    .financingCont {
+        padding: 10px 20px 50px;
+        .ant-row.f-t {
+            .ant-col {
+                font-size: 14px;
+                color: @m-grey1;
+                height: 35px;
+                line-height: 35px;
+            }
+            .ant-col:nth-child(2) {
+                text-align: center;
+            }
+            .ant-col:nth-child(3) {
+                text-align: right;
             }
         }
-        .conditionBtn + .conditionBtn {
-            margin-left: 10px;
+        .contBar {
+            margin-top: 10px;
+            width: 100%;
+            padding: 0 13px;
+            cursor: pointer;
+            .flex;
+            flex-direction: column;
+            background: @m-blue19;
+            border-radius: 5px;
+            .ant-row.firstRow {
+                border-bottom: 1px solid @m-blue20;
+                .ant-col {
+                    height: 40px;
+                    line-height: 40px;
+                    font-size: 16px;
+                    color: @m-white0;
+                }
+                .ant-col:nth-child(2) {
+                    text-align: right;
+                    color: @m-green0;
+                    font-size: 14px;
+                }
+            }
+            .ant-row.secondRow {
+                padding: 10px 0;
+                .ant-col {
+                    height: 40px;
+                    font-size: 14px;
+                }
+                .ant-col:first-child {
+                    color: @m-yellow1;
+                    line-height: 40px;
+                }
+                .ant-col:last-child {
+                    text-align: right;
+                    .settle {
+                        padding: 4px 0;
+                        height: 16px;
+                        line-height: 16px;
+                        color: @m-white0;
+                    }
+                }
+                .middle.ant-row {
+                    .ant-col {
+                        height: 40px;
+                        line-height: 40px;
+                        color: @m-white0;
+                    }
+                    .ant-col:nth-child(2) {
+                        text-align: center;
+                    }
+                    .ant-col:nth-child(3) {
+                        text-align: right;
+                    }
+                }
+            }
         }
     }
-    .formBar {
-        width: 100%;
-        flex: 1;
-        padding: 28px 16px 7px;
-    }
-}
-::v-deep.ant-slider.formSlider {
-    width: 260px;
-}
-::v-deep.ant-input-suffix {
-    position: absolute;
-    right: -25px;
-}
-.unit {
-    margin-left: 70px;
-    width: 260px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey1;
-    height: 14px;
-    line-height: 14px;
-}
-.listedBtn:first-child {
-    margin-left: -35px;
-}
-.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%) !important;
-    &:hover {
-        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%) !important;
-        color: @m-white0-hover;
-    }
-}
-.ml10 {
-    margin-left: 10px;
-}
-.ant-form.dialogForm .ant-row.ant-form-item {
-    margin-bottom: 14px;
-}
-.mt20 {
-    margin-top: 20px;
-}
-.mt-20 {
-    margin-top: -20px;
-}
-.labelTip {
-    font-size: 14px;
-    color: @m-blue16;
-    position: absolute;
-    top: 15px;
-    left: -80px;
-}
-.minusBtn,
-.plusBtn {
-    width: 15px;
-    height: 32px;
-    line-height: 32px;
-    font-size: 15px;
-    color: @m-blue15;
-    cursor: pointer;
-}
-.minusBtn {
-    position: absolute;
-    top: -6px;
-    left: 14px;
-    z-index: 1;
-}
-.plusBtn {
-    position: absolute;
-    top: -6px;
-    right: 14px;
-    z-index: 1;
-}
-.stepper {
-    padding-left: 30px;
-    padding-right: 30px;
-    text-align: center;
-    color: @m-yellow1;
-    font-size: 16px;
 }
 </style>;

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

@@ -1,126 +1,133 @@
 <template>
-  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
-  <Drawer :title="'摘牌'"
-          :placement="'top'"
-          :visible="visible"
-          width="486px"
-          height="479px"
-          @cancel="cancel"
-          class="top">
-    <div class="delisting">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <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-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="基差"
-                           v-if="isFloat()">
-                <span class="yellow">{{selectedRow.pricemove}}</span>
-              </a-form-item>
-              <a-form-item label="挂牌价格"
-                           v-if="!isFloat()">
-                <span class="yellow">{{selectedRow.fixedprice}}</span>
-              </a-form-item>
-              <a-row :gutter="24">
-                <a-col :span="24"></a-col>
-              </a-row>
-              <a-form-item label="挂牌数量">
-                <span class="white">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="融资方案"
-                           @click="showAction"
-                           name="case">
-                <a-input class="dialogInput"
-                         style="width: 260px"
-                         placeholder="请"
-                         v-model:value="formState.case" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           name="num">
-                <a-input-number class="dialogInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.num"
-                                :suffix="selectedRow.enumdicname" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider ::min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider" />
-                <div class="unit">
-                  <span>1</span>
-                  <span>{{selectedRow.orderqty}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item label="挂牌金额">
-                <span class="white">--</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          @click="submit">{{isBuy() ? '卖' : '买'}}出</a-button>
-                <a-button class="ml10 cancelBtn"
-                          @click="cancel">取消</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-    <ChooseFinance v-if="show"
-                   @cancel="showAction" />
-  </Drawer>
+    <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+    <Drawer
+        :title="'摘牌'"
+        :placement="'top'"
+        :visible="visible"
+        width="486px"
+        height="580px"
+        @cancel="cancel"
+        class="topHigh"
+    >
+        <div class="delisting">
+            <div class="formBar">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <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-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white">{{selectedRow.username}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="基差" v-if="isFloat()">
+                                <span class="yellow">{{selectedRow.pricemove}}</span>
+                            </a-form-item>
+                            <a-form-item label="挂牌价格" v-if="!isFloat()">
+                                <span class="yellow">{{selectedRow.fixedprice}}</span>
+                            </a-form-item>
+                            <a-row :gutter="24">
+                                <a-col :span="24"></a-col>
+                            </a-row>
+                            <a-form-item label="挂牌数量">
+                                <span
+                                    class="white"
+                                >{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" name="num" class="relative">
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.num"
+                                    :suffix="selectedRow.enumdicname"
+                                />
+                                <div class="labelTip">（10吨起）</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-10">
+                            <a-form-item>
+                                <a-slider
+                                    ::min="0"
+                                    v-model:value="formState.num"
+                                    :max="selectedRow.orderqty"
+                                    class="formSlider"
+                                />
+                                <div class="unit">
+                                    <span>1</span>
+                                    <span>{{selectedRow.orderqty}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-10">
+                            <a-form-item label="融资方案" name="case">
+                                <div class="way">
+                                    <div class="left">铜供应链金融-铜杆帮你采-30天-10%-11%-按日结息-1天起息</div>
+                                    <div class="right" @click="showAction">
+                                        <svg class="icon svg-icon" aria-hidden="true">
+                                            <use xlink:href="#icon-fangan" />
+                                        </svg>
+                                    </div>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
 
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌金额">
+                                <span class="white">--</span>
+                                <span class="need">（需履约保证金5040.00）</span>
+                                <div class="tip">可用资金：10000.00</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt25">
+                            <a-form-item class="tc">
+                                <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>
+        </div>
+        <ChooseFinance v-if="show" @cancel="showAction" />
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -275,6 +282,47 @@ export default defineComponent({
         flex: 1;
         padding: 28px 16px 7px;
     }
+    .need {
+        color: @m-grey0;
+        font-size: 12px;
+        margin-left: 10px;
+    }
+    .tip {
+        .position(absolute, 20px, auto, auto, 0);
+        font-size: 12px;
+        z-index: 10;
+        color: @m-red1;
+    }
+    .way {
+        display: inline-flex;
+        width: 300px;
+        overflow: hidden;
+        background: @m-grey21;
+        border: 1px solid @m-grey14;
+        .rounded-corners(3px);
+        .left {
+            width: 260px;
+            .flex;
+            line-height: 25px;
+            padding: 5px;
+            color: @m-white0;
+            font-size: 14px;
+        }
+        .right {
+            width: 40px;
+            height: 60px;
+            background: @m-blue18;
+            border: 1px solid @m-blue0;
+            .rounded-corners(3px);
+            .flex;
+            justify-content: center;
+            .icon {
+                align-self: center;
+                align-items: center;
+                font-size: 24px;
+            }
+        }
+    }
 }
 ::v-deep.ant-slider.formSlider {
     width: 260px;
@@ -327,8 +375,8 @@ export default defineComponent({
 .mt20 {
     margin-top: 20px;
 }
-.mt-20 {
-    margin-top: -20px;
+.mt-10 {
+    margin-top: -10px;
 }
 .labelTip {
     font-size: 14px;

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_floating_price/index.vue

@@ -1,25 +1,27 @@
 <template>
-  <!-- 仓单预售 浮动价预售-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"></a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单预售 浮动价预售-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        ></a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_price/index.vue

@@ -1,25 +1,27 @@
 <template>
-  <!-- 仓单预售 一口价预售-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 444px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"></a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单预售 一口价预售-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        ></a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_floating_price/index.vue

@@ -1,25 +1,27 @@
 <template>
-  <!-- 仓单贸易 浮动价挂牌-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"></a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单贸易 浮动价挂牌-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        ></a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_price/index.vue

@@ -1,25 +1,27 @@
 <template>
-  <!-- 仓单贸易 一口价挂牌-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 444px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"></a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 仓单贸易 一口价挂牌-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        ></a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">