From 78db353bc4b00511d37fed935699ca359ab6885b Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Thu, 12 Oct 2023 15:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E3=80=81?=
 =?UTF-8?q?=E6=8F=90=E5=B8=81=E9=AA=8C=E8=AF=81=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/member.js                    |  4 +--
 src/i18n/en.json                     |  2 +-
 src/views/wallet/exchange-assets.vue | 39 +++++++++++++++++++++++-----
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/api/member.js b/src/api/member.js
index 05d3987..14405b1 100644
--- a/src/api/member.js
+++ b/src/api/member.js
@@ -154,8 +154,8 @@ class Member {
         return server.get(`/register/Graph_che`);
     }
     // 提币获取邮箱验证码
-    static getWdcode(){
-        return server.get(`/user/wdcode`);
+    static getWdcode(data){
+        return server.get(`/user/wdcode`,{params:data});
     }
 }
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 5da8544..9360191 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -219,7 +219,7 @@
         "phoneCode": "SMS Verification",
         "googleVer": "Google Verification",
         "emailCode": "Email Verification",
-        "password": "Enter your password",
+        "password": "Password",
         "passwordLength": "the password needs a length of {num}",
         "new-password": "Enter a new password",
         "confirm-password": "Confirm your password",
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue
index 12f463b..8e39cd8 100644
--- a/src/views/wallet/exchange-assets.vue
+++ b/src/views/wallet/exchange-assets.vue
@@ -362,15 +362,15 @@
                         <span class="text-right">{{$t('wallet.handlingFee1')}}: {{withdrawCoin=='USDT'&&withdraw.addressType==3?withdrawFee.trc20:withdrawFee.withdrawal_fee }} {{withdrawCoin}}</span>
                       </div>
                         <div class="form-group mt-2">
-                            <label class="d-flex justify-content-between" for="formGroupExampleInput">
-                                <span>{{$t('login.pwd')}}</span>
+                            <label class="d-flex justify-content-between" for="formGroupPWDInput">
+                                <span>{{$t('login.password')}}</span>
                             </label>
                             <div class="input-group input-group-sm">
-                                <input type="password" v-model="withdraw.password" :placeholder="$t('login.password')" class="form-control" />
+                                <input type="password" v-model="withdraw.password" :placeholder="$t('common.enterPwd')" class="form-control" id="formGroupPWDInput" />
                             </div>
                         </div>
                         <div class="form-group mt-2">
-                            <label class="d-flex justify-content-between" for="EmailCode" style="align-items: center;">
+                            <label class="d-flex justify-content-between" for="" style="align-items: center;">
                                 <span>{{$t('login.email-code')}}</span>
                                 <span class="getCodeAA" @click="getEmailCode">
                                   <span v-if="!getEmailCodeLock">{{$t('common.getCode')}}</span>
@@ -701,6 +701,31 @@ export default {
     },
     // 獲取邮箱验证码
     getEmailCode(){
+      if(!this.withdraw.address){
+        this.$message({
+            message: this.$t('wallet.enterDrawAddress'),
+            type: "warn",
+            duration : 2000,
+        });
+        return;
+      }
+      if(!this.withdraw.amount){
+        this.$message({
+            message: this.$t('wallet.enterDrawNum'),
+            type: "warn",
+            duration : 2000,
+        });
+        return;
+      }
+      if(!this.withdraw.password){
+        this.$message({
+            // message: this.$t('login.password'),
+            message: this.$t('common.enterPwd'),
+            type: "warn",
+            duration : 2000,
+        });
+        return;
+      }
       if(this.getEmailCodeLock){return};
 			this.JStime = 300;
 			this.tiemr = setInterval(()=>{
@@ -712,10 +737,12 @@ export default {
 				this.JStime--;
 			}, 1000)
 			this.getEmailCodeLock = true;
-      Member.getWdcode().then(res => {
+      //
+      let gdata = {bt:this.withdraw.addressType,baddr:this.withdraw.address,bnum:this.withdraw.amount}
+      Member.getWdcode(gdata).then(res => {
             // console.log(res, 11111)
             this.$message({
-                message: `${type} ${this.$t("login.sendOK")}`,
+                message: `${this.$t("login.sendOK")}`,
                 type: "success",
                 duration : 2000,
             });