From bac011e38648337bdea9dbd7e354acfca8dfecc7 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Thu, 19 Oct 2023 18:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=B8=81=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E3=80=81=E6=B3=A8=E5=86=8C=E5=9B=BE=E5=BD=A2=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/serve/index.js    |  2 +-
 layout/vCode.vue      | 16 +--------
 layout/vDropdwon.vue  |  4 +--
 pages/assets/draw.vue | 76 +++++++++++++++++++++++++++++++++++++------
 pages/reg/index.vue   | 28 +---------------
 5 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/api/serve/index.js b/api/serve/index.js
index a07d797..e4dd52a 100644
--- a/api/serve/index.js
+++ b/api/serve/index.js
@@ -90,7 +90,7 @@ x.fn = x.prototype = {
 				&& newMsg!='_user_wdcode' && newMsg!='_register_Graph_che' && newMsg!='_register_sendEmailCode'
 				 && newMsg!='_user_subscribeRecords' && newMsg!='_user_subscribeNow' && newMsg!='_exchange_getMarketInfo'
 				 && newMsg!='_indexList'&& newMsg!='_user_subscribe'&& newMsg!='_contract_getSymbolDetail' && newMsg!='_user_withdrawalRecord'){
-					resolve(Cache.get(newMsg).data);
+					// resolve(Cache.get(newMsg).data);//获取缓存中的数据
 
 				}
                 uni.request({
diff --git a/layout/vCode.vue b/layout/vCode.vue
index 545f461..25c673e 100644
--- a/layout/vCode.vue
+++ b/layout/vCode.vue
@@ -45,16 +45,9 @@ export default {
       type: String,
       require: false,
     },
-		sendAAA: {
-			type: Boolean
-		}
   },
 	watch: {
-		sendAAA(n,o){
-			if(n){
-				this.send();
-			}
-		}
+		
 	},
   components:{
   	  vButton
@@ -75,7 +68,6 @@ export default {
   methods: {
     // 发送验证码
     send() {
-			// console.log(this.sendAAA, '-------this.sendAAA');
         if(this.data.phone==''){
             this.$toast(this.$t('reg.a3'))
             return
@@ -86,11 +78,6 @@ export default {
         }
       if (this.load) return;
       this.inSend = true;
-			// if(this.url==="/register/sendEmailCode" && !this.sendAAA){
-			// 	this.$emit('changeSLider', true);
-			// 	return;
-			// }
-				// serve.post(this.url, this.data)
 			Member.sendEmailCode(this.data)
 				.then((res) => {
 					if(res.code=='4001'){          
@@ -103,7 +90,6 @@ export default {
 						this.load = true;
 						this.countDown();
 						this.$toast(this.$t('common.sendSuccess'));
-						// this.$emit('changeSendAAA', false)
 					}
 				})
 				.catch(() => {
diff --git a/layout/vDropdwon.vue b/layout/vDropdwon.vue
index 7d3a49a..47b1253 100644
--- a/layout/vDropdwon.vue
+++ b/layout/vDropdwon.vue
@@ -58,7 +58,7 @@ export default {
 		leverShow:{
 			deep: true,
 			handler:function(newVal,oldVal) {
-				console.log(newVal, '下拉组件leverShow更新');
+				// console.log(newVal, '下拉组件leverShow更新');
 				this.$nextTick(() => {
 					this.text=this.list[newVal].label;
 				})
@@ -67,7 +67,7 @@ export default {
 		list:{
 			deep: true,
 			handler:function(newVal,oldVal) {
-				console.log(newVal, '下拉组件list更新');
+				// console.log(newVal, '下拉组件list更新');
 				if(this.contract==1&&this.list){
 					this.text=this.list[1].label
 				}else if(this.contract==0&&this.list){
diff --git a/pages/assets/draw.vue b/pages/assets/draw.vue
index f2107b3..1149891 100644
--- a/pages/assets/draw.vue
+++ b/pages/assets/draw.vue
@@ -116,16 +116,30 @@
 
             </v-input>
           </view>
-										<view class="d-flex align-center p-y-xs m-t-ms justify-between color-light fn-15">
-											<span>{{ $t("reg.a8") }}：</span>
-											<!-- <span class="color-light">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
-										</view>
-										<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-y-sm">
+					<view class="d-flex align-center p-y-xs m-t-ms justify-between color-light fn-15">
+						<span>{{ $t("reg.a8") }}：</span>
+						<!-- <span class="color-light">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
+					</view>
+					<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-y-sm">
 
-											<v-input type="password" v-model="form.password" class="p-x-ms color-light w-max fn-13 rounded-xs" :placeholder="$t('reg.a9')">
+						<v-input type="password" v-model="form.password" class="p-x-ms color-light w-max fn-13 rounded-xs" :placeholder="$t('reg.a9')">
 
-											</v-input>
-										</view>
+						</v-input>
+					</view>
+					<!-- 提币验证码 -->
+					<view class="d-flex align-center p-y-xs m-t-ms justify-between color-light fn-15">
+						<span>{{ $t("safe.a5") }}：</span>
+					</view>
+					<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-sm p-x-ms">
+						<v-input type="text" v-model="form.emailcode" class=" w-8/12 color-light fn-13"
+										 :placeholder="$t('safe.a6')"></v-input>
+						<view class="d-flex align-end">
+							<view class="all color-theme-1 m-l-md flex-shrink" @click="getEmailCode">
+								<text v-if="!getEmailCodeLock">{{ $t("common.getCode") }}</text>
+								<text v-else>{{ daojishi }}</text>
+							</view>
+						</view>
+					</view>
         </view>
         <view class="form bg-panel-3 p-x-lg p-y-md">
           <ul class="fn-md rounded-md m-y-xs line-height-2">
@@ -221,6 +235,7 @@
 <script>
 import coinList from "./coin-list";
 import Wallet from "@/api/wallet";
+import Member from "@/api/member";
 import formData from "@/utils/class/date";
 
 export default {
@@ -240,14 +255,18 @@ export default {
         addressType: "",
         code_type: 1,
                 code: '',
-								password: ''
+								password: '',
+				emailcode: '',
       },
       withdrawFee: {},
       list: [],
       page: 1,
       loadMore: true,
       secondaryShow: false,
-      type: 'draw'
+      type: 'draw',
+			getEmailCodeLock: false,
+			JStime: 0,
+			tiemr: null,
     };
   },
   computed: {
@@ -257,6 +276,9 @@ export default {
           (item) => item.coin_name == this.coin
       );
     },
+		daojishi(){
+			return '('+this.JStime + 's' + ')';
+		}
   },
   watch: {
     coin(n) {
@@ -306,6 +328,40 @@ export default {
         this.withdrawFee = res.data;
       });
     },
+		// 獲取邮箱验证码
+		getEmailCode(){
+			if (!this.form.address) {
+				this.$toast(this.$t('assets.b9'))
+				return
+			}
+			if (!this.form.amount) {
+				this.$toast(this.$t('assets.c2'))
+				return
+			}
+			if (!this.form.password) {
+				this.$toast(this.$t('reg.a9'))
+				return
+			}
+			if(this.getEmailCodeLock){return};
+			this.JStime = 300;
+			this.tiemr = setInterval(()=>{
+				if(this.JStime===0){
+					this.getEmailCodeLock = false;
+					clearInterval(this.tiemr);
+					return;
+				}
+				this.JStime--;
+			}, 1000)
+			this.getEmailCodeLock = true;
+			Member.getWdcode({bt:this.coin,baddr:this.form.address,bnum:this.form.amount}).then(res=>{
+				// console.log(res);
+				if(res.code=='4001'){
+					this.$toast(res.message);
+				}else{
+					this.$toast(this.$t('common.sendSuccess'));
+				}
+			})
+		},
     // 发起提币
     toDraw() {
       if (!this.form.address) {
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index e524760..645d5bd 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -155,7 +155,6 @@
             <v-link class="color-sell" v-if="agreement.clause" :to="{path:'/pages/notice/detail',query:{id:agreement.clause.id}}">《{{agreement.clause.title}}》</v-link>
           </view>
         </view>
-		<tf-verify-img @succeed="chenggong" @close="showVerify = false" v-if="showVerify" :verifyImgs="imgs"></tf-verify-img>
         <v-button type="blue"  block class="w-max m-b-md rounded-md" @click="register">{{$t('reg.b9')}}</v-button>
       </view>
     </view>
@@ -171,7 +170,6 @@
 <script>
 import Member from "@/api/member";
 import app from "app.js";
-import tfVerifyImg from '@/components/tf-verify-img/tf-verify-img.vue';
 
 export default {
   data() {
@@ -194,22 +192,13 @@ export default {
       agreement: {},
       country_code:'',
 	   
-			showVerify:false,
-			imgs:[{
-					src:'/static/verify/0.jpeg',
-					color:'#38a7b7'
-			},{
-					src:'/static/verify/1.jpeg',
-					color:'#485967'
-			}],
-			sendAAA: false,	
 			hideImg: false
     };
 
   },
   computed: {
   },
-  components:{tfVerifyImg},
+  components:{},
   methods: {
     register() {
         if (!this.form.account) {
@@ -324,21 +313,6 @@ export default {
         this.agreement = res.data;
       });
     },
-	// 拼图滑块
-	changeSLider(){
-		this.showVerify = true;
-	},
-	open(){
-			console.log("open");
-			this.showVerify = true;
-	},
-	chenggong(){
-			uni.showToast({
-					title: this.$t('homeNewText.dd1')
-			});
-			this.showVerify = false;
-			this.sendAAA = true;
-	}
   },
   mounted() {
     this.gett_gc_code();