新增提币密码

src/api/setting.js

@@ -77,6 +77,10 @@ class Setting {
     static updatePassword(data) {
         return server.post(`/user/updatePassword`, data);
     }
+	
+	static withdrawalPassword(data) {
+	    return server.post(`/user/withdrawalPassword`, data);
+	}
     /**
      * 获取验证码
      * @param {object} data

src/components/CommonFooter.vue

@@ -251,7 +251,7 @@
         <div style="font-size: 20px;">{{ $t("homeNewText.hh44",{name:"Iwebcoin"}) }}</div>
 		<router-link class="jump_btn" to="/sign-up" v-if="!isLogin">{{ $t("homeNewText.hh48") }}</router-link>
         <router-link class="jump_btn" to="/exchange" v-else>{{ $t("homeNewText.hh45") }}</router-link>
-        <img src="" alt="" style="width: 120px;height: 120px;background-color: #ccc;">
+        <img src="@/assets/img/home/iweb.png" alt="" style="width: 120px;height: 120px;background-color: #ccc;">
         <div style="font-size: 16px; color: #9C9C9C;margin-top: 12px;text-align: center;">{{ $t("homeNewText.hh46",{name:"Iwebcoin"}) }}</div>
       </div>
     </div>

src/i18n/de.json

@@ -184,7 +184,11 @@
 		"footerTips1": "Risikoinvestitionen auf dem Markt sollten vorsichtig sein",
 		"footerTips2": "Rechtliche Hinweise: Die Website wird von {name} Firma betrieben",
 		"footerTips3": "Risikotipp: Digital Asset Trading kann zu Ihrem Verlust des Kapitals führen, stellen Sie bitte sicher, dass Sie die Risiken vollständig verstehen",
-		"footerTips4": "Eingeschränkte Gebiete: nicht in der Lage, Gebietsansässigen bestimmter Länder (z. B. Israel und der Islamischen Republik China) Dienstleistungen zu erbringen"
+		"footerTips4": "Eingeschränkte Gebiete: nicht in der Lage, Gebietsansässigen bestimmter Länder (z. B. Israel und der Islamischen Republik China) Dienstleistungen zu erbringen",
+		"c12": "Informationen ablehnen",
+		"c13": "Entzugspasswort",
+		"c14": "Bitte geben Sie das Auszahlungspasswort ein",
+		"c15": "Auszahlungspasswort zurücksetzen"
 	},
 	"exchange": {
 		"search": "Suche",
@@ -1147,6 +1151,7 @@
 		"hh23": "Zum Herunterladen den QR-Code scannen",
 		"hh24": "Die verschlüsselte Welt öffnet sich sofort",
 		"hh25": "Registrieren/Anmelden",
+		"hh26": "Starten Sie jetzt Ihre Geldreise",
 
 		"hh44": "{name}, jederzeit und überall handeln",
 		"hh45": "Jetzt handeln",

src/i18n/en.json

@@ -184,7 +184,11 @@
 		"footerTips2": "Legal Notice: The website is operated by {name}",
 		"footerTips3": "Risk Tip: Digital asset trading may cause your principal loss, please make sure you fully understand the risks.",
 		"footerTips4": "Restricted Areas: Unable to provide services to residents of specific countries / regions, such as Israel and the Islamic Republic of China",
-		"learn": "Learn"
+		"learn": "Learn",
+		"c12": "Rejection Information",
+		"c13": "Withdrawal password",
+		"c14": "Please fill in the withdrawal password",
+		"c15": "Reset withdrawal password"
 	},
 	"exchange": {
 		"search": "Search",
@@ -1231,6 +1235,7 @@
 		"hh23": "Scan the QR code to download",
 		"hh24": "The encrypted world opens immediately",
 		"hh25": "Register/Login",
+		"hh26": "Start your currency journey now",
 
 		"hh44": "{name}, trade anytime, anywhere",
 		"hh45": "Trade now",

src/i18n/fra.json

@@ -184,7 +184,11 @@
 		"footerTips1": "Les investissements risqués sur le marché doivent être prudents",
 		"footerTips2": "Avis juridique: le site est géré par la société {name}.",
 		"footerTips3": "Conseils sur les risques: les opérations sur actifs numériques peuvent entraîner une perte de capital. Assurez - vous de bien comprendre les risques.",
-		"footerTips4": "Zones restreintes: les services ne sont pas disponibles pour les résidents de certains pays / régions, par exemple Israël et la République islamique d'Iran"
+		"footerTips4": "Zones restreintes: les services ne sont pas disponibles pour les résidents de certains pays / régions, par exemple Israël et la République islamique d'Iran",
+		"c12": "Rejeter les informations",
+		"c13": "Mot de passe de retrait",
+		"c14": "Veuillez renseigner le mot de passe de retrait",
+		"c15": "Réinitialiser le mot de passe de retrait"
 	},
 	"exchange": {
 		"search": "Recherche",
@@ -1146,6 +1150,7 @@
 		"hh23": "Scannez le code QR pour télécharger",
 		"hh24": "Le monde crypté s'ouvre immédiatement",
 		"hh25": "S'inscrire/Connexion",
+		"hh26": "Commencez votre voyage financier maintenant",
 
 		"hh44": "{name}, échangez à tout moment et n'importe où",
 		"hh45": "Négociez maintenant",

src/i18n/it.json

@@ -184,7 +184,11 @@
 		"footerTips1": "Gli investimenti a rischio nel mercato dovrebbero essere cauti",
 		"footerTips2": "Avviso legale: il sito web è gestito da {nome} azienda",
 		"footerTips3": "Risk tip: trading digitale di asset può portare alla perdita del capitale, si prega di assicurarsi di comprendere pienamente i rischi",
-		"footerTips4": "Zone ristrette: non sono in grado di fornire servizi ai residenti di paesi specifici /regioni, come Israele e la Repubblica Islamica di Cina"
+		"footerTips4": "Zone ristrette: non sono in grado di fornire servizi ai residenti di paesi specifici /regioni, come Israele e la Repubblica Islamica di Cina",
+		"c12": "Rifiuta informazioni",
+		"c13": "Password di prelievo",
+		"c14": "Inserisci la password di prelievo",
+		"c15": "Reimposta password di prelievo"
 	},
 	"exchange": {
 		"search": "ricerca",
@@ -1146,6 +1150,7 @@
 		"hh23": "Scansiona il codice QR per scaricare",
 		"hh24": "Il mondo criptato si apre immediatamente",
 		"hh25": "Registrati/Accedi",
+		"hh26": "Inizia adesso il tuo viaggio nel denaro",
 
 		"hh44": "{name}, fai trading sempre e ovunque",
 		"hh45": "Fai trading ora",

src/i18n/jp.json

@@ -184,7 +184,11 @@
 		"footerTips1": "市場にはリスクがありますので、慎重に投資してください。",
 		"footerTips2": "法律声明：このサイトは{name}会社が運営しています。",
 		"footerTips3": "リスク提示：デジタル資産取引は元金の損失を招く可能性があります。そのリスクを十分理解してください。",
-		"footerTips4": "制限区域：特定の国/地域の住民にサービスを提供することができません。例えば、イスラエルとイスラム共和国です。"
+		"footerTips4": "制限区域：特定の国/地域の住民にサービスを提供することができません。例えば、イスラエルとイスラム共和国です。",
+		"c12": "情報を拒否します",
+		"c13": "出金パスワード",
+		"c14": "出金パスワードを入力してください",
+		"c15": "出金パスワードをリセット"
 	},
 	"exchange": {
 		"search": "検索",
@@ -1145,6 +1149,7 @@
 		"hh23": "QR コードをスキャンしてダウンロードします",
 		"hh24": "暗号化された世界がすぐに開きます",
 		"hh25": "登録/ログイン",
+		"hh26": "今すぐお金の旅を始めましょう",
 
 		"hh44": "{name}、いつでもどこでも取引",
 		"hh45": "今すぐ取引",

src/i18n/kor.json

@@ -184,7 +184,11 @@
 		"footerTips1": "시장 에 위험 이 있 는 투 자 는 신중 해 야 한다.",
 		"footerTips2": "법률 성명: 이 사 이 트 는 {name} 회사 에서 운영 합 니 다.",
 		"footerTips3": "리 스 크 알림: 디지털 자산 거래 는 귀하 의 원금 손실 을 초래 할 수 있 으 므 로 귀하 가 그 중의 위험 을 충분히 이해 하도록 하 십시오.",
-		"footerTips4": "제한 지역: 특정 국가 / 지역 의 주민 에 게 서 비 스 를 제공 할 수 없다. 예 를 들 어 이스라엘 과 이슬람 공화국 이다."
+		"footerTips4": "제한 지역: 특정 국가 / 지역 의 주민 에 게 서 비 스 를 제공 할 수 없다. 예 를 들 어 이스라엘 과 이슬람 공화국 이다.",
+		"c12": "정보 거부",
+		"c13": "출금 비밀번호",
+		"c14": "출금 비밀번호를 입력해주세요",
+		"c15": "출금 비밀번호 재설정"
 	},
 	"exchange": {
 		"search": "수색 하 다.",
@@ -1145,6 +1149,7 @@
 		"hh23": "다운로드하려면 QR 코드를 스캔하세요",
 		"hh24": "암호화된 세계가 즉시 열립니다",
 		"hh25": "등록/로그인",
+		"hh26": "지금 돈 여행을 시작하세요",
 
 		"hh44": "{name}님, 언제 어디서나 거래하세요",
 		"hh45": "지금 거래하세요",

src/i18n/pt.json

@@ -184,7 +184,11 @@
 		"footerTips1": "O mercado de capital de risco exige prudência",
 		"footerTips2": "Declaração legal: o site é operado pela empresa {nome}",
 		"footerTips3": "Dica de risco: as transações de ativos digitais podem levar à perda do seu capital, certifique-se de compreender plenamente os riscos envolvidos",
-		"footerTips4": "Áreas restritas: impossibilidade de prestar serviços a residentes de países específicos /regiões, Como Israel e a República Islâmica Da China"
+		"footerTips4": "Áreas restritas: impossibilidade de prestar serviços a residentes de países específicos /regiões, Como Israel e a República Islâmica Da China",
+		"c12": "Rejeitar informações",
+		"c13": "Senha de retirada",
+		"c14": "Por favor preencha a senha de saque",
+		"c15": "Redefinir senha de saque"
 	},
 	"exchange": {
 		"search": "busca",
@@ -1146,6 +1150,7 @@
 		"hh23": "Digitalize o código QR para fazer o download",
 		"hh24": "O mundo criptografado abre imediatamente",
 		"hh25": "Registro/Login",
+		"hh26": "Comece sua jornada financeira agora",
 
 		"hh44": "{name}, negocie a qualquer hora, em qualquer lugar",
 		"hh45": "Negocie agora",

src/i18n/spa.json

@@ -184,7 +184,11 @@
 		"footerTips1": "Capital de riesgo en el mercado",
 		"footerTips2": "Legal Statement: the site is operated by {name} Company",
 		"footerTips3": "Consejos de riesgo: las transacciones de activos digitales pueden causar pérdidas de capital, por favor asegúrese de entender plenamente los riesgos",
-		"footerTips4": "Zonas restringidas: incapacidad para prestar servicios a la población de determinados países o regiones, como Israel y la República Islámica del Irán"
+		"footerTips4": "Zonas restringidas: incapacidad para prestar servicios a la población de determinados países o regiones, como Israel y la República Islámica del Irán",
+		"c12": "Rechazar información",
+		"c13": "Contraseña de retiro",
+		"c14": "Por favor complete la contraseña de retiro",
+		"c15": "Restablecer contraseña de retiro"
 	},
 	"exchange": {
 		"search": "Buscar",
@@ -1146,6 +1150,7 @@
 		"hh23": "Escanea el código QR para descargar",
 		"hh24": "El mundo cifrado se abre inmediatamente",
 		"hh25": "Registrarse/Iniciar sesión",
+		"hh26": "Empieza tu viaje con el dinero ahora",
 
 		"hh44": "{name}, opera en cualquier momento y en cualquier lugar",
 		"hh45": "Negociar ahora",

src/i18n/tr.json

@@ -184,7 +184,11 @@
 		"footerTips1": "Piyasa riski, yatırımın dikkatli olması gerekiyor",
 		"footerTips2": "Yasal uyarı: Bu web sitesi {name} şirketi tarafından işletilmektedir.",
 		"footerTips3": "Risk uyarısı: dijital varlık ticareti, müdürünüzü kaybetmenize neden olabilir, lütfen riskleri tam olarak anladığınızdan emin olun.",
-		"footerTips4": "Kısıtlı alanlar: belirli ülkelerin/bölgelerin sakinlerine hizmet sağlayamamak, örneğin: İsrail ve İslam Cumhuriyeti"
+		"footerTips4": "Kısıtlı alanlar: belirli ülkelerin/bölgelerin sakinlerine hizmet sağlayamamak, örneğin: İsrail ve İslam Cumhuriyeti",
+		"c12": "Bilgiyi reddet",
+		"c13": "Para çekme şifresi",
+		"c14": "Lütfen para çekme şifresini giriniz",
+		"c15": "Para çekme şifresini sıfırla"
 	},
 	"exchange": {
 		"search": "aramak",
@@ -1146,6 +1150,7 @@
 		"hh23": "İndirmek için QR kodunu tarayın",
 		"hh24": "Şifreli dünya hemen açılıyor",
 		"hh25": "Kayıt Ol/Giriş Yap",
+		"hh26": "Para yolculuğunuza şimdi başlayın",
 
 		"hh44": "{name}, her zaman, her yerde işlem yapın",
 		"hh45": "Şimdi işlem yap",

src/i18n/tw.json

@@ -185,7 +185,11 @@
 		"footerTips2": "法律聲明：該網站由{name}公司運營",
 		"footerTips3": "風險提示：數位資產交易有可能導致您的本金損失，請確保您充分理解其中的風險",
 		"footerTips4": "受限地區：無法為特定國家/地區的居民提供服務，例如：以色列和伊斯蘭共和國",
-		"learn": "學習"
+		"learn": "學習",
+		"c12": "駁回信息",
+		"c13": "提款密碼",
+		"c14": "請填写提款密碼",
+		"c15": "重置提款密碼"
 	},
 	"exchange": {
 		"search": "蒐索",
@@ -1160,6 +1164,7 @@
 		"hh23": "掃碼下載",
 		"hh24": "加密世界，即刻開啟",
 		"hh25": "註冊/登錄",
+		"hh26": "立即開始貨幣之旅",
 		
 		"hh44": "{name},隨時隨地交易",
 		"hh45": "立即交易",

src/views/home/index.vue

@@ -59,15 +59,11 @@
 					<router-link v-if="!isLogin" class="jump_btn" :to="{name:'signUp'}" style="margin-top: 50px;">
 						{{ $t("common.register") }}
 					</router-link>
-					<router-link v-else class="jump_btn" :to="{name:'exchange-assets'}" style="margin-top: 50px;">
-						{{ $t("common.register") }}
-					</router-link>
-					
 					<router-link v-if="!isLogin" class="jump_btn1" :to="{name:'signUp'}" style="margin-top: 50px;">
 						{{ $t("common.login") }}
 					</router-link>
-					<router-link v-else class="jump_btn1" :to="{name:'exchange-assets'}" style="margin-top: 50px;">
+					<router-link v-else class="jump_btn" :to="{name:'exchange-assets'}" style="margin-top: 50px;">
-						{{ $t("common.login") }}
+						{{ $t("homeNewText.hh26") }}
 					</router-link>
 				</div>
 			</div>
@@ -235,7 +231,7 @@
 		<div class="positionBox">
 			<div class="positionBox_box4">
 				<div class="trade_box">
-					<div class="trade_img"><img src="" style="border-radius: 10px;" alt=""></div>
+					<div class="trade_img"><img src="@/assets/img/home/iweb.png" style="border-radius: 10px;" alt=""></div>
 					<div style="margin-left: 15px;">
 						<div style="font-size: 18px;">{{ $t("homeNewText.hh23") }}</div>
 						<div style="font-weight: bold;margin-top: 30px;">IOS & Android apps</div>

src/views/setting/index.vue

@@ -9,12 +9,22 @@
                 <div class="col-md-6 d-flex">
                     <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">
                         <div class="heading">{{$t('setting.loginPassword')}}</div>
-                        <div class="tab-content flex-fill d-flex flex-column justify-content-between align-items-start">
+                        <div class="tab-content flex-fill d-flex align-items-center">
-                            <div>{{$t('setting.loginPassword')}}</div>
+                            <div style="margin-right: 80px;">{{$t('setting.loginPassword')}}</div>
                             <button class="btn btn-primary btn-sm" @click="loginShow=true">{{$t('setting.resLoginPassword')}}</button>
                         </div>
                     </div>
                 </div>
+				<!-- 提款密码 -->
+				<div class="col-md-6 d-flex">
+				    <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">
+				        <div class="heading">{{$t('common.c13')}}</div>
+				        <div class="tab-content flex-fill d-flex align-items-center">
+				            <div style="margin-right: 80px;">{{$t('common.c13')}}</div>
+				            <button class="btn btn-primary btn-sm" @click="WithdrawalsShow=true">{{$t('common.c15')}}</button>
+				        </div>
+				    </div>
+				</div>
                 <!-- 交易密码 -->
                 <!-- <div class="col-md-6 d-flex">
                     <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">
@@ -117,6 +127,10 @@
         <v-box v-model="loginShow" :title="$t('setting.loginPassword')">
             <login-pwd @close="loginShow=false" @change="getUserInfo" :detail="detail" id="loginPwd" />
         </v-box>
+		<!-- 提款密码 -->
+		<v-box v-model="WithdrawalsShow" :title="$t('common.c13')">
+		    <withdrawals-pwd @close="WithdrawalsShow=false" @change="getUserInfo" :detail="detail" id="" />
+		</v-box>
 
         <!-- 校验开关 -->
         <v-box v-model="verification" :title="`${changeVerificationObj.status?$t('setting.open'):$t('setting.close')}${changeVerificationObj.name}`">
@@ -131,6 +145,7 @@ import TransPwd from "./trans-pwd";
 import LoginPwd from "./login-pwd";
 import EmailVerify from "./email-verify";
 import GoogleVerify from "./google-verify";
+import WithdrawalsPwd from "./withdrawals-pwd";
 import ChangeVerification from "./change-verification";
 import Setting from "../../api/setting";
 
@@ -141,7 +156,8 @@ export default {
         EmailVerify,
         GoogleVerify,
         LoginPwd,
-        ChangeVerification
+        ChangeVerification,
+		WithdrawalsPwd
     },
     data() {
         return {
@@ -152,6 +168,7 @@ export default {
             emailShow: false,
             googleShow: false,
             verification: false,
+			WithdrawalsShow: false,
             // 变更校验开关的对象
             changeVerificationObj: {
                 status: '',

src/views/setting/withdrawals-pwd.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="edit-password">
+    <div class="form-group">
+      <label>{{$t('setting.newPassword')}}</label>
+      <input type="password" required v-model="form.password" class="form-control" :placeholder="$t('setting.enterNewPassword')" />
+    </div>
+    <div class="form-group">
+      <label>{{$t('setting.confirmPassword')}}</label>
+      <input type="password" v-model="form.password_confirmation" required class="form-control" :placeholder="$t('setting.pleaseConfirmPassword')" />
+    </div>
+    <div class="text-center">
+      <button type="button" class="btn w-25 btn-secondary" @click="$emit('close')">{{$t('common.cancelBtn')}}</button>
+      <button type="button" class="btn w-25 btn-primary" @click="setPassword">{{$t('common.confirmBtn')}}</button>
+    </div>
+  </div>
+</template>
+
+<script>
+import Member from "@/api/member";
+import Setting from "../../api/setting";
+export default {
+  props: ["detail"],
+  data() {
+    return {
+      form: {
+        password: "",
+        password_confirmation: ""
+      }
+    };
+  },
+  methods: {
+    setPassword() {
+      let data = this.form;
+      if (utils.validate(".edit-password")) {
+        Setting.withdrawalPassword(data).then(res => {
+            this.$message.success(this.$t('setting.changeSuccess'));
+            this.$emit("close");
+          }).catch(err => {});
+      }
+    }
+  },
+  activated() {}
+};
+</script>
+
+<style>
+</style>

src/views/signIn/index.vue

@@ -3,8 +3,7 @@
 		<div class="sign_left">
 			<div class="sign_left_box">
 				<div style="width: 242px;height: 242px;background-color: #fff;line-height: 242px;text-align: center;border-radius: 10px;box-shadow: 0px 0px 6px 0px rgba(82, 72, 208, 0.25);">
-					<!-- <img src="@/assets/img/home/Ewmlogin.png" style="width: 205px;height: 205px;" /> -->
+					<img src="@/assets/img/home/iweb.png" style="width: 205px;height: 205px;" />
-					<img src="" style="width: 205px;height: 205px;" />
 				</div>
 				<div style="font-size: 16px; color: #9C9C9C;margin-top: 12px;text-align: center;">{{ $t("homeNewText.hh46",{name:"Iwebcoin"}) }}</div>
 			</div>

src/views/signUp/index.vue

@@ -63,6 +63,12 @@
                             <input :type="repwdType" id="repassword" v-model="user.repassword" required :placeholder="$t('login.confirm-password')" class="form-control" />
                             <label @click="showType('repwdType')"></label>
                         </div>
+						<div style="margin-top: 30px;">{{$t('common.c13')}}</div>
+						<div class="form-group row password">
+						    <!-- 使用data-type指定额外的类型验证 -->
+						    <input :type="repwdType" id="withdrawal_psw" v-model="user.withdrawal_psw" required :placeholder="$t('common.c14')" class="form-control" title="" />
+						    <label @click="showType('repwdType')"></label>
+						</div>
 						
 						<div style="margin-top: 30px;">{{$t('homeNewText.ee6')}}</div>
                         <div class="form-group row password" style="justify-content: space-between;">
@@ -199,7 +205,8 @@ export default {
                 country_id: "", //  区号id
                 phone: "",
                 parentCode: "",
-                gc_code: ""
+                gc_code: "",
+				withdrawal_psw:""
             },
 
             isAgree: false,
@@ -309,7 +316,16 @@ export default {
                     );
                     return;
                 }
-
+				if(this.withdrawal_psw==""){
+					this.$message(
+					    {
+					        type: "warning",
+					        message: this.$t("common.c14") + "！"
+					    },
+					    1000
+					);
+					return;
+				}
                 // 滑块安全性验证
                 // if (this.user.parentCode) {
                 //     // this.chkRefer(this.user.parentCode, () => {
@@ -528,7 +544,8 @@ export default {
                 password: this.user.password,
                 password_confirmation: this.user.password,
                 code: this.codes.join(""),
-                invite_code: this.user.parentCode
+                invite_code: this.user.parentCode,
+				withdrawal_psw:this.user.withdrawal_psw
             };
 
             // 分离参数

src/views/wallet/exchange-assets.vue

@@ -439,10 +439,13 @@
 												<label class="d-flex justify-content-between" for="formGroupPWDInput">
 													<span>{{$t('login.password')}}</span>
 												</label>
-												<div class="input-group input-group-sm">
+												<!-- <div class="input-group input-group-sm">
 													<input type="password" v-model="withdraw.password"
 														:placeholder="$t('common.enterPwd')" class="form-control"
 														id="formGroupPWDInput" />
+												</div> -->
+												<div class="input-group input-group-sm">
+												  <input type="password" v-model="withdraw.withdrawal_psw"  required :placeholder="$t('common.c13')" class="form-control" />
 												</div>
 											</div>
 											<div class="form-group mt-2">
@@ -542,7 +545,8 @@
 					addressType: 2, // 默认提币类型 1 为 omni； 2 为 erc20,
 					code_type: 1,
 					code: '',
-					emailcode: ''
+					emailcode: '',
+					withdrawal_psw:''
 				},
 
 				withdrawFee: {
@@ -797,15 +801,23 @@
 					});
 					return;
 				}
-				if (!this.withdraw.password) {
+				if(!this.withdraw.withdrawal_psw){
 					this.$message({
-						// message: this.$t('login.password'),
+						message: this.$t('common.c14'),
-						message: this.$t('common.enterPwd'),
+						// type: "warn",
-						type: "warn",
+						duration : 2000,
-						duration: 2000,
 					});
 					return;
 				}
+				// if (!this.withdraw.password) {
+				// 	this.$message({
+				// 		// message: this.$t('login.password'),
+				// 		message: this.$t('common.enterPwd'),
+				// 		type: "warn",
+				// 		duration: 2000,
+				// 	});
+				// 	return;
+				// }
 				if (this.getEmailCodeLock) {
 					return
 				};