修改问题

api/member.js

@@ -132,6 +132,10 @@ class Member {
     static serviceDetail(data) {
         return server.get(`/article/serviceDetail`, data);
     }
+	// 提币获取邮箱验证码
+	static getWdcode(data){
+		return server.get(`/user/wdcode`, data);
+	}
 }
 
 export default Member;

api/serve/index.js

@@ -89,7 +89,7 @@ x.fn = x.prototype = {
 				&& newMsg!='_article_detail' && newMsg!='_login_clause'
 				 && newMsg!='_indexList'&& newMsg!='_user_subscribe'&& newMsg!='_contract_getSymbolDetail' && newMsg!='_user_withdrawalRecord'){
 					
-					resolve(Cache.get(newMsg).data);
+					// resolve(Cache.get(newMsg).data);
 
 				}
                 uni.request({

i18n/lang/de.json

@@ -67,7 +67,8 @@
     "c4": "Geschätzte Spanne",
     "c7": "Der aktuelle wert",
     "c6": "Oranı artır",
-    "c5": "Ihre Überweisungsaufgabe wurde erfolgreich eingereicht, warten Sie bitte geduldig, und das Übertragungsergebnis wird per SMS oder E-Mail benachrichtigt. Bitte überprüfen Sie es sorgfältig. Bei Fragen wenden Sie sich bitte rechtzeitig an den Kundenservice."
+    "c5": "Ihre Überweisungsaufgabe wurde erfolgreich eingereicht, warten Sie bitte geduldig, und das Übertragungsergebnis wird per SMS oder E-Mail benachrichtigt. Bitte überprüfen Sie es sorgfältig. Bei Fragen wenden Sie sich bitte rechtzeitig an den Kundenservice.",
+	"GraphicValidation": "Grafische Überprüfung"
   },
   "base": {
     "a0": "Titel",

i18n/lang/en.json

@@ -108,7 +108,8 @@
 		"c4": "Size",
 		"c5": "your transfer order has been submitted successfully, please wait patiently, and the transfer result will be notified by SMS or e-mail. Please check it carefully. If you have any questions, please contact the customer service in time.",
 		"c6": "Increase ratio",
-		"c7": "Current valuation"
+		"c7": "Current valuation",
+		"GraphicValidation": "Graphical verification"
 	},
 	"base": {
 		"a0": "Title",

i18n/lang/fra.json

@@ -67,7 +67,8 @@
     "c4": "Marge estimée",
     "c7": "La valorisation actuelle",
     "c6": "Augmenter le rapport",
-    "c5": "votre commande de transfert a été soumise avec succès. Veuillez patienter. Les résultats du transfert seront notifiés par SMS ou e - mail. Veuillez vérifier et contacter le service à la clientèle en cas de doute."
+    "c5": "votre commande de transfert a été soumise avec succès. Veuillez patienter. Les résultats du transfert seront notifiés par SMS ou e - mail. Veuillez vérifier et contacter le service à la clientèle en cas de doute.",
+	"GraphicValidation": "Vérification graphique"
   },
   "base": {
     "a0": "Titre",

i18n/lang/it.json

@@ -67,7 +67,8 @@
     "c4": "Margine stimato",
     "c7": "Valutazione attuale",
     "c6": "Aumenta il rapporto",
-    "c5": "l'ordine di trasferimento è stato presentato con successo, si prega di attendere pazientemente, e il risultato di trasferimento sarà notificato via SMS o e-mail. Si prega di controllare attentamente. Se avete domande, si prega di contattare il servizio clienti in tempo."
+    "c5": "l'ordine di trasferimento è stato presentato con successo, si prega di attendere pazientemente, e il risultato di trasferimento sarà notificato via SMS o e-mail. Si prega di controllare attentamente. Se avete domande, si prega di contattare il servizio clienti in tempo.",
+	"GraphicValidation": "Verifica grafica"
   },
   "base": {
     "a0": "titolo",

i18n/lang/jp.json

@@ -67,7 +67,8 @@
     "c4": "仮勘定保証金",
     "c6": "増加率",
     "c7": "現在の評価値",
-    "c5": "あなたの振替注文書はすでに提出されました。待ってください。振り替え結果はメールやメールで通知されます。ご確認ください。問題があれば、すぐにカスタマーサービスに連絡してください。"
+    "c5": "あなたの振替注文書はすでに提出されました。待ってください。振り替え結果はメールやメールで通知されます。ご確認ください。問題があれば、すぐにカスタマーサービスに連絡してください。",
+	"GraphicValidation": "グラフィカルな検証"
   },
   "base": {
     "a0": "タイトル",

i18n/lang/kor.json

@@ -67,7 +67,8 @@
     "c4":"보증금 예상",
 	"c6":"증가 비율",
 	"c7":"현재가치평가",
-    "c5": "당신 의 이월 주문 서 는 이미 제출 되 었 습 니 다. 인내심 을 가지 고 기 다 려 주 십시오. 이월 결 과 는 문자 나 우편 으로 통지 할 것 입 니 다. 수령 에 주의 하 십시오. 궁금 한 점 이 있 으 면 즉시 고객 센터 에 연락 하 십시오."
+    "c5": "당신 의 이월 주문 서 는 이미 제출 되 었 습 니 다. 인내심 을 가지 고 기 다 려 주 십시오. 이월 결 과 는 문자 나 우편 으로 통지 할 것 입 니 다. 수령 에 주의 하 십시오. 궁금 한 점 이 있 으 면 즉시 고객 센터 에 연락 하 십시오.",
+	"GraphicValidation": "그래픽 검증"
   },
   "base": {
     "a0":"표제.",

i18n/lang/pt.json

@@ -67,7 +67,8 @@
     "c4":"Margem estimada",
 	"c6":"Aumentar proporção",
 	"c7":"A avaliação atual",
-    "c5": "Sua ordem de transfer ência FOI enviada com sucesso, por favor aguarde pacientemente, e o Resultado Da transferência será notificado por SMS ou e-mail. Por favor, verifique-o com cuidado. Se você tiver quaisquer perguntas, por favor contacte o serviço de cliente a tempo."
+    "c5": "Sua ordem de transfer ência FOI enviada com sucesso, por favor aguarde pacientemente, e o Resultado Da transferência será notificado por SMS ou e-mail. Por favor, verifique-o com cuidado. Se você tiver quaisquer perguntas, por favor contacte o serviço de cliente a tempo.",
+	"GraphicValidation": "Verificação gráfica"
   },
   "base": {
     "a0":"Título",

i18n/lang/spa.json

@@ -67,7 +67,8 @@
     "c4":"margen estimado",
 	"c6":"Relación de aumento",
 	"c7":"La valoración actual",
-    "c5": "su orden de transferencia ha sido enviada con éxito, por favor espere pacientemente, los resultados de la transferencia serán notificados por SMS o correo electrónico. Por favor, preste atención a la recepción, si tiene alguna pregunta por favor póngase en contacto con el servicio al cliente a tiempo."
+    "c5": "su orden de transferencia ha sido enviada con éxito, por favor espere pacientemente, los resultados de la transferencia serán notificados por SMS o correo electrónico. Por favor, preste atención a la recepción, si tiene alguna pregunta por favor póngase en contacto con el servicio al cliente a tiempo.",
+	"GraphicValidation": "Verificación gráfica"
   },
   "base": {
     "a0":"Título",

i18n/lang/tr.json

@@ -67,7 +67,8 @@
     "c4": "tahmin edilen margin",
     "c6": "Oranı artır",
     "c7": "Mevcut değerleme",
-    "c5": "Taşıma emriniz başarıyla teslim edildi, lütfen sabırlı bekleyin ve aktarım sonuçları SMS veya e-posta tarafından bildirilecek. Lütfen dikkatli kontrol edin. Bir sorununuz varsa, lütfen müşteri hizmetine zamanında temas edin."
+    "c5": "Taşıma emriniz başarıyla teslim edildi, lütfen sabırlı bekleyin ve aktarım sonuçları SMS veya e-posta tarafından bildirilecek. Lütfen dikkatli kontrol edin. Bir sorununuz varsa, lütfen müşteri hizmetine zamanında temas edin.",
+	"GraphicValidation": "Grafiksel doğrulama"
   },
   "base": {
     "a0": "Başlık",

i18n/lang/zh-TW.json

@@ -108,7 +108,8 @@
 		"c4": "數量",
 		"c5": "您的劃轉訂單已提交成功，請耐心等待，劃轉結果會以簡訊或郵件的管道通知。請注意查收，如有疑問請及時聯系客服",
 		"c6": "漲幅比例",
-		"c7": "當前估值"
+		"c7": "當前估值",
+		"GraphicValidation": "圖形驗證"
 	},
 	"base": {
 		"a0": "標題",

pages/assets/draw.vue

@@ -116,7 +116,22 @@
 
             </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-center justify-between bg-form-panel-3 rounded-xs p-y-sm">
+		  	<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-light m-l-md flex-shrink fn-12" @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">
             <li>·{{ $t("assets.c5") }}。</li>
@@ -212,7 +227,7 @@
 import coinList from "./coin-list";
 import Wallet from "@/api/wallet";
 import formData from "@/utils/class/date";
-
+import Member from "@/api/member";
 export default {
   components: {
     coinList,
@@ -236,7 +251,10 @@ export default {
       page: 1,
       loadMore: true,
       secondaryShow: false,
-	  type: 'draw'
+	  type: 'draw',
+	  getEmailCodeLock: false,
+	  JStime: 0,
+	  tiemr: null,
     };
   },
   computed: {
@@ -246,6 +264,9 @@ export default {
           (item) => item.coin_name == this.coin
       );
     },
+	daojishi(){
+		return '('+this.JStime + 's' + ')';
+	}
   },
   watch: {
     coin(n) {
@@ -295,6 +316,46 @@ 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.form.gr_code) {
+		// 	this.$toast(this.$t('common.GraphicValidation'))
+		// 	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) {

pages/reg/index.vue

@@ -7,9 +7,7 @@
               <!-- <img :src="$localImgUrl('Page6.png')" alt="" class="h-20 m-r-xs" /> -->
               <span class="color-light">
                 <v-lang
-                  @change="
-                    marketList = [];clause()
-                  "
+                  @change="changeLang"
                 ></v-lang>
                 <i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
               </span>
@@ -36,7 +34,7 @@
 		  </view> -->
 
 
-          <view
+          <view 
             class="item transition-3 p-y-sp-r-sm p-x-xs fn-20"
             :class="{
                 'color-light':form.type==2
@@ -72,11 +70,11 @@
         </view>
         <!--图形验证码-->
         <view class="form-item border-b m-b-md p-b-xs">
-          <view class="label m-b-xs">Captcha</view>
-          <v-input class="color-light" v-model="form.gr_code" placeholder='Please enter graphic results'>
+          <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">
+              <img :src="Graph_che" @click="gett_gc_code" v-if="!hideImg" style="margin-left: 20rpx;">
             </template>
           </v-input>
         </view>
@@ -104,6 +102,7 @@
                 type:1
               }"
                 v-show="form.type==2"
+				@reGetGraphChe="reGetGraphChe"
               ></v-code>
             </template>
           </v-input>
@@ -125,7 +124,7 @@
 		  <view class="label m-b-xs">{{$t('reg.c6')}}</view>
 		  <v-input class="color-light" v-model="form.invitationCode" type="password" :placeholder="$t('reg.c7')"></v-input>
 		</view> -->
-        <view class="form-item border-b m-b-md p-b-xs">
+        <view class="form-item border-b m-b-md p-b-xs" v-if="showInvite_code">
           <view class="label m-b-xs">{{$t('reg.c6')}}</view>
           <!-- <v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}（${$t('reg.b4')}）`"></v-input> -->
 		  <v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}`"></v-input>
@@ -178,7 +177,9 @@ export default {
       gc_key:'', // tuxiangyanzheng key
       check: false,
       agreement: {},
-      country_code:''
+      country_code:'',
+	  showInvite_code: true,
+	  hideImg: false
     };
 
   },
@@ -213,7 +214,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
@@ -248,18 +250,23 @@ export default {
     },
         
     //获取图形验证码
-    refreshCaptcha() {
-      axios.get('/register/Graph_che')
-          .then(response => {
-            // 重新加载验证码图片
-          })
-          .catch(error => {
-            console.log(error);
-          });
+    reGetGraphChe() {
+      // axios.get('/register/Graph_che')
+      //     .then(response => {
+      //       // 重新加载验证码图片
+      //     })
+      //     .catch(error => {
+      //       console.log(error);
+      //     });
+	  this.hideImg = true;
+	  this.gett_gc_code();
     },
 
     gett_gc_code(){
       Member.Graph_che().then((res)=>{
+		  if(res.code==200){
+		  	this.hideImg = false;
+		  }
         console.log("gc",res.data.img)
         this.Graph_che = res.data.img;
         this.gc_key= res.data.key;
@@ -291,6 +298,9 @@ export default {
         this.agreement = res.data;
       });
     },
+	changeLang(){
+		this.clause();
+	}
   },
   mounted() {
     this.gett_gc_code();
@@ -298,6 +308,9 @@ export default {
   onLoad(query){
     this.query = query
     this.form.invite_code = this.query.invite_code||this.form.invite_code
+	if(this.query.invite_code){
+		this.showInvite_code = false;
+	}
   },
   created() {
     this.clause();

pages/safe/forget-password.vue

@@ -21,6 +21,17 @@
             <v-input type="password" v-model="form.password_confirmation" :placeholder="$t('safe.b6')"></v-input>
           </view>
         </view>
+		
+		<!--图形验证码-->
+		<view class="form-item border-b p-md">
+			<view class="label m-b-xs">{{$t('common.GraphicValidation')}}</view>
+			<v-input class="" v-model="form.gc_code" :placeholder="$t('common.GraphicValidation')">
+				<template #right>
+					<img :src="Graph_che" @click="gett_gc_code" v-if="!hideImg" style="margin-left: 20rpx;">
+				</template>
+			</v-input>
+		</view>
+		
         <view class="form-item border-b p-md" v-if="checkData.phone_status==1&&show">
           <view class="label m-b-xs">SMS{{$t('safe.a7')}}</view>
           <view class="input color-light">
@@ -34,7 +45,8 @@
             </v-input>
           </view>
         </view>
-        <view class="form-item border-b p-md" v-if="checkData.email_status==1">
+		
+        <view class="form-item border-b p-md" v-if="checkData.email_status==1||1">
           <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')">
@@ -60,6 +72,7 @@
 </template>
 <script>
 import Setting from "@/api/setting";
+import Member from "@/api/member";
 export default {
   data() {
     return {
@@ -71,9 +84,13 @@ export default {
         google_code: "",
         password: "",
         password_confirmation: "",
-        show:false
+        show:false,
+		gc_code: '',
+		gc_key: '',// tuxiangyanzheng key
       },
       checkData: {},
+	  Graph_che:'',
+	  hideImg: false
     };
   },
   computed: {
@@ -117,10 +134,34 @@ export default {
         }
       Setting.forgetPassword(this.form, { btn: this.$refs.btn })
         .then(() => {
-          this.$back();
+          if(res.code==200){
+          		this.$back();
+          	}else{
+          		this.reGetGraphChe();
+          	}
         })
-        .catch(() => {});
+        .catch(() => {
+			this.reGetGraphChe();
+		});
     },
+	// 重新请求图形验证码
+	reGetGraphChe(){
+		this.hideImg = true;
+		this.gett_gc_code();
+	},
+	gett_gc_code(){
+		Member.Graph_che().then((res)=>{
+			if(res.code==200){
+				this.hideImg = false;
+			}
+		  // console.log("gc",res.data.img)
+		  this.Graph_che = res.data.img;
+		  this.form.gc_key= res.data.key;
+		});
+	},
+  },
+  mounted() {
+    this.gett_gc_code();
   },
 };
 </script>

pages/safe/login-password.vue

@@ -73,9 +73,11 @@ export default {
     setPassword() {
       let data = this.form;
       Setting.updatePassword(data, { btn: this.$refs.btn })
-        .then(() => {
-          this.$back();
-          this.$toast.success(this.$t('safe.d3'));
+        .then((res) => {
+			if(res.code==200){
+         		this.$back();
+         		this.$toast.success(this.$t('safe.d3'));
+         	}
         })
         .catch(() => {});
     },