From c299cf99846d161805b40a4537e6bad82e94761c Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Sat, 16 May 2026 10:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=82=A1=E7=A5=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                        |   2 +-
 src/api/server/index.js                |   2 +-
 src/assets/scss/theme/_dark.scss       |   4 +
 src/components/SecondaryNav.vue        |  12 ++-
 src/i18n/en.json                       |   5 +-
 src/i18n/tw.json                       |   5 +-
 src/index.html                         |   6 +-
 src/router/wallet.js                   |   8 +-
 src/utils/consts.js                    |  10 +-
 src/views/exchangeStock/index.vue      |  28 ++---
 src/views/exchangeStock/order-list.vue |   4 +-
 src/views/home/index.vue               |   2 +-
 src/views/wallet/exchange-assets.vue   |  43 +++++++-
 src/views/wallet/flashswap.vue         | 142 +++++++++++++++++++++++++
 14 files changed, 235 insertions(+), 38 deletions(-)
 create mode 100644 src/views/wallet/flashswap.vue

diff --git a/config/index.js b/config/index.js
index 5030cfd..be480bf 100644
--- a/config/index.js
+++ b/config/index.js
@@ -24,7 +24,7 @@ module.exports = {
             '/api': {
                 // target: 'http://qkladmin2.ruanmeng.top/',
                 // target: 'https://guanli.coin.amatak.net/',
-                target: 'https://adm.moabwalletss.com/',
+                target: 'https://wwfsv.muzkcoinsss.com/',
                 changeOrigin: true,
                 // pathRewrite: {
                 //     // 请求时 将api替换成实际的apis等
diff --git a/src/api/server/index.js b/src/api/server/index.js
index 62c3251..ad6d782 100644
--- a/src/api/server/index.js
+++ b/src/api/server/index.js
@@ -59,7 +59,7 @@ Object.assign(settings, {
     // 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://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://guanli.coin.amatak.net/api/',
     // baseURL: 'https://api.hipc.world/',
diff --git a/src/assets/scss/theme/_dark.scss b/src/assets/scss/theme/_dark.scss
index eb5ccba..512ef8b 100644
--- a/src/assets/scss/theme/_dark.scss
+++ b/src/assets/scss/theme/_dark.scss
@@ -740,4 +740,8 @@
 }
 #dark .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
 	background-color: transparent;
+}
+#dark .account_card{
+	background-color: #161c3c;
+	// border: 1px solid #202951;
 }
\ No newline at end of file
diff --git a/src/components/SecondaryNav.vue b/src/components/SecondaryNav.vue
index dfe7e1f..94d0250 100644
--- a/src/components/SecondaryNav.vue
+++ b/src/components/SecondaryNav.vue
@@ -28,7 +28,8 @@ export default {
 
     methods: {
         getWalletLinks() {
-            this.itemList = [{
+            this.itemList = [
+				{
                     url: `/wallet/assets/exchange`,
                     label: this.$t('common.assets'),
                 }, 
@@ -40,10 +41,14 @@ export default {
                 //     url: `/wallet/otc`,
                 //     label: this.$t('otc.j1'),
                 // },
-                 {
+                {
                     url: `/wallet/transfer`,
                     label: this.$t('common.transferFunds'),
                 },
+				{
+				    url: `/wallet/flashswap`,
+				    label: this.$t('common.flashswap'),
+				},
                 //  {
                 //     url: `/wallet/reward`,
                 //     label: this.$t('common.myCommission'),
@@ -51,7 +56,8 @@ export default {
                 {
                     url: `/wallet/funding`,
                     label: this.$t('common.rechargeWithdraw')
-                },{
+                },
+				{
                     url: `/wallet/address`,
                     label: this.$t('common.addressManagement'),
                 }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9f604db..0bc7e99 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -38,7 +38,8 @@
 		"c9": "brief introduction",
 		"rejection":"Reason for rejection",
 		"c11": "Stocks",
-		"c12": "Spot goods"
+		"c12": "Spot goods",
+		"c13": "Spot Account"
 	},
 	"common": {
 		"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",
 		"learn": "Learn",
 		"GraphicValidation": "Graphical Verification",
+		"flashswap": "Flash Swap",
+		"illustrate": "Instant Redemption Instructions",
 		"c12": "Rejection Information",
 		"c13": "Withdrawal password",
 		"c14": "Please fill in the withdrawal password",
diff --git a/src/i18n/tw.json b/src/i18n/tw.json
index bbb27ed..26b3632 100644
--- a/src/i18n/tw.json
+++ b/src/i18n/tw.json
@@ -38,7 +38,8 @@
 		"c9": "簡介",
 		"rejection":"拒絕理由",
 		"c11": "股票",
-		"c12": "現貨"
+		"c12": "現貨",
+		"c13": "現貨賬戶"
 	},
 	"common": {
 		"a3": "申購記錄",
@@ -190,6 +191,8 @@
 		"footerTips4": "受限地區：無法為特定國家/地區的居民提供服務，例如：以色列和伊斯蘭共和國",
 		"learn": "學院",
 		"GraphicValidation": "圖形驗證",
+		"flashswap": "閃兌",
+		"illustrate": "閃兌说明",
 		"c12": "駁回信息",
 		"c13": "提款密碼",
 		"c14": "請填写提款密碼",
diff --git a/src/index.html b/src/index.html
index 08a70ae..efd338f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -69,13 +69,13 @@
     <script src="/static/libs/jquery.mCustomScrollbar.js"></script>
     <script src="/static/js/custom.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>
         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.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' %>";
 
diff --git a/src/router/wallet.js b/src/router/wallet.js
index 4d1bbc0..138b2cd 100644
--- a/src/router/wallet.js
+++ b/src/router/wallet.js
@@ -7,6 +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';
 
 export default [
     {
@@ -47,5 +48,10 @@ export default [
         name : "otcAssets",
         path : "/wallet/otc", // 地址管理
         component : Otc
-    }
+    },
+	{
+	    name : "flashswap",
+	    path : "/wallet/flashswap", // 地址管理
+	    component : FlashSwap
+	}
 ]
\ No newline at end of file
diff --git a/src/utils/consts.js b/src/utils/consts.js
index b2dfa9f..bd503b9 100644
--- a/src/utils/consts.js
+++ b/src/utils/consts.js
@@ -19,15 +19,15 @@ export default {
             Server: {
                 Path: {
                     // API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`,
-                    BASE:isProduct?`https://adm.moabwalletss.com`:`https://adm.moabwalletss.com`,
-                    API: isProduct ? `https://adm.moabwalletss.com/api/` : `/api/`,
+                    BASE:isProduct?`https://wwfsv.muzkcoinsss.com`:`https://wwfsv.muzkcoinsss.com`,
+                    API: isProduct ? `https://wwfsv.muzkcoinsss.com/api/` : `/api/`,
                     // WS: isProduct ? `ws://qkladmin2.ruanmeng.top:2346` : `ws://qkladmin2.ruanmeng.top:2346`,
                     // 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://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://adm.moabwalletss.com/ws2` : `wss://adm.moabwalletss.com/ws2`,
-					WS2: isProduct ? `wss://adm.moabwalletss.com/ws3` : `wss://adm.moabwalletss.com/ws3`,
+                    WS1: isProduct ? `wss://wwfsv.muzkcoinsss.com/ws2` : `wss://wwfsv.muzkcoinsss.com/ws2`,
+					WS2: isProduct ? `wss://wwfsv.muzkcoinsss.com/ws3` : `wss://wwfsv.muzkcoinsss.com/ws3`,
                 }
             }
         };
diff --git a/src/views/exchangeStock/index.vue b/src/views/exchangeStock/index.vue
index c78a69c..55ab90d 100644
--- a/src/views/exchangeStock/index.vue
+++ b/src/views/exchangeStock/index.vue
@@ -49,7 +49,8 @@
 		        trigger="click"
 		      >
 		        <div slot="reference">
-		          {{ activeContract.pair_name }}
+		          <!-- {{ activeContract.pair_name }} -->
+		          {{ activeContract.coin_name }}
 		          <el-button size="mini">
 		            <i class="el-icon-arrow-down"></i>
 		          </el-button>
@@ -59,9 +60,9 @@
 		          style="max-height:300px;overflow:auto;"
 		        >
 		          <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 }}
-		            </div>
+		            </div> -->
 		            <table class="table" :key="parent.coin_name + 1">
 		              <thead>
 		                <tr class="text-secondary">
@@ -74,26 +75,17 @@
 		              </thead>
 		              <tbody>
 		                  <!-- @click="symbol = item.symbol" -->
-		                <tr
-		                  v-for="item in parent.marketInfoList"
-		                  :key="item.symbol"
-		                  :class="{ active: item.symbol == symbol }"
-		                  @click="ispopover1(item.symbol)"
-		                >
+		                <tr v-for="item in parent.marketInfoList" :key="item.symbol"
+						:class="{ active: item.symbol == symbol }" @click="ispopover1(item.symbol)">
 		                  <td class="w-10/24">
-		                    {{ item.symbol }}/{{ parent.coin_name }}
+		                    <!-- {{ item.symbol }}/{{ parent.coin_name }} -->
+		                    {{ item.coin_name }}
 		                  </td>
-		                  <td
-		                    class="w-7/24 "
-		                    :class="item.increase < 0 ? 'decreace' : 'increace'"
-		                  >
+		                  <td class="w-7/24 " :class="item.increase < 0 ? 'decreace' : 'increace'">
 		                    {{item.price}}
 										  <!-- item.symbol == symbol ? price1 : -->
 		                  </td>
-		                  <td
-		                    class="w-7/24"
-		                    :class="item.increase < 0 ? 'decreace' : 'increace'"
-		                  >
+		                  <td class="w-7/24" :class="item.increase < 0 ? 'decreace' : 'increace'">
 		                    {{ item.increaseStr }}
 		                  </td>
 		                </tr>
diff --git a/src/views/exchangeStock/order-list.vue b/src/views/exchangeStock/order-list.vue
index b17bfb3..3545991 100644
--- a/src/views/exchangeStock/order-list.vue
+++ b/src/views/exchangeStock/order-list.vue
@@ -19,7 +19,7 @@
 				</li>
 			</ul>
 			<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">
 						<thead>
 							<tr class="text-nowrap">
@@ -80,7 +80,7 @@
 					</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">
 						<thead>
 							<tr class="text-nowrap">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3012ad6..cb80c3e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -850,7 +850,7 @@
 				return Boolean(localStorage.token);
 			},
 			downloadLink() {
-				return "https://adm.moabwalletss.com/download";
+				return "https://wwfsv.muzkcoinsss.com/download";
 			},
 			// 特色卡片列表
 			featuresList() {
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue
index 8deba0e..fb571da 100644
--- a/src/views/wallet/exchange-assets.vue
+++ b/src/views/wallet/exchange-assets.vue
@@ -31,7 +31,7 @@
 					<span class="icon-Icon-Increase"></span>
 				</div>
 			</div>
-			<div class="row">
+			<div class="row" v-if="0">
 				<div class="col-md-7">
 					<div class="panel-box bg-panel">
 						<div class="heading d-flex justify-content-between align-items-center">
@@ -117,6 +117,25 @@
 					<inner-transfer @change="getUserAssets"></inner-transfer>
 				</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="col-md-12 mt15">
 					<div class="markets-pair-list">
@@ -992,4 +1011,26 @@
 	.user {
 		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>
diff --git a/src/views/wallet/flashswap.vue b/src/views/wallet/flashswap.vue
new file mode 100644
index 0000000..5efc941
--- /dev/null
+++ b/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>