liaoxinyu
/
Moabcoin_PC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改股票页面

master
liaoxinyu 2 weeks ago
parent
6e704996eb
commit
9b00d9d17d
6 changed files with 148 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/market.js
  2. 20
      src/components/CommonFooter.vue
  3. 14
      src/components/CommonHeader.vue
  4. 8
      src/views/exchangeStock/index.vue
  5. 121
      src/views/exchangeStock/make-deal.vue
  6. 6
      src/views/exchangeStock/order-list.vue

4
src/api/market.js
View File

@ -63,6 +63,10 @@ class Market {
static getstockCoinInfo(params) { static getstockCoinInfo(params) {
return server.get(`/stock/getCoinInfo`,{ params }); return server.get(`/stock/getCoinInfo`,{ params });
} }
// 是否显示颜色
static getstocktradingOpen(params) {
return server.get(`/stock/tradingOpen`,{ params });
}
} }
export default Market; export default Market;

20
src/components/CommonFooter.vue
View File

@ -352,11 +352,11 @@ export default {
label: "Turkey", label: "Turkey",
url: require("../assets/img/tr.jpg"), url: require("../assets/img/tr.jpg"),
}, },
// { {
// value: 'ar', value: 'ar',
// label: 'عربي', label: 'عربي',
// url:require('../assets/img/polski.png') url:require('../assets/img/polski.png')
// }, },
{ {
value: "tw", // zh-TW value: "tw", // zh-TW
label: "繁体中文", label: "繁体中文",
@ -485,11 +485,11 @@ export default {
this.getServiceLink(); this.getServiceLink();
// console.log(this.service); // console.log(this.service);
this.getEmial(); this.getEmial();
if(this.isLogin){ // if(this.isLogin){
this.chatcount = setInterval(()=>{ // this.chatcount = setInterval(()=>{
this.chat() // this.chat()
},5000) // },5000)
} // }
}, },
}; };
</script> </script>

14
src/components/CommonHeader.vue
View File

