diff --git a/doc b/doc new file mode 120000 index 0000000..e85b0fa --- /dev/null +++ b/doc @@ -0,0 +1 @@ +/Volumes/MacintoshHD2/www/wwfsv.muzkcoinsss.com/doc \ No newline at end of file diff --git a/src/api/flashSwap.js b/src/api/flashSwap.js new file mode 100644 index 0000000..81cd484 --- /dev/null +++ b/src/api/flashSwap.js @@ -0,0 +1,35 @@ +import server from './server'; + +class FlashSwap { + static getCoinList() { + return server.get('/flashSwap/getCoinList'); + } + + static getRate(fromCoin, toCoin) { + return server.get('/flashSwap/getRate', { + params: { + from_coin: fromCoin, + to_coin: toCoin + } + }); + } + + static preview(data) { + return server.post('/flashSwap/preview', data); + } + + static execute(data) { + return server.post('/flashSwap/execute', data); + } + + static getHistory(params) { + return server.get('/flashSwap/getHistory', { params }); + } + + static getUserCoinBalance(coinName) { + const params = coinName ? { coin_name: coinName } : {}; + return server.get('/flashSwap/getUserCoinBalance', { params }); + } +} + +export default FlashSwap; diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue index 971a12a..6566b8a 100644 --- a/src/components/CommonHeader.vue +++ b/src/components/CommonHeader.vue @@ -64,6 +64,9 @@ + @@ -231,6 +234,10 @@ export default { label: this.$t("common.markets"), url: "/market" }, + flashSwap: { + label: this.$t("common.flashswap"), + url: "/flash-swap" + }, contactUs: { label: this.$t("common.contactUs"), url: "/contact-us" diff --git a/src/i18n/cn.json b/src/i18n/cn.json index f5c93c6..7153f77 100644 --- a/src/i18n/cn.json +++ b/src/i18n/cn.json @@ -1056,5 +1056,29 @@ "IOSScanCodeDownload": "IOS扫码下载", "UseNow": "现在使用" + }, + "flashSwap": { + "from": "从", + "to": "至", + "available": "可用", + "max": "最大", + "enterAmount": "请输入金额", + "selectCoin": "请选择币种", + "rate": "汇率", + "query": "查询", + "confirm": "确认兑换", + "confirmTip": "确认执行此次闪兑?", + "cancel": "取消", + "success": "兑换成功", + "history": "闪兑记录", + "back": "返回", + "fromCoin": "支付币种", + "toCoin": "获得币种", + "fromAmount": "支付数量", + "toAmount": "获得数量", + "fee": "手续费", + "time": "时间", + "status": "状态", + "sameCoin": "相同币种不可兑换" } } diff --git a/src/i18n/en.json b/src/i18n/en.json index de52e4b..0406ab0 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1296,5 +1296,29 @@ "a29":"Cancel", "a30":"Confirm", "a31":"Please Enter Amount" + }, + "flashSwap": { + "from": "From", + "to": "To", + "available": "Available", + "max": "Max", + "enterAmount": "Please enter amount", + "selectCoin": "Select coin", + "rate": "Rate", + "query": "Query", + "confirm": "Confirm Swap", + "confirmTip": "Confirm this flash swap?", + "cancel": "Cancel", + "success": "Swap successful", + "history": "Swap History", + "back": "Back", + "fromCoin": "From", + "toCoin": "To", + "fromAmount": "Pay Amount", + "toAmount": "Receive Amount", + "fee": "Fee", + "time": "Time", + "status": "Status", + "sameCoin": "Same coin cannot be swapped" } } diff --git a/src/i18n/tw.json b/src/i18n/tw.json index 165bb67..3066174 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -1226,5 +1226,29 @@ "a29":"取消", "a30":"確認", "a31":"請輸入金額" + }, + "flashSwap": { + "from": "從", + "to": "至", + "available": "可用", + "max": "最大", + "enterAmount": "請輸入金額", + "selectCoin": "請選擇幣種", + "rate": "匯率", + "query": "查詢", + "confirm": "確認兌換", + "confirmTip": "確認執行此次閃兌?", + "cancel": "取消", + "success": "兌換成功", + "history": "閃兌記錄", + "back": "返回", + "fromCoin": "支付幣種", + "toCoin": "獲得幣種", + "fromAmount": "支付數量", + "toAmount": "獲得數量", + "fee": "手續費", + "time": "時間", + "status": "狀態", + "sameCoin": "相同幣種不可兌換" } } diff --git a/src/router/index.js b/src/router/index.js index fc7f004..96c286f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -48,6 +48,8 @@ import MarketTrends from '@/views/mineview/MarketTrends' import ExchangeStock from '@/views/exchangeStock' import EllasAlpha from '@/views/ellasAlpha' +import FlashSwap from '@/views/flashSwap/index' +import FlashSwapHistory from '@/views/flashSwap/history' Vue.use(VueRouter); @@ -169,6 +171,16 @@ const routes = [{ name: "ellasAlpha", path: "/ellasAlpha", component: EllasAlpha + }, + { + name: "flashSwap", + path: "/flash-swap", + component: FlashSwap + }, + { + name: "flashSwapHistory", + path: "/flash-swap/history", + component: FlashSwapHistory } ] diff --git a/src/router/wallet.js b/src/router/wallet.js index 138b2cd..b3e48f5 100644 --- a/src/router/wallet.js +++ b/src/router/wallet.js @@ -7,7 +7,7 @@ import Reward from '@/views/wallet/reward'; import Funding from '@/views/wallet/funding'; import Address from '@/views/wallet/address'; import Otc from '@/views/wallet/otc-assets'; -import FlashSwap from '@/views/wallet/flashswap'; +import FlashSwap from '@/views/flashSwap/index'; export default [ { diff --git a/src/views/flashSwap/history.vue b/src/views/flashSwap/history.vue new file mode 100644 index 0000000..d2db5c1 --- /dev/null +++ b/src/views/flashSwap/history.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/views/flashSwap/index.vue b/src/views/flashSwap/index.vue new file mode 100644 index 0000000..96c6378 --- /dev/null +++ b/src/views/flashSwap/index.vue @@ -0,0 +1,512 @@ + + + + + diff --git a/src/views/wallet/flashswap.vue b/src/views/wallet/flashswap.vue index 5efc941..5aa8a99 100644 --- a/src/views/wallet/flashswap.vue +++ b/src/views/wallet/flashswap.vue @@ -1,142 +1,13 @@ - -