|
@@ -185,7 +185,6 @@ export default {
|
|
|
}).then(res => {
|
|
|
this.positionSign = true
|
|
|
this.positionList = res.list || []
|
|
|
- this.updateSymbol(false)
|
|
|
}).catch(() => {}).finally(() => {
|
|
|
this.ajaxSign += 1
|
|
|
this.loadedAll()
|
|
@@ -261,11 +260,11 @@ export default {
|
|
|
if (sign) {
|
|
|
this.updateSign = true
|
|
|
if (this.productDataObj[item.symbol]) {
|
|
|
- if (item.cmd == 0) {
|
|
|
- v.close_price = this.productDataObj[item.symbol].bid
|
|
|
+ if (item.cmd == 0 && this.productDataObj[item.symbol].sell) {
|
|
|
+ v.close_price = this.productDataObj[item.symbol].sell
|
|
|
}
|
|
|
- if (item.cmd == 1) {
|
|
|
- v.close_price = this.productDataObj[item.symbol].ask
|
|
|
+ if (item.cmd == 1 && this.productDataObj[item.symbol].buy) {
|
|
|
+ v.close_price = this.productDataObj[item.symbol].buy
|
|
|
}
|
|
|
}
|
|
|
v.profit = this.formatProfit(v) || v.profit
|
|
@@ -372,19 +371,19 @@ export default {
|
|
|
}
|
|
|
if (data.cmd == '1') {
|
|
|
if (market2) {
|
|
|
- profit = (data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
+ profit = (data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
} else if (market1) {
|
|
|
- profit = ((data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
+ profit = ((data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
} else {
|
|
|
- profit = (data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size
|
|
|
+ profit = (data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size
|
|
|
}
|
|
|
} else if (data.cmd == '0') {
|
|
|
if (market2) {
|
|
|
- profit = (currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
+ profit = (data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
} else if (market1) {
|
|
|
- profit = ((currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
+ profit = ((data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
} else {
|
|
|
- profit = (currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size
|
|
|
+ profit = (data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size
|
|
|
}
|
|
|
}
|
|
|
} else if (currencyData.profit_mode == '0') {
|
|
@@ -399,27 +398,27 @@ export default {
|
|
|
}
|
|
|
if (data.cmd == '1') {
|
|
|
if (market2) {
|
|
|
- profit = (data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
+ profit = (data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
} else if (market1) {
|
|
|
- profit = (( data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
+ profit = (( data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
} else {
|
|
|
- profit = ((data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size)
|
|
|
+ profit = ((data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size)
|
|
|
}
|
|
|
} else if (data.cmd == '0') {
|
|
|
if (market2) {
|
|
|
- profit = (currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
+ profit = (data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size * rate
|
|
|
} else if (market1) {
|
|
|
- profit = ((currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
+ profit = ((data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size) / rate
|
|
|
} else {
|
|
|
- profit = ((currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size)
|
|
|
+ profit = ((data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
if (data.cmd == '1') {
|
|
|
- profit = (data.open_price - currencyData.ask) * (data.volume / 100) * currencyData.contract_size
|
|
|
+ profit = (data.open_price - data.close_price) * (data.volume / 100) * currencyData.contract_size
|
|
|
} else if (data.cmd == '0') {
|
|
|
- profit = (currencyData.bid - data.open_price) * (data.volume / 100) * currencyData.contract_size
|
|
|
+ profit = (data.close_price - data.open_price) * (data.volume / 100) * currencyData.contract_size
|
|
|
}
|
|
|
}
|
|
|
if (profit) {
|