@ -42,9 +42,9 @@
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link" :to="contract.url">{{ contract.label }}</router-link> <router-link class="nav-link" :to="contract.url">{{ contract.label }}</router-link>
</li> </li>
<!-- <li class="nav-item"> <li class="nav-item">
<router-link class="nav-link" to="/exchangestock">{{ $t('exchange.a1') }}</router-link> <router-link class="nav-link" to="/exchangestock">{{ $t('exchange.a1') }}</router-link>
</li> --> </li>
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link" :to="learn.url">{{ learn.label }}</router-link> <router-link class="nav-link" :to="learn.url">{{ learn.label }}</router-link>
</li> </li>
@ -419,11 +419,11 @@ export default {
label: "Turkey", label: "Turkey",
url: require("../assets/img/tr.jpg"), url: require("../assets/img/tr.jpg"),
}, },
// { {
// value: 'ar', value: 'ar',
// label: 'عربي', label: 'عربي',
// url:require('../assets/img/polski.png') url:require('../assets/img/polski.png')
// }, },
{ {
value: "tw", // zh-TW value: "tw", // zh-TW
label: "繁体中文", label: "繁体中文",

8
src/views/exchangeStock/index.vue
View File

@ -491,8 +491,11 @@
Exchange.getstockUserBalance(this.marketInfo.pair_name).then(data => { Exchange.getstockUserBalance(this.marketInfo.pair_name).then(data => {
// this.fromBalance = data[this.pair.from.toUpperCase()].usable_balance;
// this.toBalance = data[this.pair.to.toUpperCase()].usable_balance;
console.log(data[this.activeContract.coin_name].usable_balance,'111');
this.fromBalance = data[this.pair.from.toUpperCase()].usable_balance; this.fromBalance = data[this.pair.from.toUpperCase()].usable_balance;
this.toBalance = data[this.pair.to.toUpperCase()].usable_balance; this.toBalance = data[this.activeContract.coin_name].usable_balance;
}).catch(err => { }).catch(err => {
@ -504,6 +507,9 @@
// 更新接口数据 // 更新接口数据
update() { update() {
this.getBalance(); this.getBalance();
setTimeout(()=>{
this.getBalance();
},2000)
this.getOrders(); this.getOrders();
this.getCurrencyExCny(); this.getCurrencyExCny();
}, },

121
src/views/exchangeStock/make-deal.vue
View File

@ -191,7 +191,8 @@
{{ $t('exchange.balance') }} {{ $t('exchange.balance') }}
<span> {{fromBalance}} {{pair.from}}</span> <span> {{fromBalance}} {{pair.from}}</span>
</p> </p>
<button class="btn buy" @click="handleBuyOrder">{{ $t("common.buy") }} {{pair.to}}</button> <button class="btn buy" @click="handleBuyOrder" v-if="tradingOpenshow==true">{{ $t("common.buy") }} {{pair.to}}</button>
<button class="btn colorless" @click="handleBuyOrder" v-if="tradingOpenshow==false">{{ $t("common.buy") }} {{pair.to}}</button>
</div> </div>
<!-- Sell Order --> <!-- Sell Order -->
@ -237,7 +238,8 @@
<el-popover popper-class='popover-tips' placement="top-start" trigger="manual" v-model="visibles.sell.limitAmount"> <el-popover popper-class='popover-tips' placement="top-start" trigger="manual" v-model="visibles.sell.limitAmount">
<span class="content"> <span class="content">
<i class="el-icon-warning-outline"></i> <i class="el-icon-warning-outline"></i>
{{ msgList.sell[2] }} <!-- {{ msgList.sell[2] }} -->
{{ msgList.sell[4] }}
</span> </span>
<div class="input-group" slot="reference"> <div class="input-group" slot="reference">
<input type="number" v-model="sellorder.amount" class="form-control" min=0 :placeholder="$t('exchange.enter-amount')"> <input type="number" v-model="sellorder.amount" class="form-control" min=0 :placeholder="$t('exchange.enter-amount')">
@ -272,7 +274,8 @@
{{ $t('exchange.balance') }} {{ $t('exchange.balance') }}
<span> {{fromBalance}} {{pair.from}}</span> <span> {{fromBalance}} {{pair.from}}</span>
</p> </p>
<button class="btn sell" @click="handleSellOrder">{{ $t("common.sell") }} {{pair.to}}</button> <button class="btn sell" @click="handleSellOrder" v-if="tradingOpenshow==true">{{ $t("common.sell") }} {{pair.to}}</button>
<button class="btn colorless" @click="handleSellOrder" v-if="tradingOpenshow==false">{{ $t("common.sell") }} {{pair.to}}</button>
</div> </div>
</div> </div>
</div> </div>
@ -299,6 +302,11 @@ export default {
cacheTotal: 0, // 存放市价单输入的总值 cacheTotal: 0, // 存放市价单输入的总值
cachePrice: null, // 存放最新价格 cachePrice: null, // 存放最新价格
timeoutId: null,
intervalId: null,
tradingOpenshow:false,
timer: null,
// 气泡弹框内容和触发 // 气泡弹框内容和触发
visibles: { visibles: {
"buy": { "buy": {
@ -454,6 +462,91 @@ export default {
}); });
}, },
tradingOpen(){
Market.getstocktradingOpen().then(res => {
// console.log(res);
this.tradingOpenshow = res
}).catch(err => {});
},
// 开启定时任务逻辑
startSchedule() {
// const now = new Date();
// const minutes = now.getMinutes();
// const seconds = now.getSeconds();
// const milliseconds = now.getMilliseconds();
// let msUntilNextTime = 0; // 距离下一次调用的毫秒数
// // 计算距离下一个 00分 或 30分 还有多久
// if (minutes < 30) {
// // 当前在 0~29 分之间，目标是 30 分
// msUntilNextTime = (30 - minutes) * 60000 - seconds * 1000 - milliseconds;
// } else {
// // 当前在 30~59 分之间，目标是下一个 00 分 (60分)
// msUntilNextTime = (60 - minutes) * 60000 - seconds * 1000 - milliseconds;
// }
// console.log(`距离下次刷新还有 ${Math.round(msUntilNextTime / 1000)} 秒`);
// // 1. 先用 setTimeout 等待到下一个整点或半点
// this.timeoutId = setTimeout(() => {
// // 到达整点/半点，执行一次请求
// this.tradingOpen();
// // 2. 之后开启 setInterval，每隔固定的 30 分钟执行一次
// const THIRTY_MINUTES_MS = 30 * 60 * 1000;
// this.intervalId = setInterval(() => {
// this.tradingOpen();
// }, THIRTY_MINUTES_MS);
// }, msUntilNextTime);
this.timer = setInterval(() => {
const now = new Date();
const minutes = now.getMinutes();
const seconds = now.getSeconds();
let remainingSeconds = 0;
// 1. 如果正好是 00分00秒 或 30分00秒，说明时间到了！
if (minutes % 30 === 0 && seconds === 0) {
remainingSeconds = 0;
console.log(`距离下次刷新还有 ${remainingSeconds} 秒，正在执行刷新...`);
// 触发接口调用
this.tradingOpen();
}
// 2. 否则，计算距离下一次刷新的秒数
else {
if (minutes < 30) {
// 如果当前是 0~29 分，目标是 30 分
remainingSeconds = (30 - minutes) * 60 - seconds;
} else {
// 如果当前是 30~59 分，目标是 60 分 (下一个整点)
remainingSeconds = (60 - minutes) * 60 - seconds;
}
// 一直打印倒计时提示
// console.log(`距离下次刷新还有 ${remainingSeconds} 秒`);
}
}, 1000);
},
// 清除定时器的方法
// clearSchedule() {
// if (this.timeoutId) {
// clearTimeout(this.timeoutId);
// this.timeoutId = null;
// }
// if (this.intervalId) {
// clearInterval(this.intervalId);
// this.intervalId = null;
// }
// },
renderBuyAmount(val, index) { renderBuyAmount(val, index) {
// console.Info(val) // console.Info(val)
// console.Info(this.buyorder) // console.Info(this.buyorder)
@ -646,10 +739,12 @@ export default {
if (this.empty(order.amount)) { if (this.empty(order.amount)) {
flag = false; flag = false;
this.visibles[orderType].marketAmount = true; this.visibles[orderType].marketAmount = true;
this.visibles[orderType].limitAmount = true;
this.msgList[orderType][4] = this.$t('nav.a6'); this.msgList[orderType][4] = this.$t('nav.a6');
} else if (order.amount < this.minQty) { } else if (order.amount < this.minQty) {
flag = false; flag = false;
this.visibles[orderType].marketAmount = true; this.visibles[orderType].marketAmount = true;
this.visibles[orderType].limitAmount = true;
this.msgList[orderType][4] = this.$t('nav.a7')+` ${this.minQty}`; this.msgList[orderType][4] = this.$t('nav.a7')+` ${this.minQty}`;
} }
} }
@ -718,9 +813,18 @@ export default {
created() { created() {
this.getCoinInfo() this.getCoinInfo()
this.tradingOpen()
this.startSchedule();
this.reset(); this.reset();
}, },
beforeDestroy() {
// this.clearSchedule();
if (this.timer) {
clearInterval(this.timer);
}
},
} }
</script> </script>
@ -822,4 +926,13 @@ export default {
.market-trade p{ .market-trade p{
color: #e7e7e7; color: #e7e7e7;
} }
.colorless{
background: #999999;
color: #fff;
text-transform: uppercase;
padding: 10px;
margin-top: 30px;
width: 100%;
box-shadow: 0px 0px 15px 0px rgba(199, 199, 199, 0.7);
}
</style> </style>

6
src/views/exchangeStock/order-list.vue
View File

@ -101,9 +101,9 @@
<td>{{item.usable_balance}}</td> <td>{{item.usable_balance}}</td>
<td>{{item.realtimePrice}}</td> <td>{{item.realtimePrice}}</td>
<td>{{item.cost_price}}</td> <td>{{item.cost_price}}</td>
<td>{{item.dayProfit}}</td> <td :class="item.dayProfit>0?'increace':item.dayProfit<0?'decreace':''">{{item.dayProfit}}</td>
<td>{{item.unRealProfit}}</td> <td :class="item.unRealProfit>0?'increace':item.unRealProfit<0?'decreace':''">{{item.unRealProfit}}</td>
<td>{{item.profitRate}}</td> <td :class="item.profitRate>0?'increace':item.profitRate<0?'decreace':''">{{item.profitRate}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

Write Preview
Loading…
Cancel
Save