From 8a4cef01eee1421e0c270d1a91dcf2c44d0506f0 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 13 Oct 2023 15:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BE=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/serve/index.js  |  2 +-
 layout/vCode.vue    | 50 +++++++++++++++++++++++----------------------
 pages/reg/index.vue | 11 +++++-----
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/api/serve/index.js b/api/serve/index.js
index ed9e1a0..d28141c 100644
--- a/api/serve/index.js
+++ b/api/serve/index.js
@@ -86,7 +86,7 @@ x.fn = x.prototype = {
             if(Cache.get(newMsg).data){
 				if(newMsg!='_user_walletImage'&& newMsg!='_user_getAuthInfo' && newMsg!='_user_withdrawalBalance' 
 				&& newMsg!='_article_detail' && newMsg!='_contract_getSymbolDetail' && newMsg!='_categoryList' && newMsg!='_articleList'
-				&& newMsg!='_user_wdcode' && newMsg!='_register_Graph_che'
+				&& newMsg!='_user_wdcode' && newMsg!='_register_Graph_che' && newMsg!='_register_sendEmailCode'
 				 && newMsg!='_college' && newMsg!='_exchange_getCoinInfo' && newMsg!='_user_primaryAuth' && newMsg!='_exchange_getCurrentEntrust'
 				&& newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum'){
 					resolve(Cache.get(newMsg).data);
diff --git a/layout/vCode.vue b/layout/vCode.vue
index 40b4c2b..0e87baa 100644
--- a/layout/vCode.vue
+++ b/layout/vCode.vue
@@ -52,7 +52,7 @@ export default {
 	watch: {
 		sendAAA(n,o){
 			if(n){
-				console.log(n, '-------');
+				// console.log(n, '-------');
 				// setTimeout(()=>{
 				// 	this.inSend = false;
 				// 	this.load = true;
@@ -84,7 +84,7 @@ export default {
   methods: {
     // 发送验证码
     send() {
-			console.log(this.sendAAA, '-------this.sendAAA');
+			// console.log(this.sendAAA, '-------this.sendAAA');
         if(this.data.phone==''){
             this.$toast(this.$t('reg.a3'))
             return
@@ -95,28 +95,30 @@ export default {
         }
       if (this.load) return;
       this.inSend = true;
-			if(this.url==="/register/sendEmailCode" && !this.sendAAA){
-				this.$emit('changeSLider', true);
-				
-			}else{
-				// serve.post(this.url, this.data)
-				Member.sendEmailCode(this.data)
-				  .then((res) => {
-						if(res.code=='4001'){          
-							this.inSend = false         
-							this.$toast(res.message);
-						}else{
-							this.inSend = false;
-							this.load = true;
-							this.countDown();
-							this.$toast(this.$t('common.sendSuccess'));
-							this.$emit('changeSendAAA', false)
-						}
-					})
-				  .catch(() => {
-				    this.inSend = false;
-				  });
-			}
+			// 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'){          
+						this.inSend = false         
+						this.$toast(res.message);
+						//如果返回报错，让图形重新获取一次
+						this.$emit('reGetGraphChe')
+					}else{
+						this.inSend = false;
+						this.load = true;
+						this.countDown();
+						this.$toast(this.$t('common.sendSuccess'));
+						// this.$emit('changeSendAAA', false)
+					}
+				})
+				.catch(() => {
+					this.inSend = false;
+				});
+			
       
     },
     countDown() {
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index daacb50..2910d77 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -71,7 +71,7 @@
           </template>
         </view>
 				<!--图形验证码-->
-				<view class="form-item border-b m-b-md p-b-xs" v-if="0">
+				<view class="form-item border-b m-b-md p-b-xs" >
 					<view class="label m-b-xs">{{$t('homeNewText.ee6')}}</view>
 					<v-input class="color-light" v-model="form.gr_code" :placeholder="$t('homeNewText.ee6')">
 						<template #right>
@@ -95,7 +95,7 @@
 							}"
 							></v-code>
               <!-- 邮箱 -->
-              <!-- <v-code
+              <v-code
                 url="/register/sendEmailCode"
                 :data="{
                 email:form.account,
@@ -104,8 +104,9 @@
 								gc_key: gc_key,
               }"
                 v-show="form.type==2"
-              ></v-code> -->
-							<v-code
+								@reGetGraphChe="gett_gc_code"
+              ></v-code>
+							<!-- <v-code
 								url="/register/sendEmailCode"
 								:data="{
 								email:form.account,
@@ -116,7 +117,7 @@
 								@changeSLider="changeSLider"
 								:sendAAA="sendAAA"
 								@changeSendAAA="sendAAA = false"
-							></v-code>
+							></v-code> -->
             </template>
           </v-input>
         </view>