Browse Source

修改合约保证金为2位小数点、以及合约价格问题和申购页面时间显示问题

master
liaoxinyu 9 months ago
parent
commit
0bd0c70c91
  1. 3
      src/utils/class/date.js
  2. 22
      src/views/contract/exchange-store.vue
  3. 6
      src/views/contract/handicap.vue
  4. 16
      src/views/contract/index.vue

3
src/utils/class/date.js

@ -236,7 +236,8 @@ function convertTo12HourFormat(dateTimeStr) {
// hours = String(hours % 12 || 12).padStart(2, '0'); // 0转换为12
// 格式化输出
return `${day}-${month}-${year} ${hours}:${minutes}:${seconds} ${ampm}`;
return `${day}-${month}-${year}`;
// return `${day}-${month}-${year} ${hours}:${minutes}:${seconds} ${ampm}`;
}
/**

22
src/views/contract/exchange-store.vue

@ -101,6 +101,7 @@
class="form-control"
v-model="marginBuy"
:placeholder="tips"
@input="inputEnter(false)"
title=""
/>
<!-- <div class="input-group-append">
@ -229,6 +230,7 @@
class="form-control"
v-model="marginSell"
:placeholder="tips"
@input="inputEnter(true)"
title=""
/>
<!-- <div class="input-group-append">
@ -254,7 +256,8 @@
<div v-if="tab == 1" class="kaicang">
<div class="d-flex justify-content-between mb-3">
<div class="color_7c">{{ $t("contract.e7") }} </div>
<div>{{ accountInfo.openNum }}</div>
<!-- <div>{{ accountInfo.openNum }}</div> -->
<div>{{ maxNum }}</div>
</div>
<div class="d-flex justify-content-between mb-3">
<div class="color_7c">{{ $t("contract.e1") }}</div>
@ -518,7 +521,7 @@ export default {
// console.info(this.form.lever_rate)
// console.info(this.margin)
if (!this.form.lever_rate || !this.marginBuy) return 0;
let p=this.marginBuy*this.form.lever_rate;
let p = Math.round(this.marginBuy*this.form.lever_rate);
this.buyform.amount=p;
return p
@ -527,13 +530,24 @@ export default {
// console.info(this.form.lever_rate)
// console.info(this.margin)
if (!this.form.lever_rate || !this.marginSell) return 0;
let p=this.marginSell*this.form.lever_rate;
let p = Math.round(this.marginSell*this.form.lever_rate);
this.sellform.amount=p;
return p
}
},
methods: {
inputEnter(boll) {
if(boll){
this.marginSell = this.marginSell
.replace(/[^\d.]/g, "") //
.replace(/^(\d*\.?\d{0,2}).*$/, "$1"); //
}else{
this.marginBuy = this.marginBuy
.replace(/[^\d.]/g, "") //
.replace(/^(\d*\.?\d{0,2}).*$/, "$1"); //
}
},
//
contractAccount(boo) {
if (!this.isLogin) return;
@ -548,7 +562,7 @@ export default {
// if (!this.form.lever_rate) {
// this.form.lever_rate = res.lever_rate;
// }
if (this.form.lever_rate && !boo) {
if (this.form.lever_rate) {
this.openNum();
}
});

6
src/views/contract/handicap.vue

@ -199,6 +199,7 @@ export default {
bus.$on('collapse', msg => {
this.newPriceObj.price =this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
this.$emit("input", this.newPriceObj);
localStorage.setItem("price",this.newPriceObj.price)
});
},
//
@ -215,7 +216,8 @@ export default {
this.tradeList = res.swapTradeList;
this.newPriceObj = this.tradeList[0];
this.$emit("input", this.newPriceObj);
this.$store.commit('SET_PRICE', this.newPriceObj.price);
// this.$store.commit('SET_PRICE', this.newPriceObj.price);
localStorage.setItem("price",this.newPriceObj.price)
});
},
//
@ -268,7 +270,7 @@ export default {
this.tradeList.pop();
// this.newPriceObj = data;
// this.$emit("input", this.newPriceObj);
this.$store.commit('SET_PRICE', this.newPriceObj.price);
// this.$store.commit('SET_PRICE', this.newPriceObj.price);
} else if (type == "ping" ||cmd == "ping") {
this.ws.send({
cmd: "pong"

16
src/views/contract/index.vue

@ -20,7 +20,8 @@
decreace2: activeContract.increase < 0,
increase: activeContract.increase >= 0
}">
{{ activeContract.price }}
<!-- {{ activeContract.price }} -->
{{price1}}
</div>
<!-- <div class="title mb-1 text-secondary">
{{ $t("contract.h6") }}
@ -101,7 +102,7 @@
<div style="margin-left: 10px;">{{ item.symbol }}/{{ parent.coin_name }}</div>
</div>
</div>
<div class="text-right width-32">{{ item.price }}</div>
<div class="text-right width-32">{{item.symbol == activeSymbol ? price1 : item.price}}</div>
<div class="text-right width-32" :class="item.increase < 0 ? 'decreace' : 'increase'">{{ item.increaseStr }}</div>
</td>
<!-- <td class="w-7/24 text-right" >{{ item.close }}</td>
@ -241,7 +242,9 @@ export default {
currentIcon: '',
filterCoin: "",
contractListFilter: [],
Liste:[]
Liste:[],
price1:0,
intervalId:''
};
},
computed: {
@ -314,6 +317,7 @@ export default {
if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
})
});
this.startWatchingPrice();
},
//
mounted: function () {
@ -322,6 +326,12 @@ export default {
}, 2000)
},
methods: {
startWatchingPrice(){
this.intervalId = setInterval(() => {
let newPrice = localStorage.getItem('price');
this.price1 = newPrice;
}, 10); //
},
ispopover1(item){
this.activeSymbol=item;
// this.$refs.popover.showPopper = false;

Loading…
Cancel
Save