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

src/assets/styles/symbol_no_color/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe70a;</span>
+                <div class="name">切换</div>
+                <div class="code-name">&amp;#xe70a;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe653;</span>
                 <div class="name">表单 列表-03</div>
                 <div class="code-name">&amp;#xe653;</div>
@@ -372,9 +378,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1630590563275') format('woff2'),
-       url('iconfont.woff?t=1630590563275') format('woff'),
-       url('iconfont.ttf?t=1630590563275') format('truetype');
+  src: url('iconfont.woff2?t=1632896613541') format('woff2'),
+       url('iconfont.woff?t=1632896613541') format('woff'),
+       url('iconfont.ttf?t=1632896613541') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -401,6 +407,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-B"></span>
+            <div class="name">
+              切换
+            </div>
+            <div class="code-name">.icon-B
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-biaodanliebiao-"></span>
             <div class="name">
               表单 列表-03
@@ -879,6 +894,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-B"></use>
+                </svg>
+                <div class="name">切换</div>
+                <div class="code-name">#icon-B</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-biaodanliebiao-"></use>
                 </svg>
                 <div class="name">表单 列表-03</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=1630590563275') format('woff2'),
-       url('iconfont.woff?t=1630590563275') format('woff'),
-       url('iconfont.ttf?t=1630590563275') format('truetype');
+  src: url('iconfont.woff2?t=1632896613541') format('woff2'),
+       url('iconfont.woff?t=1632896613541') format('woff'),
+       url('iconfont.ttf?t=1632896613541') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-B:before {
+  content: "\e70a";
+}
+
 .icon-biaodanliebiao-:before {
   content: "\e653";
 }

src/assets/styles/symbol_no_color/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "13479212",
+      "name": "切换",
+      "font_class": "B",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
+    },
+    {
       "icon_id": "13965701",
       "name": "表单 列表-03",
       "font_class": "biaodanliebiao-",

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/components/post_buying/index.vue

@@ -1,141 +1,135 @@
 <template>
-  <!-- 挂牌求购 -->
-  <Drawer :title="isBuy() ? '挂牌求购' : '挂牌卖出' "
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top">
-    <div class="title_right">
-      <span class="tline"></span>
-      <svg class="icon svg-icon"
-           aria-hidden="true">
-        <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
-      </svg>
-      <span @click="changeDirection">{{isBuy() ? '卖出' : '求购'}}</span>
-    </div>
-    <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>
-                <a-radio-group class="commonRadioGroup"
-                               v-model:value="formState.priceType">
-                  <a-radio :value="2">固定价</a-radio>
-                  <!-- 掉期交易商有固定价和浮动价选择 -->
-                  <!-- 普通交易商只有固定价 -->
-                  <a-radio :value="3"
-                           v-if="!useUserType()">浮动价</a-radio>
-                </a-radio-group>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="!isFloat()">
-              <a-form-item label="挂牌价格"
-                           name="FixedPrice"
-                           class="inputIconBox">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.FixedPrice" />
-                <MinusOutlined @click="decreasePrice" />
-                <PlusOutlined @click="increasePrice" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-else>
-              <a-form-item label="基差"
-                           name="PriceMove">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                v-model:value="formState.PriceMove" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isFloat()">
-              <a-form-item label="估算价"
-                           name="PriceMove">
-                <span class="white">{{getFloatPrice()}}</span>
-              </a-form-item>
-            </a-col>
+    <!-- 挂牌求购 -->
+    <Drawer
+        :title="isBuy() ? '挂牌求购' : '挂牌卖出' "
+        :placement="'right'"
+        :visible="visible"
+        @cancel="cancel"
+        class="top"
+    >
+        <div class="title_right">
+            <span class="tline"></span>
+            <svg class="icon svg-icon" aria-hidden="true">
+                <use xlink:href="#icon-B" />
+            </svg>
+            <span @click="changeDirection">{{isBuy() ? '卖出' : '求购'}}</span>
+        </div>
+        <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>
+                                <a-radio-group
+                                    class="commonRadioGroup"
+                                    v-model:value="formState.priceType"
+                                >
+                                    <a-radio :value="2">固定价</a-radio>
+                                    <!-- 掉期交易商有固定价和浮动价选择 -->
+                                    <!-- 普通交易商只有固定价 -->
+                                    <a-radio :value="3" v-if="!useUserType()">浮动价</a-radio>
+                                </a-radio-group>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="!isFloat()">
+                            <a-form-item label="挂牌价格" name="FixedPrice" class="inputIconBox">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    v-model:value="formState.FixedPrice"
+                                />
+                                <MinusOutlined @click="decreasePrice" />
+                                <PlusOutlined @click="increasePrice" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-else>
+                            <a-form-item label="基差" name="PriceMove">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    v-model:value="formState.PriceMove"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isFloat()">
+                            <a-form-item label="估算价" name="PriceMove">
+                                <span class="white">{{getFloatPrice()}}</span>
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty"
-                           class="inputIconBox">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                :max="getMaxNum()"
-                                v-model:value="formState.OrderQty" />
-                <MinusOutlined @click="increaseNum" />
-                <PlusOutlined @click="decreaseNum" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   class="mt-10">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.OrderQty"
-                          :max="getMaxNum()"
-                          class="formSlider" />
-                <div class="unit">
-                  <span>{{getMaxNum() ? selectedRow.minivalue : 0}}</span>
-                  <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量" name="OrderQty" class="inputIconBox">
+                                <a-input-number
+                                    class="commonInput"
+                                    style="width: 260px"
+                                    :min="0"
+                                    :max="getMaxNum()"
+                                    v-model:value="formState.OrderQty"
+                                />
+                                <MinusOutlined @click="increaseNum" />
+                                <PlusOutlined @click="decreaseNum" />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" class="mt-10">
+                            <a-form-item>
+                                <a-slider
+                                    :min="0"
+                                    v-model:value="formState.OrderQty"
+                                    :max="getMaxNum()"
+                                    class="formSlider"
+                                />
+                                <div class="unit">
+                                    <span>{{getMaxNum() ? selectedRow.minivalue : 0}}</span>
+                                    <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" class="relative mt20">
+                            <a-form-item :label="'挂牌金额'">
+                                <span class="white ml8">{{getMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="getMargin()">
+                            <a-form-item :label="'履约保证金'">
+                                <span class="white ml8">{{getMargin()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{canUseMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   class="relative mt20">
-              <a-form-item :label="'挂牌金额'">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="getMargin()">
-              <a-form-item :label="'履约保证金'">
-                <span class="white ml8">{{getMargin()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{canUseMoney()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <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>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <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>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -335,6 +329,7 @@ export default defineComponent({
         height: 16px;
         line-height: 16px;
         margin: 3px 7px 3px 17px;
+        fill: @m-blue25;
     }
     span {
         font-size: 14px;