Browse Source

修改股票页面、修改资产页面、修改首页

master
liaoxinyu 1 month ago
parent
commit
c299cf9984
  1. 2
      config/index.js
  2. 2
      src/api/server/index.js
  3. 4
      src/assets/scss/theme/_dark.scss
  4. 10
      src/components/SecondaryNav.vue
  5. 5
      src/i18n/en.json
  6. 5
      src/i18n/tw.json
  7. 6
      src/index.html
  8. 6
      src/router/wallet.js
  9. 10
      src/utils/consts.js
  10. 28
      src/views/exchangeStock/index.vue
  11. 4
      src/views/exchangeStock/order-list.vue
  12. 2
      src/views/home/index.vue
  13. 43
      src/views/wallet/exchange-assets.vue
  14. 142
      src/views/wallet/flashswap.vue

2
config/index.js

@ -24,7 +24,7 @@ module.exports = {
'/api': { '/api': {
// target: 'http://qkladmin2.ruanmeng.top/', // target: 'http://qkladmin2.ruanmeng.top/',
// target: 'https://guanli.coin.amatak.net/', // target: 'https://guanli.coin.amatak.net/',
target: 'https://adm.moabwalletss.com/', target: 'https://wwfsv.muzkcoinsss.com/',
changeOrigin: true, changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// // 请求时 将api替换成实际的apis等 // // 请求时 将api替换成实际的apis等

2
src/api/server/index.js

@ -59,7 +59,7 @@ Object.assign(settings, {
// api请求根地址 打包使用完整地址 调试使用本地服务器代理 避免跨域 // api请求根地址 打包使用完整地址 调试使用本地服务器代理 避免跨域
// baseURL: process.env.NODE_ENV == 'production' ? 'http://qkladmin2.ruanmeng.top/api/' : '/api/', // baseURL: process.env.NODE_ENV == 'production' ? 'http://qkladmin2.ruanmeng.top/api/' : '/api/',
// baseURL: process.env.NODE_ENV == 'production' ? 'https://guanli.coin.amatak.net/api/' : '/api/', // baseURL: process.env.NODE_ENV == 'production' ? 'https://guanli.coin.amatak.net/api/' : '/api/',
baseURL: process.env.NODE_ENV == 'production' ? 'https://adm.moabwalletss.com/api/' : '/api/', baseURL: process.env.NODE_ENV == 'production' ? 'https://wwfsv.muzkcoinsss.com/api/' : '/api/',
// baseURL: 'https://aaccdd.kixcoin.org/api/' , // baseURL: 'https://aaccdd.kixcoin.org/api/' ,
// baseURL: 'https://guanli.coin.amatak.net/api/', // baseURL: 'https://guanli.coin.amatak.net/api/',
// baseURL: 'https://api.hipc.world/', // baseURL: 'https://api.hipc.world/',

4
src/assets/scss/theme/_dark.scss

@ -741,3 +741,7 @@
#dark .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{ #dark .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
background-color: transparent; background-color: transparent;
} }
#dark .account_card{
background-color: #161c3c;
// border: 1px solid #202951;
}

10
src/components/SecondaryNav.vue

@ -28,7 +28,8 @@ export default {
methods: { methods: {
getWalletLinks() { getWalletLinks() {
this.itemList = [{ this.itemList = [
{
url: `/wallet/assets/exchange`, url: `/wallet/assets/exchange`,
label: this.$t('common.assets'), label: this.$t('common.assets'),
}, },
@ -44,6 +45,10 @@ export default {
url: `/wallet/transfer`, url: `/wallet/transfer`,
label: this.$t('common.transferFunds'), label: this.$t('common.transferFunds'),
}, },
{
url: `/wallet/flashswap`,
label: this.$t('common.flashswap'),
},
// { // {
// url: `/wallet/reward`, // url: `/wallet/reward`,
// label: this.$t('common.myCommission'), // label: this.$t('common.myCommission'),
@ -51,7 +56,8 @@ export default {
{ {
url: `/wallet/funding`, url: `/wallet/funding`,
label: this.$t('common.rechargeWithdraw') label: this.$t('common.rechargeWithdraw')
},{ },
{
url: `/wallet/address`, url: `/wallet/address`,
label: this.$t('common.addressManagement'), label: this.$t('common.addressManagement'),
} }

5
src/i18n/en.json

@ -38,7 +38,8 @@
"c9": "brief introduction", "c9": "brief introduction",
"rejection":"Reason for rejection", "rejection":"Reason for rejection",
"c11": "Stocks", "c11": "Stocks",
"c12": "Spot goods" "c12": "Spot goods",
"c13": "Spot Account"
}, },
"common": { "common": {
"a3": "Purchase records", "a3": "Purchase records",
@ -189,6 +190,8 @@
"footerTips4": "Restricted Areas: Unable to provide services to residents of specific countries / regions, such as Israel and the Islamic Republic of China", "footerTips4": "Restricted Areas: Unable to provide services to residents of specific countries / regions, such as Israel and the Islamic Republic of China",
"learn": "Learn", "learn": "Learn",
"GraphicValidation": "Graphical Verification", "GraphicValidation": "Graphical Verification",
"flashswap": "Flash Swap",
"illustrate": "Instant Redemption Instructions",
"c12": "Rejection Information", "c12": "Rejection Information",
"c13": "Withdrawal password", "c13": "Withdrawal password",
"c14": "Please fill in the withdrawal password", "c14": "Please fill in the withdrawal password",

5
src/i18n/tw.json

@ -38,7 +38,8 @@
"c9": "簡介", "c9": "簡介",
"rejection":"拒絕理由", "rejection":"拒絕理由",
"c11": "股票", "c11": "股票",
"c12": "現貨" "c12": "現貨",
"c13": "現貨賬戶"
}, },
"common": { "common": {
"a3": "申購記錄", "a3": "申購記錄",
@ -190,6 +191,8 @@
"footerTips4": "受限地區:無法為特定國家/地區的居民提供服務,例如:以色列和伊斯蘭共和國", "footerTips4": "受限地區:無法為特定國家/地區的居民提供服務,例如:以色列和伊斯蘭共和國",
"learn": "學院", "learn": "學院",
"GraphicValidation": "圖形驗證", "GraphicValidation": "圖形驗證",
"flashswap": "閃兌",
"illustrate": "閃兌说明",
"c12": "駁回信息", "c12": "駁回信息",
"c13": "提款密碼", "c13": "提款密碼",
"c14": "請填写提款密碼", "c14": "請填写提款密碼",

6
src/index.html

@ -69,13 +69,13 @@
<script src="/static/libs/jquery.mCustomScrollbar.js"></script> <script src="/static/libs/jquery.mCustomScrollbar.js"></script>
<script src="/static/js/custom.js"></script> <script src="/static/js/custom.js"></script>
<script src="/static/libs/skroll.min.js"></script> <script src="/static/libs/skroll.min.js"></script>
<script src="https://adm.moabwalletss.com/newlink/pako.min.js"></script> <script src="https://wwfsv.muzkcoinsss.com/newlink/pako.min.js"></script>
<script> <script>
window.custom = localStorage.getItem("theme"); // Default theme window.custom = localStorage.getItem("theme"); // Default theme
window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://adm.moabwalletss.com/api/sliderVerify' : 'https://adm.moabwalletss.com/api/sliderVerify' %>"; window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://wwfsv.muzkcoinsss.com/api/sliderVerify' : 'https://wwfsv.muzkcoinsss.com/api/sliderVerify' %>";
// window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'http://qkladmin2.ruanmeng.top/api/sliderVerify' : 'http://qkladmin2.ruanmeng.top/api/sliderVerify' %>"; // window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'http://qkladmin2.ruanmeng.top/api/sliderVerify' : 'http://qkladmin2.ruanmeng.top/api/sliderVerify' %>";
// window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'wss://guanli.coin.amatak.net/ws1' : 'wss://guanli.coin.amatak.net/ws1' %>"; // window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'wss://guanli.coin.amatak.net/ws1' : 'wss://guanli.coin.amatak.net/ws1' %>";
window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://adm.moabwalletss.com/api' : 'https://adm.moabwalletss.com/api' %>"; window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://wwfsv.muzkcoinsss.com/api' : 'https://wwfsv.muzkcoinsss.com/api' %>";
// window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'ws://qkladmin2.ruanmeng.top:2346' : 'ws://qkladmin2.ruanmeng.top:2346' %>"; // window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'ws://qkladmin2.ruanmeng.top:2346' : 'ws://qkladmin2.ruanmeng.top:2346' %>";

6
src/router/wallet.js

@ -7,6 +7,7 @@ import Reward from '@/views/wallet/reward';
import Funding from '@/views/wallet/funding'; import Funding from '@/views/wallet/funding';
import Address from '@/views/wallet/address'; import Address from '@/views/wallet/address';
import Otc from '@/views/wallet/otc-assets'; import Otc from '@/views/wallet/otc-assets';
import FlashSwap from '@/views/wallet/flashswap';
export default [ export default [
{ {
@ -47,5 +48,10 @@ export default [
name : "otcAssets", name : "otcAssets",
path : "/wallet/otc", // 地址管理 path : "/wallet/otc", // 地址管理
component : Otc component : Otc
},
{
name : "flashswap",
path : "/wallet/flashswap", // 地址管理
component : FlashSwap
} }
] ]

10
src/utils/consts.js

@ -19,15 +19,15 @@ export default {
Server: { Server: {
Path: { Path: {
// API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`, // API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`,
BASE:isProduct?`https://adm.moabwalletss.com`:`https://adm.moabwalletss.com`, BASE:isProduct?`https://wwfsv.muzkcoinsss.com`:`https://wwfsv.muzkcoinsss.com`,
API: isProduct ? `https://adm.moabwalletss.com/api/` : `/api/`, API: isProduct ? `https://wwfsv.muzkcoinsss.com/api/` : `/api/`,
// WS: isProduct ? `ws://qkladmin2.ruanmeng.top:2346` : `ws://qkladmin2.ruanmeng.top:2346`, // WS: isProduct ? `ws://qkladmin2.ruanmeng.top:2346` : `ws://qkladmin2.ruanmeng.top:2346`,
// WS1: isProduct ? `ws://qkladmin2.ruanmeng.top:2348` : `ws://qkladmin2.ruanmeng.top:2348`, // WS1: isProduct ? `ws://qkladmin2.ruanmeng.top:2348` : `ws://qkladmin2.ruanmeng.top:2348`,
// WS: isProduct ? `wss://guanli.coin.amatak.net/ws1` : `wss://guanli.coin.amatak.net/ws1`, // WS: isProduct ? `wss://guanli.coin.amatak.net/ws1` : `wss://guanli.coin.amatak.net/ws1`,
WS: isProduct ? `wss://adm.moabwalletss.com/ws1` : `wss://adm.moabwalletss.com/ws1`, WS: isProduct ? `wss://wwfsv.muzkcoinsss.com/ws1` : `wss://wwfsv.muzkcoinsss.com/ws1`,
// WS1: isProduct ? `wss://guanli.coin.amatak.net/ws2` : `wss://guanli.coin.amatak.net/ws2`, // WS1: isProduct ? `wss://guanli.coin.amatak.net/ws2` : `wss://guanli.coin.amatak.net/ws2`,
WS1: isProduct ? `wss://adm.moabwalletss.com/ws2` : `wss://adm.moabwalletss.com/ws2`, WS1: isProduct ? `wss://wwfsv.muzkcoinsss.com/ws2` : `wss://wwfsv.muzkcoinsss.com/ws2`,
WS2: isProduct ? `wss://adm.moabwalletss.com/ws3` : `wss://adm.moabwalletss.com/ws3`, WS2: isProduct ? `wss://wwfsv.muzkcoinsss.com/ws3` : `wss://wwfsv.muzkcoinsss.com/ws3`,
} }
} }
}; };

28
src/views/exchangeStock/index.vue

@ -49,7 +49,8 @@
trigger="click" trigger="click"
> >
<div slot="reference"> <div slot="reference">
{{ activeContract.pair_name }} <!-- {{ activeContract.pair_name }} -->
{{ activeContract.coin_name }}
<el-button size="mini"> <el-button size="mini">
<i class="el-icon-arrow-down"></i> <i class="el-icon-arrow-down"></i>
</el-button> </el-button>
@ -59,9 +60,9 @@
style="max-height:300px;overflow:auto;" style="max-height:300px;overflow:auto;"
> >
<template v-for="parent in marketList"> <template v-for="parent in marketList">
<div class="px-3 text-primary" :key="parent.coin_name"> <!-- <div class="px-3 text-primary" :key="parent.coin_name">
{{ parent.coin_name }} {{ parent.coin_name }}
</div> </div> -->
<table class="table" :key="parent.coin_name + 1"> <table class="table" :key="parent.coin_name + 1">
<thead> <thead>
<tr class="text-secondary"> <tr class="text-secondary">
@ -74,26 +75,17 @@
</thead> </thead>
<tbody> <tbody>
<!-- @click="symbol = item.symbol" --> <!-- @click="symbol = item.symbol" -->
<tr <tr v-for="item in parent.marketInfoList" :key="item.symbol"
v-for="item in parent.marketInfoList" :class="{ active: item.symbol == symbol }" @click="ispopover1(item.symbol)">
:key="item.symbol"
:class="{ active: item.symbol == symbol }"
@click="ispopover1(item.symbol)"
>
<td class="w-10/24"> <td class="w-10/24">
{{ item.symbol }}/{{ parent.coin_name }} <!-- {{ item.symbol }}/{{ parent.coin_name }} -->
{{ item.coin_name }}
</td> </td>
<td <td class="w-7/24 " :class="item.increase < 0 ? 'decreace' : 'increace'">
class="w-7/24 "
:class="item.increase < 0 ? 'decreace' : 'increace'"
>
{{item.price}} {{item.price}}
<!-- item.symbol == symbol ? price1 : --> <!-- item.symbol == symbol ? price1 : -->
</td> </td>
<td <td class="w-7/24" :class="item.increase < 0 ? 'decreace' : 'increace'">
class="w-7/24"
:class="item.increase < 0 ? 'decreace' : 'increace'"
>
{{ item.increaseStr }} {{ item.increaseStr }}
</td> </td>
</tr> </tr>

4
src/views/exchangeStock/order-list.vue

@ -19,7 +19,7 @@
</li> </li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade show active" id="open-orders" role="tabpanel"> <div class="tab-pane fade" id="open-orders" role="tabpanel">
<table class="table" v-if="ordersOpen.total"> <table class="table" v-if="ordersOpen.total">
<thead> <thead>
<tr class="text-nowrap"> <tr class="text-nowrap">
@ -80,7 +80,7 @@
</div> </div>
</div> </div>
<div class="tab-pane fade" id="stock-holdPosition" role="tabpanel"> <div class="tab-pane fade show active" id="stock-holdPosition" role="tabpanel">
<table class="table" v-if="holdPositionList.length>0"> <table class="table" v-if="holdPositionList.length>0">
<thead> <thead>
<tr class="text-nowrap"> <tr class="text-nowrap">

2
src/views/home/index.vue

@ -850,7 +850,7 @@
return Boolean(localStorage.token); return Boolean(localStorage.token);
}, },
downloadLink() { downloadLink() {
return "https://adm.moabwalletss.com/download"; return "https://wwfsv.muzkcoinsss.com/download";
}, },
// //
featuresList() { featuresList() {

43
src/views/wallet/exchange-assets.vue

@ -31,7 +31,7 @@
<span class="icon-Icon-Increase"></span> <span class="icon-Icon-Increase"></span>
</div> </div>
</div> </div>
<div class="row"> <div class="row" v-if="0">
<div class="col-md-7"> <div class="col-md-7">
<div class="panel-box bg-panel"> <div class="panel-box bg-panel">
<div class="heading d-flex justify-content-between align-items-center"> <div class="heading d-flex justify-content-between align-items-center">
@ -117,6 +117,25 @@
<inner-transfer @change="getUserAssets"></inner-transfer> <inner-transfer @change="getUserAssets"></inner-transfer>
</div> </div>
</div> </div>
<div class="row" style="padding: 0px 15px;margin-bottom: 80px;">
<div class="account_card" style="margin-right: 25px;">
<div class="card_label">{{$t('wallet.capitalAccount')}}</div>
<div class="card_amount">{{userAssets.total_assets_usd|omitTo(2)}}</div>
<div class="card_unit">USDT</div>
</div>
<div class="account_card" style="margin-right: 25px;">
<div class="card_label">{{$t('wallet.spotAccount')}}</div>
<div class="card_amount">{{userAssets.total_assets_btc|omitTo(4)}}</div>
<div class="card_unit">BTC</div>
</div>
<div class="account_card">
<div class="card_label">{{$t('wallet.contractAccount')}}</div>
<div class="card_amount">{{userAssets.contract_account_usd|omitTo(2)}}</div>
<div class="card_unit">USDT</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12 mt15"> <div class="col-md-12 mt15">
<div class="markets-pair-list"> <div class="markets-pair-list">
@ -992,4 +1011,26 @@
.user { .user {
background-color: #ccc; background-color: #ccc;
} }
.account_card{
width: 290px;
padding: 22px 24px;
border-radius: 10px;
border: 1px solid #eee;
background-color: #fafbfe;
}
.card_label{
font-size: 16px;
margin-bottom: 16px;
}
.card_amount{
font-size: 30px;
line-height: 1.2;
font-family: DINOT-Regular-Bold !important;
}
.card_unit{
color: #919191;
margin-top: 8px;
font-size: 14px;
}
</style> </style>

142
src/views/wallet/flashswap.vue

@ -0,0 +1,142 @@
<template>
<div class="wallet-page">
<secondary-nav></secondary-nav>
<div class="container">
<div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">
<div class="h3">{{$t('common.flashswap')}}</div>
</div>
<div class="row">
<div class="col-md-5">
<inner-transfer :coinName.sync="coinName" :showHistoryLink="false" :isRestCoin="true"></inner-transfer>
</div>
<div class="col-md-7">
<div class="panel-box bg-panel">
<div class="heading d-flex justify-content-between align-items-center">
<div class="h6">{{$t('common.illustrate')}}</div>
</div>
<div class="tab-content">
<ul>
<li class="mb-2">1.{{$t('wallet.handlingFee')}}</li>
<!-- <li class="mb-2">2.{{$t('wallet.onlyForeignExchange',{name:'USDT'})}}</li>
<li class="mb-2">3.{{$t('wallet.onlySustainable',{name:'BTC'})}}</li>
<li class="mb-2">4.{{$t('wallet.inCase1',{name:'USDT'})}}</li> -->
<li class="mb-2">2.{{$t('wallet.inCase2',{name:'USDT'})}}</li>
</ul>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 mt15">
<div class="markets-pair-list">
<ul class="nav nav-pills" id="pills-tab" role="tablist">
<li class="nav-item" v-if="coinName">
<a class="nav-link active" data-toggle="pill" href @click.prevent="isCondition=true" role="tab" aria-selected="false">{{coinName}} {{$("transfer.transferRecord")}}</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href @click.prevent="isCondition=false" role="tab" aria-selected="false">{{ $t("wallet.allTransfer") }}</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="tab1" role="tabpanel">
<table class="table stripe">
<thead>
<tr>
<th>{{$t('wallet.assets')}}</th>
<th>{{$t('wallet.transferQuantity')}}</th>
<th>{{$t('wallet.direction')}}</th>
<th>{{$t('wallet.date')}}</th>
<th class="text-right">{{$t('wallet.status')}}</th>
</tr>
</thead>
<tbody>
<tr v-for="item in transferRecords" :key="item.id" v-if="seek(item)">
<td>
<img src="../../assets/img/icon/1.png" alt="eth" />
{{ item.coin_name }}
</td>
<td>{{ item.amount }}</td>
<td>{{ $t(`wallet.${item.draw_out_direction}`) }} -> {{ $t(`wallet.${item.into_direction}`) }}</td>
<td>{{ item.datetime|parseTime }}</td>
<td class="text-right">
<!--1 成功 2 失败 -->
<span class="fail" v-if="item.status == Globals.Status.Transfer.FAIL">{{$t('wallet.error')}}</span>
<span class="success" v-else-if="item.status == Globals.Status.Transfer.SUCCESS">{{$t('wallet.success')}}</span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import InnerTransfer from "../components/inner-transfer.vue";
import Wallet from "@/api/wallet";
export default {
components: {
InnerTransfer
},
data() {
return {
transferRecords: [],
isCondition: false, // tab
coinName: '',
};
},
watch: {
coinName(val, oldVal) {
//
if (val && !oldVal) this.isCondition = true;
//
if (!val && oldVal) this.isCondition = false;
},
isCondition(val) {
// console.log(val)
}
},
computed: {
},
methods: {
//
seek(item) {
return !this.isCondition || item.coin_name === this.coinName;
},
getTransferRecords() {
Wallet.transferRecord()
.then(data => {
this.transferRecords = data.data;
})
.catch(err => {});
}
},
created() {
this.getTransferRecords();
}
};
</script>
<style lang="scss" scoped>
.table {
tr {
td {
cursor: default !important;
}
}
}
</style>
Loading…
Cancel
Save