From cb515a69aff5be81a2dc2937e65cbc88f5e228a5 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 27 Oct 2023 10:11:05 +0800
Subject: [PATCH] =?UTF-8?q?v-code=E6=98=AF=E5=85=AC=E5=85=B1=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=B5=81=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/vCode.vue               | 12 +++++++++---
 pages/reg/index.vue            |  3 ++-
 pages/safe/forget-password.vue |  2 +-
 pages/safe/login-password.vue  |  9 +++++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/layout/vCode.vue b/layout/vCode.vue
index 7a46ad2..d77af2c 100644
--- a/layout/vCode.vue
+++ b/layout/vCode.vue
@@ -75,13 +75,19 @@ export default {
         }
       if (this.load) return;
       this.inSend = true;
-			Member.sendEmailCode(this.data)
+			//this.url是父组件传进来的
+			serve.post(this.url, this.data)
 				.then((res) => {
 					if(res.code=='4001'){          
 						this.inSend = false         
 						this.$toast(res.message);
-						//如果返回报错，让图形重新获取一次
-						this.$emit('reGetGraphChe')
+						// 如果返回错误码
+						if(this.url=='/register/sendEmailCode'){
+							// 如果获取验证码的接口要求填写图形验证码
+							// 图形重新获取一次
+							this.$emit('reGetGraphChe')
+						}
+						
 					}else{
 						this.inSend = false;
 						this.load = true;
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index e74b761..48e19b0 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -227,7 +227,8 @@ export default {
       Member.register(this.form).then((res) => {
 
           if(res.code != 200){
-              this.$toast(res.message)
+              this.$toast(res.message);
+							this.reGetGraphChe();
               return false
           }
         // #ifdef H5
diff --git a/pages/safe/forget-password.vue b/pages/safe/forget-password.vue
index 50fe77b..84acdc1 100644
--- a/pages/safe/forget-password.vue
+++ b/pages/safe/forget-password.vue
@@ -6,7 +6,7 @@
         <view class="form-item border-b p-md">
           <view class="label m-b-xs">{{$t('safe.b1')}}</view>
           <view class="input color-light">
-            <v-input v-model="form.account" :placeholder="`${$t('safe.b2')}`" @blur="checkAccount"></v-input>
+            <v-input v-model="form.account" :placeholder="`${$t('safe.a4')}`" @blur="checkAccount"></v-input>
           </view>
         </view>
         <view class="form-item border-b p-md">
diff --git a/pages/safe/login-password.vue b/pages/safe/login-password.vue
index 440ee61..5abcc31 100644
--- a/pages/safe/login-password.vue
+++ b/pages/safe/login-password.vue
@@ -2,6 +2,12 @@
   <v-page class="pos-login">
     <v-header :title="$t('safe.c8')"></v-header>
     <main class=" m-x-xl bg-panel-3 p-x-lg p-y-lg rounded-md box-shadow">
+			<view class="form-item border-b p-md">
+			  <view class="label m-b-xs">{{$t('safe.b1')}}</view>
+			  <view class="input color-light">
+			    <v-input v-model="form.account" :placeholder="`${$t('safe.a4')}`" @blur="checkAccount"></v-input>
+			  </view>
+			</view>
       <view class="form-item border-b p-md ">
         <view class="label m-b-xs">{{$t('safe.b3')}}</view>
         <view class="input color-light">
@@ -86,6 +92,9 @@ export default {
     this.gett_gc_code();
   },
   methods: {
+		checkAccount(){
+			
+		},
 	//获取图形验证码
 	refreshCaptcha() {
 	    axios.get('/register/Graph_che')