2

src/views/contract/exchange-store.vue

@@ -140,7 +140,7 @@
         <div class="d-flex justify-content-between mb-3" style="color: #999;">
             <div>{{ $t("contract.e1") }}：</div>
             <!-- {{$t("contract.e2")}} -->
-            <div>{{ amount }} </div>
+            <div>{{ amount }}</div>
         </div>
         <!-- <div class="d-flex justify-content-between mb-4">
           <div>{{ $t("contract.a3") }}:</div>
@@ -470,7 +470,13 @@ export default {
         symbol: this.symbol,
         ...this.form
       };
-      console.log(this.form, 111111)
+      if(this.form.type==2){
+        // data.entrust_price = this.margin;
+        data.entrust_price = this.newPriceObj.price;
+        data.amount = this.amount;
+      }
+      console.log(this.margin, '保证金')
+      console.log(data, 111111, this.newPriceObj.price);
       Contract.openPosition(data).then(() => {
         this.contractAccount();
         this.form.amount = 0;

src/views/contract/handicap.vue

@@ -268,6 +268,7 @@ export default {
             } else if (sub == this.msg.trade) {
             this.tradeList.unshift(data);
             this.tradeList.pop();
+            console.info(this.tradeList, 2222222)
             // this.newPriceObj = data;
             // this.$emit("input", this.newPriceObj);
             } else if (type == "ping" ||cmd == "ping") {

src/views/contract/hold-position.vue

@@ -32,7 +32,7 @@
             <th>{{ $t("contract.a5") }}（{{ $t("contract.e2") }}）</th> -->
             <th>{{ $t("contract.g9") }}</th>
             <th>{{ $t("contract.g3") }}</th>
-            <th>{{ $t("contract.a8") }}</th>
+            <!-- <th>{{ $t("contract.a8") }}</th> -->
             <th >{{ $t("contract.a6") }}</th>
             <th>{{ $t("contract.h0") }}</th>
             <th>{{ $t("contract.i7") }} /{{ $t("contract.i8") }}</th>
@@ -50,7 +50,7 @@
             <td>{{ item.freeze_position }}</td> -->
             <td>{{ item.avg_price * 1 }}</td>
             <td>{{ item.realtimePrice }}</td>
-            <td>{{ item.flatPrice }}</td>
+            <!-- <td>{{ item.flatPrice }}</td> -->
             <td :class="item.unRealProfit>0?'increase':item.unRealProfit<0?'decreace':''">{{ (parseFloat(item.unRealProfit)).toFixed(2) }}</td>
             <td>{{ item.profitRate }}</td>
             <td>{{ item.tpPrice || "--" }}/{{ item.slPrice || "--" }}</td>

src/views/exchange/make-deal.vue

@@ -276,6 +276,10 @@
 <script>
 import Exchange from "@/api/exchange";
 import Market from "@/api/market";
+import {
+    Message,
+    Loading
+} from 'element-ui'
 export default {
 
     props: ["isLogin", "socket", "symbol", "pair", "buyorder", "sellorder", "fromBalance", "toBalance", "newTrade", "minQty", "minTotal", "priceDecimals", "qtyDecimals"],
@@ -479,10 +483,18 @@ export default {
             Exchange.storeEntrust(Object.assign(this.buyorder, {
                 total: this.buyTotal,
             }, baseArgs)).then(data => {
+                console.log(data, 876789798099);
+                Message({
+                    type: 'success',
+                    duration: 2000,
+                    message:'success',
+                });
+                setTimeout(() => {
                     // 触发父组件的方法 更新余额和订单
                     this.$emit('update');
                     // 清空表单
                     this.reset();
+                }, 0);
             }).catch(err => {
 
             });
@@ -499,6 +511,11 @@ export default {
             Exchange.storeEntrust(Object.assign(this.sellorder, {
                 total: this.sellTotal
             }, baseArgs)).then(data => {
+                Message({
+                    type: 'success',
+                    duration: 2000,
+                    message:'success',
+                });
                 // 触发父组件的方法 更新余额和订单
                 this.$emit('update');
                 // 清空表单