From 90a23774c2acfe8a60c87a8a69f414725d21904c Mon Sep 17 00:00:00 2001
From: longjieli <1060695654@qq.com>
Date: Mon, 19 Aug 2024 11:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/popUpWindow/popUpWindow.vue |  2 +-
 locale/ar.js                           |  3 ++-
 locale/en.js                           |  3 ++-
 locale/es.js                           |  3 ++-
 locale/fr.js                           |  7 ++++---
 locale/ru.js                           |  3 ++-
 pages/register/register.vue            | 10 +++++++++-
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/components/popUpWindow/popUpWindow.vue b/components/popUpWindow/popUpWindow.vue
index 31b16de..bf20f56 100644
--- a/components/popUpWindow/popUpWindow.vue
+++ b/components/popUpWindow/popUpWindow.vue
@@ -2,7 +2,7 @@
 <template>
 	<view v-if="show" class="popup-windown bx popup-bx">
 		<div class="popup-content">
-			<uni-icons class="popup-close" type="closeempty" size="20" color="#000"></uni-icons>
+			<uni-icons @click="close" class="popup-close" type="closeempty" size="20" color="#000"></uni-icons>
 			<view class="popup-main">
 				<div class="bg">
 					<image src="../../static/popUpWindow/bg.png" mode="widthFix"></image>
diff --git a/locale/ar.js b/locale/ar.js
index 876a7e9..fc17a08 100644
--- a/locale/ar.js
+++ b/locale/ar.js
@@ -202,7 +202,8 @@ export default {
 			"payPassEmpty": "يرجى ملء كلمة مرور الدفع",
 			"okPayPassEmpty": "يرجى ملء كلمة مرور الدفع مرة أخرى",
 			"payPassInconsistency": "عدم اتساق كلمة مرور الدفع",
-			"tickProtocol": "يرجى وضع علامة على الاتفاقية"
+			"tickProtocol": "يرجى وضع علامة على الاتفاقية",
+			"invitationCodeEmpty" : "الرجاء إدخال رمز الدعوة"
 		},
 		"persionalInfo": {
 			"title": "معلومات شخصية",
diff --git a/locale/en.js b/locale/en.js
index 9e47005..bb56042 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -204,7 +204,8 @@ export default {
 			"payPassEmpty": "Please fill in the payment code",
 			"okPayPassEmpty": "Please fill in the payment password again",
 			"payPassInconsistency": "The payment password is inconsistent",
-			"tickProtocol": "Please tick the agreement"
+			"tickProtocol": "Please tick the agreement",
+			"invitationCodeEmpty" : "Please fill in the invitation code"
 		},
 		"persionalInfo": {
 			"title": "Personal Info",
diff --git a/locale/es.js b/locale/es.js
index 7a05632..f659ae6 100644
--- a/locale/es.js
+++ b/locale/es.js
@@ -204,7 +204,8 @@ export default {
 			"payPassEmpty": "Por favor, ingrese el código de pago",
 			"okPayPassEmpty": "Por favor, ingrese la contraseña de pago nuevamente",
 			"payPassInconsistency": "La contraseña de pago es inconsistente",
-			"tickProtocol": "Por favor, marque el protocolo"
+			"tickProtocol": "Por favor, marque el protocolo",
+			"invitationCodeEmpty" : "Por favor, rellene el Código de invitación."
 		},
 		"persionalInfo": {
 			"title": "Información Personal",
diff --git a/locale/fr.js b/locale/fr.js
index f4837e3..31f438e 100644
--- a/locale/fr.js
+++ b/locale/fr.js
@@ -145,8 +145,8 @@ export default {
 			"moneyEmpty": "Veuillez remplir le montant de recharge",
 			"AmountThan0": "Le montant de recharge doit être supérieur à 0",
 			"payPassEmpty": "Veuillez remplir le code de paiement",
-			"copyAddress" : "Copier l'adresse",
-			"copySuccess" : "Réplication réussie"
+			"copyAddress": "Copier l'adresse",
+			"copySuccess": "Réplication réussie"
 		},
 		"withdraw": {
 			"title": "Retrait",
@@ -202,7 +202,8 @@ export default {
 			"payPassEmpty": "Veuillez remplir le code de paiement",
 			"okPayPassEmpty": "Veuillez remplir à nouveau le mot de passe de paiement",
 			"payPassInconsistency": "Les mots de passe de paiement sont différents",
-			"tickProtocol": "Veuillez cocher l'accord"
+			"tickProtocol": "Veuillez cocher l'accord",
+			"invitationCodeEmpty": "Veuillez remplir le Code d'invitation"
 		},
 		"persionalInfo": {
 			"title": "Informations Personnelles",
diff --git a/locale/ru.js b/locale/ru.js
index 4f88761..053bced 100644
--- a/locale/ru.js
+++ b/locale/ru.js
@@ -204,7 +204,8 @@ export default {
 			"payPassEmpty": "Пожалуйста, введите платежный пароль",
 			"okPayPassEmpty": "Пожалуйста, введите платежный пароль еще раз",
 			"payPassInconsistency": "Пароли для платежей не совпадают",
-			"tickProtocol": "Пожалуйста, поставьте галочку в соглашении"
+			"tickProtocol": "Пожалуйста, поставьте галочку в соглашении",
+			"invitationCodeEmpty": "Пожалуйста, заполните код приглашения."
 		},
 		"loginRecord": {
 			"title": "Запись входа",
diff --git a/pages/register/register.vue b/pages/register/register.vue
index bf3ec8e..5d12eb3 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -118,7 +118,8 @@
 					password,
 					okPassword,
 					payPass,
-					okPayPass
+					okPayPass,
+					invitationCode
 				} = this.form
 				if (account.trim() == '') {
 					uni.showToast({
@@ -169,6 +170,13 @@
 					});
 					return false;
 				}
+				if(invitationCode.trim() == ''){
+					uni.showToast({
+						title: this.$t('page.register.invitationCodeEmpty'),
+						icon: 'none'
+					});
+					return false;
+				}
 				// if (this.agree.length <= 0 && this.agree[0] != 'agree') {
 				// 	uni.showToast({
 				// 		title: this.$t('page.register.tickProtocol'),