diff --git a/dist88.zip b/dist88.zip new file mode 100644 index 0000000..3124ccc Binary files /dev/null and b/dist88.zip differ diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue index 1ca8330..8adfc32 100644 --- a/src/views/contract/exchange-store.vue +++ b/src/views/contract/exchange-store.vue @@ -177,7 +177,7 @@ @@ -187,7 +187,7 @@ @@ -296,7 +296,7 @@ @@ -306,7 +306,7 @@ @@ -405,10 +405,10 @@ export default { amount_buy:"", amount_sell:"", lever_rate: "", - sl_trigger_price_sell:'',//止盈 - sl_trigger_price_buy:'',//止盈 - tp_trigger_price_sell:'',//止损 - tp_trigger_price_buy:'',//止损 + sl_trigger_price_sell:'',//止损 + sl_trigger_price_buy:'',//止损 + tp_trigger_price_sell:'',//止盈 + tp_trigger_price_buy:'',//止盈 }, // 最多可开张数 maxNum: 0, @@ -678,8 +678,8 @@ export default { side: 1, symbol: this.symbol, type: this.form.type, - sl_trigger_price: this.form.sl_trigger_price_buy,//止盈 - tp_trigger_price: this.form.tp_trigger_price_buy,//止损 + sl_trigger_price: this.form.sl_trigger_price_buy,//止损 + tp_trigger_price: this.form.tp_trigger_price_buy,//止盈 } }else if(side==2){ data = { @@ -689,8 +689,8 @@ export default { side: 2, symbol: this.symbol, type: this.form.type, - sl_trigger_price: this.form.sl_trigger_price_sell,//止盈 - tp_trigger_price: this.form.tp_trigger_price_sell,//止损 + sl_trigger_price: this.form.sl_trigger_price_sell,//止损 + tp_trigger_price: this.form.tp_trigger_price_sell,//止盈 } } if(this.form.type==2){ @@ -710,9 +710,9 @@ export default { this.form.amount = 0; this.form.amount_buy = 0; this.form.amount_sell = 0; - this.form.sl_trigger_price_sell = 0;//止盈 - this.form.sl_trigger_price_buy = 0;//止盈 - this.form.tp_trigger_price_sell = 0;//止损 + this.form.sl_trigger_price_sell = 0; + this.form.sl_trigger_price_buy = 0; + this.form.tp_trigger_price_sell = 0; this.form.tp_trigger_price_buy = 0; this.$message.success(this.$t("contract.f5")); this.$emit("position"); diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue index 3d61f97..6fa5a41 100644 --- a/src/views/contract/handicap.vue +++ b/src/views/contract/handicap.vue @@ -104,9 +104,13 @@
{{ $t("contract.b1") }}
-
{{ $t("contract.d8") }}(USDT)
+
+
{{ $t("contract.d8") }}
+
(USDT)
+
- {{ $t("contract.e1") }}({{ $t("contract.e2") }}) +
{{ $t("contract.e1") }}
+
({{ $t("contract.e2") }})
@@ -174,7 +178,9 @@ export default { let list = this.sellList.splice(0, 12); let total = 0; list.forEach(item => { - item.total = total += item.amount; + // item.total = total += item.amount; + item.total = total += Number(item.amount); + item.total = item.total.toFixed(3); }); // console.log(list,'sellListShow' ) return list.reverse(); @@ -184,12 +190,23 @@ export default { let list = this.buyList.splice(0, 12); let total = 0; list.forEach(item => { - item.total = total += item.amount; + // item.total = total += item.amount; + item.total = total += Number(item.amount); + item.total = item.total.toFixed(3); }); // console.log(list, 'buyListShow') return list; // return []; - } + }, + // tradeListShow(){ + // let list = this.tradeList.splice(0, 12); + // let total = 0; + // list.forEach(item => { + // item.total = total += Number(item.amount); + // item.total = item.total.toFixed(3); + // }); + // return list; + // } }, created() { if (this.symbol) { diff --git a/src/views/exchange/order-list.vue b/src/views/exchange/order-list.vue index 51efe31..6f5f6fe 100644 --- a/src/views/exchange/order-list.vue +++ b/src/views/exchange/order-list.vue @@ -213,7 +213,11 @@ export default { 'ordersHistory': { handler(nv) { console.log(nv, 222, nv.total) - this.ordersHistoryNew = nv; + this.ordersHistoryNew.data = []; + this.ordersHistoryNew.total = 0; + console.log(this.ordersHistoryNew.data.length, this.ordersHistoryNew.total); + this.ordersHistoryNew.data.push(...nv.data); + this.ordersHistoryNew.total = nv.total; // this.$set(this.ordersHistoryNew, nv); console.log(this.ordersHistoryNew.total); },