From f018d9c7cbea52bd3aed4ddd1d31ce56cea92949 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Tue, 31 Oct 2023 18:52:52 +0800
Subject: [PATCH] 1

---
 layout/vCode.vue               | 13 +++++--------
 pages/base/home.vue            | 19 +++++++++++++------
 pages/safe/forget-password.vue |  8 ++++----
 pages/safe/login-password.vue  | 18 +++++++++---------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/layout/vCode.vue b/layout/vCode.vue
index d4ed9b8..c4b719c 100644
--- a/layout/vCode.vue
+++ b/layout/vCode.vue
@@ -76,15 +76,12 @@ export default {
       if (this.load) return;
       this.inSend = true;
 			serve.post(this.url, this.data)
-        .then(() => {
-          if(res.code!='200'){//4001|1004
+        .then((res) => {
+          if(res.code!=200){//4001|1004
           	this.inSend = false         
-          	// 如果返回错误码
-						if(this.url=='/register/sendEmailCode'){
-							// 如果获取验证码的接口要求填写图形验证码
-							// 图形重新获取一次
-							this.$emit('reGetGraphChe')
-						}
+          	// 如果返回错误码，图形重新获取一次
+						this.$emit('reGetGraphChe')
+
           }else{
           	this.inSend = false;
           	this.load = true;
diff --git a/pages/base/home.vue b/pages/base/home.vue
index 31d7b27..4d5f40f 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -349,9 +349,9 @@
 										<view class="fn-12" style="color: #999;">{{ $t("homeNewText.cc8") }}</view>
 									</view>
 									<view class="zhanshi"></view>
-									<view class="btn"><image src="../../assets/img/home/antFill-apple@2x.png" mode=""></image>App Store</view>
-									<view class="btn"><image src="../../assets/img/home/md-android@2x.png" mode=""></image>Android</view>
-									<view class="btn"><image src="../../assets/img/home/riFill-google-play-fill@2x.png" mode="">Google Play</image></view>
+									<view class="btn" @click="toDwon()"><image src="../../assets/img/home/antFill-apple@2x.png" mode=""></image>App Store</view>
+									<view class="btn" @click="toDwon()"><image src="../../assets/img/home/md-android@2x.png" mode=""></image>Android</view>
+									<view class="btn" @click="toDwon()"><image src="../../assets/img/home/riFill-google-play-fill@2x.png" mode="">Google Play</image></view>
 								</view>
 								<!-- 帮助中心 -->
 								<view style="width: 700rpx;margin: 120rpx auto 40rpx;" v-if="0">
@@ -390,7 +390,7 @@
 									<view v-if="!isLogin" class="jump_btn" @click="goReg">
 										{{ $t("homeNewText.aa3") }}
 									</view>
-									<view v-else class="jump_btn" @click="goExchange">
+									<view v-else class="jump_btn" @click="goMine">
 										{{ $t("homeNewText.aa4") }}
 									</view>
 								</view>
@@ -734,8 +734,7 @@ export default {
         },
         goExchange() {
             this.show = false;
-            // this.tabChange('exchange-operation')
-            this.tabChange('mine')
+            this.tabChange('exchange-operation')
         },
 				goReg(){
 					uni.navigateTo({
@@ -1005,6 +1004,14 @@ export default {
                 this.detail = res.data
             })
         },
+				toDwon(){
+					// #ifdef APP
+					// plus.
+					// #endif
+					// #ifdef H5
+					window.open('https://app.ajcoins.com/download/index.html', '_blank')// 打开一个新标签
+					// #endif
+				}
     },
     mounted() {
         this.onRefresh();
diff --git a/pages/safe/forget-password.vue b/pages/safe/forget-password.vue
index e7e1a45..b616448 100644
--- a/pages/safe/forget-password.vue
+++ b/pages/safe/forget-password.vue
@@ -24,7 +24,7 @@
 				<!--图形验证码-->
 				<view class="form-item border-b p-md">
 					<view class="label m-b-xs">{{$t('common.GraphicValidation')}}</view>
-					<v-input class="color-light" v-model="form.gr_code" :placeholder="$t('common.GraphicValidation')">
+					<v-input class="color-light" v-model="form.gc_code" :placeholder="$t('common.GraphicValidation')">
 						<template #right>
 							<img :src="Graph_che" @click="gett_gc_code" v-if="!hideImg">
 						</template>
@@ -44,11 +44,11 @@
           </view>
         </view>
         <view class="form-item border-b p-md" v-if="checkData.email_status==1">
-          <view class="label m-b-xs">{{$t('safe.a5')}}AA</view>
+          <view class="label m-b-xs">{{$t('safe.a5')}}</view>
           <view class="input color-light">
             <v-input v-model="form.email_code" :placeholder="$t('safe.a6')">
               <template #right>
-                <v-code url="/user/sendEmailCodeForgetPassword" :data="{email:form.account}"></v-code>
+                <v-code url="/user/sendEmailCodeForgetPassword" :data="{email:form.account,gc_code: form.gc_code}"></v-code>
               </template>
             </v-input>
           </view>
@@ -82,7 +82,7 @@ export default {
         password: "",
         password_confirmation: "",
         show:false,
-				gr_code: ''
+				gc_code: ''
       },
       checkData: {},
 			Graph_che:'',
diff --git a/pages/safe/login-password.vue b/pages/safe/login-password.vue
index 5f302db..a987545 100644
--- a/pages/safe/login-password.vue
+++ b/pages/safe/login-password.vue
@@ -21,15 +21,15 @@
         </view>
       </view>
 	  
-	  <view class="form-item border-b p-md">
-	  	<view class="label m-b-xs">{{$t('common.GraphicValidation')}}</view>
-	  	<v-input class="color-light" v-model="form.gr_code" :placeholder="$t('common.GraphicValidation')">
-	  		<template #right>
-	  			<img :src="Graph_che" @click="gett_gc_code" v-if="!hideImg">
-	  		</template>
-	  	</v-input>
-	  	
-	  </view>
+			<view class="form-item border-b p-md" v-if="0">
+				<view class="label m-b-xs">{{$t('common.GraphicValidation')}}</view>
+				<v-input class="color-light" v-model="form.gr_code" :placeholder="$t('common.GraphicValidation')">
+					<template #right>
+						<img :src="Graph_che" @click="gett_gc_code" v-if="!hideImg">
+					</template>
+				</v-input>
+				
+			</view>
       <view class="form-item border-b p-md" v-if="user.phone_status==1">
         <view class="label m-b-xs">SMS{{$t('safe.a7')}}</view>
         <view class="input color-light">