From 4bce2452778037e92a681e7d27a94d3a998be297 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Wed, 4 Dec 2024 09:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7=E4=B8=AD?=
 =?UTF-8?q?=E6=8F=90=E5=B8=81=E5=9C=B0=E5=9D=80=E7=9A=84=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.json                     |  3 +-
 src/i18n/tw.json                     |  4 +--
 src/views/wallet/address.vue         |  4 +--
 src/views/wallet/exchange-assets.vue | 53 +++++++++++++++++++++++++---
 4 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 795cf6f..d26b033 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -512,7 +512,8 @@
 		"contractFlow": "Contract Flow",
 		"info": "Details",
 		"money": "Amount",
-		"Authentication": "Authentication"
+		"Authentication": "Authentication",
+		"withdrawals":"Please select the withdrawal address"
 	},
 	"contact": {
 		"contact": "Contact Us",
diff --git a/src/i18n/tw.json b/src/i18n/tw.json
index a16550b..616824e 100644
--- a/src/i18n/tw.json
+++ b/src/i18n/tw.json
@@ -454,8 +454,8 @@
 		"contractFlow": "合約流水",
 		"info": "詳情",
 		"money": "金額",
-		"Authentication": "身份認證"
-
+		"Authentication": "身份認證",
+		"withdrawals":"請選擇提幣地址"
 	},
 	"contact": {
 		"contact": "聯繫我們",
diff --git a/src/views/wallet/address.vue b/src/views/wallet/address.vue
index e18341e..e39729b 100644
--- a/src/views/wallet/address.vue
+++ b/src/views/wallet/address.vue
@@ -116,7 +116,7 @@
                             <td>{{ address.address_note }}</td>
                             <td class="text-right">
                               <!-- <div class="btn-group btn-group-sm text-nowrap" role="group" aria-label="Basic example"> -->
-                              <button
+                              <!-- <button
                                 type="button"
                                 class="btn btn-sm btn-info"
                                 data-toggle="modal"
@@ -124,7 +124,7 @@
                                 @click="edit(address)"
                               >
                                 {{ $t("wallet.editAddress") }}
-                              </button>
+                              </button> -->
                               <button
                                 type="button"
                                 class="btn btn-sm btn-danger"
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue
index a8caf10..35ee2d9 100644
--- a/src/views/wallet/exchange-assets.vue
+++ b/src/views/wallet/exchange-assets.vue
@@ -406,13 +406,31 @@
 													<span>
 														{{$t('wallet.low')}}:{{withdrawFee.withdrawal_min}}
 														{{withdrawCoin}}
-														<router-link to="" @click.native="addressText" class="text-primary">{{$t('wallet.addressList')}}</router-link>
+														<!-- <router-link to="" @click.native="addressText" class="text-primary">{{$t('wallet.addressList')}}</router-link> -->
+														<router-link to="" @click.native="addressText" class="text-primary">{{$t('wallet.addAddress')}}</router-link>
 													</span>
 												</label>
 												<div class="input-group input-group-sm">
-													<input type="text" :placeholder="$t('wallet.enterDrawAddress')"
+													<!-- <input type="text" :placeholder="$t('wallet.enterDrawAddress')"
 														:data-message="$t('wallet.invalidWallet')+'！'"
-														v-model="withdraw.address" class="form-control" required />
+														v-model="withdraw.address" class="form-control" required /> -->
+													<el-select v-model="withdraw.address" :placeholder="$t('wallet.withdrawals')" no-data-text="Please add the withdrawal address first">
+														<div v-for="(item,index) in userAdressList" :key="item.coin_id" v-if="withdrawCoin==item.coin_name">
+															<el-option v-for="(items,index) in item.list" :key="items.id"
+															  :label="items.address" :value="items.address"
+															  @click.native="changeaddress(items.created_at)">
+															  <span>{{ items.address }}</span>
+															</el-option>
+														</div>
+														<!-- <el-option v-else value="">
+															<span>请先添加提币地址</span>
+														</el-option> -->
+														<!-- <div v-else>
+															<el-option value="">
+																<span>请先添加提币地址</span>
+															</el-option>
+														</div> -->
+													</el-select>
 												</div>
 											</div>
 											<div class="form-group mt-2">
@@ -496,6 +514,7 @@
 	import ClipboardJS from "clipboard";
 	import getCode from "./getCode";
 	import vueQr from "vue-qr";
+	import date from "@/utils/class/date.js";
 	export default {
 		components: {
 			InnerTransfer,
@@ -565,6 +584,8 @@
 				getEmailCodeLock: false,
 				JStime: 0,
 				tiemr: null,
+				userAdressList: [], // 用户币种地址集合
+				created_at:''
 			};
 		},
 
@@ -592,6 +613,10 @@
 			}
 		},
 		methods: {
+			parseTime: date.parseTime,
+			changeaddress(val){
+				this.created_at = val
+			},
 			//确认提交贝宝支付
 			paypalSbumit() {
 				if (!this.paypal.amount) {
@@ -729,6 +754,17 @@
 			// 处理提币
 			toHandleWithdraw() {
 				let data = this.withdrawFee
+				// const apiTimeDate = new Date(this.created_at);
+				// const currentTime = new Date();
+				// const time = this.parseTime(currentTime)
+				// const time1 = new Date(time);
+				// const timeDiff = apiTimeDate - time1; // 时间差（毫秒）
+				// const twentyFourHours = 24 * 60 * 60 * 1000; // 24小时的毫秒数
+				
+				// if(timeDiff >= twentyFourHours){
+					// this.$message.error('Tips: You can withdraw money from the newly added address after 24 hours')
+				// }
+				
 				if (utils.validate(".withdraw-body")) {
 					if (data.withdraw_switch == 1) {
 						$("#withdraw").modal("hide");
@@ -838,7 +874,15 @@
 			addressText(){
 				$("#withdraw").modal("hide");
 				this.$router.push("/wallet/address")
-			}
+			},
+			getUserAdressList() {
+			  Wallet.getUserWithdrawAdress()
+			    .then((data) => {
+				  this.userAdressList = []
+			      this.userAdressList = data;
+			    })
+			    .catch((err) => {});
+			},
 		},
 
 		created() {
@@ -848,6 +892,7 @@
 			this.createWalletAddress();
 			this.getUserInfo();
 			this.getAuthInfo();
+			this.getUserAdressList()
 		},
 
 		mounted() {