10.23

libs/i18n/lang/cn.json

@@ -113,7 +113,10 @@
 		"c4": "温馨提示",
 		"b5": "您未登录！是否马上登录？",
 		"a2": "未开奖",
-		"a3": "活动未开启，请等待活动开启"
+		"a3": "活动未开启，请等待活动开启",
+		"a4": "进行中",
+		"a5": "中奖",
+		"a6": "未中奖"
 	},
 	"userinfo": {
 		"u1": "收款地址",
@@ -405,7 +408,6 @@
 		"a4": "邮箱",
 		"a5": "请输入邮箱号",
 		"a6": "验证码",
-		"a7": "请输入验证码",
 		"a8": "密码",
 		"a9": "请输入密码",
 		"b0": "确认密码",
@@ -445,7 +447,7 @@
 		"b5": "确认密码",
 		"b6": "请确认密码",
 		"b7": "确认修改",
-		"b8": "请输入正确的邮箱号",
+		"b8": "请输入正确的手机号",
 		"b9": "谷歌验证器",
 		"c0": "操作方法：下载并打开谷歌验证器，扫描下方二维码或手动输入秘钥添加验证令牌。",
 		"c1": "复制密钥",
@@ -473,13 +475,18 @@
 		"e3": "确认",
 		"e4": "设置成功",
 		"f1":"密码和确认密码不匹配",
-		"f2":"验证码错误"
+		"f2":"验证码错误",
+		"f3": "请输入自己的账户",
+		"f4": "申请注销成功，请耐心等待审核",
+		"f5": "密码修改成功",
+		"f6": "个人资料",
+		"f7": "修改密码"
 	},
 	
 	
 	"login": {
 		"a0": "互娱共享",
-		"a1": "请输入手机号/邮箱",
+		"a1": "请输入手机号",
 		"a2": "密码",
 		"a3": "请输入密码",
 		"a4": "登录",
@@ -493,7 +500,8 @@
 		"b3": "请输入交易密码",
 		"b4": "请输入邀请码",
 		"b5": "发送验证码",
-		"b6": "请输入验证码"
+		"b6": "请输入验证码",
+		"b7": "确定要退出登录吗？"
 	}
 	
 }

libs/i18n/lang/en.json

@@ -120,7 +120,10 @@
 		"c4": "Note",
 		"b5": "Please log in",
 		"a2": "Unlicensed",
-		"a3": "The activity has not been opened, please wait"
+		"a3": "The activity has not been opened, please wait",
+		"a4": "Ongoing",
+		"a5": "Winning",
+		"a6": "Nothing"
 	},
 	"money": {
 		"a1": "wallet",
@@ -536,7 +539,7 @@
 		"b5": "Confirm Password",
 		"b6": "Please confirm your password",
 		"b7": "Change Password",
-		"b8": "Please enter the correct email number",
+		"b8": "Please enter the correct phone number",
 		"b9": "Google Authenticator",
 		"c0": "How to do: Download and open Google Authenticator, scan the QR code below or manually enter the secret key to add a verification token.",
 		"c1": "Copy key",
@@ -564,12 +567,17 @@
 		"e3": "Confirm",
 		"e4": "Set up successfully",
 		"f1":"Password & Confirm Password don’t match",
-		"f2":"Wrong verification code"
+		"f2":"Wrong verification code",
+		"f3": "Please enter your own account",
+		"f4": "Successfully applied for cancellation, please wait",
+		"f5": "Password modification successful",
+		"f6": "Personal Information",
+		"f7": "Change Password"
 	},
 	
 	"login": {
 		"a0": "Game",
-		"a1": "Please enter phone number/email",
+		"a1": "Please enter phone number",
 		"a2": "Password",
 		"a3": "Please enter a password",
 		"a4": "Login",
@@ -583,6 +591,7 @@
 		"b3": "Please enter a transaction password",
 		"b4": "Please enter a invitation code",
 		"b5": "Send code",
-		"b6": "Please enter code"
+		"b6": "Please enter code",
+		"b7": "Are you sure you want to log out"
 	}
 }

libs/i18n/lang/tw.json

@@ -113,7 +113,10 @@
 		"c4": "溫馨提示",
 		"b5": "您未登錄，是否立即登錄？",
 		"a2": "未開獎",
-		"a3": "活動未開啟，請等待活動開啟"
+		"a3": "活動未開啟，請等待活動開啟",
+		"a4": "進行中",
+		"a5": "中獎",
+		"a6": "未中獎"
 	},
 	"userinfo": {
 		"u1": "收款地址",
@@ -533,7 +536,7 @@
 		"b5": "確認密碼",
 		"b6": "請確認密碼",
 		"b7": "確認修改",
-		"b8": "請輸入正確的郵箱號",
+		"b8": "請輸入正確的手機號",
 		"b9": "谷歌驗證器",
 		"c0": "操作方法:下載並打開谷歌驗證器,掃描下方二維碼或手動輸入秘鑰添加驗證令牌。",
 		"c1": "複製密鑰",
@@ -561,12 +564,17 @@
 		"e3": "確認",
 		"e4": "設置成功",
 		"f1":"密碼和確認密碼不匹配",
-		"f2":"驗證碼錯誤"
+		"f2":"驗證碼錯誤",
+		"f3": "請輸入自己的賬戶",
+		"f4": "申請註銷成功，請耐心等待審核",
+		"f5": "密碼修改成功",
+		"f6": "個人資料",
+		"f7": "修改密碼"
 	},
 	
 	"login": {
 		"a0": "互娛共享",
-		"a1": "請输入手機號/郵箱",
+		"a1": "請输入手機號",
 		"a2": "密碼",
 		"a3": "請輸入密碼",
 		"a4": "登錄",
@@ -580,6 +588,7 @@
 		"b3": "請輸入交易密碼",
 		"b4": "請輸入邀請碼",
 		"b5": "发送驗證碼",
-		"b6": "請輸入驗證碼"
+		"b6": "請輸入驗證碼",
+		"b7": "確定要退出登錄嗎？"
 	}
 }

pages/index/entertainment.vue

@@ -114,7 +114,7 @@
 				<view class="biwe">{{item.get-item.num}}</view>
 				<view class="biwe flex-center">
 					<view v-if="item.status==0" class="list-buttom primary margin-r-10">
-						進行中
+						{{$t('enter.a4')}}
 					</view>
 					<view v-else class="list-buttom red margin-r-10">
 						{{$t("enter.a2")}}
@@ -122,10 +122,10 @@
 					<view class="list-buttom primary"  v-if="item.result==1">
 
 					<view class="list-buttom red"  v-if="item.result===1">
-						中獎
+						{{$t('enter.a5')}}
 					</view>
 					<view class="list-buttom success" v-if="item.result===0">
-						未中獎
+						{{$t('enter.a6')}}
 					</view>
 				</view>
 			</view>

pages/public/forget.vue

@@ -55,15 +55,16 @@ export default {
 		register() {
 			let obj = this;
 			if (obj.account == '') {
-				obj.$api.msg('请输入电话号码');
+				// obj.$api.msg('请输入电话号码');
+				obj.$api.msg(obj.$t("login.a1"));
 				return;
 			}
 			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
-				obj.$api.msg('请输入正确的手机号');
+				obj.$api.msg(obj.$t("safe.b8"));
 				return;
 			}
 			if (obj.captcha == '') {
-				obj.$api.msg('请输入验证码');
+				obj.$api.msg(obj.$t("login.b6"));
 				return;
 			}
 
@@ -89,11 +90,11 @@ export default {
 		verification() {
 			let obj = this;
 			if (this.account == '') {
-				this.$api.msg('请输入电话号码');
+				this.$api.msg(obj.$t("login.a1"));
 				return;
 			}
 			if (this.account.length < 11) {
-				this.$api.msg('请输入正确的手机号');
+				this.$api.msg(obj.$t("safe.b8"));
 				return;
 			}
 			// 判断是否在倒计时

pages/public/login.vue

@@ -182,12 +182,12 @@
 				let obj = this;
 				obj.logining = true;
 				if (obj.account == '') {
-					obj.$api.msg('请输入手机号');
+					obj.$api.msg(obj.$t("login.a1"));
 					// obj.$api.msg('132456789');
 					return;
 				}
 				if (obj.passward == '') {
-					obj.$api.msg('请输入密码');
+					obj.$api.msg(obj.$t("login.a3"));
 					// obj.$api.msg('132456');
 					return;
 				}

pages/public/register.vue

@@ -142,11 +142,11 @@
 			verification() {
 				let obj = this;
 				if (this.account == '') {
-					this.$api.msg('请输入电话号码');
+					this.$api.msg(obj.$t("login.a1"));
 					return;
 				}
 				if (this.account.length < 11) {
-					this.$api.msg('请输入正确的手机号');
+					this.$api.msg(obj.$t("safe.b8"));
 					return;
 				}
 				// 判断是否在倒计时

pages/user/money/recharge.vue

@@ -57,7 +57,7 @@
 			// 二维码地址
 			async qianBao() {
 				const res = await qianBao()
-				this.address = res.data.back.USDT.address;
+				this.address = res.data.back.USDT.money.address;
 			},
 			// 复制地址
 			copy(value) {

pages/user/set/password.vue

@@ -1,19 +1,19 @@
 <template>
 	<view class="container">
 		<view class="row b-b">
-			<text class="tit">手机号</text>
-			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
+			<text class="tit">{{$t('safe.d4')}}</text>
+			<input class="input" v-model="account" type="text" :placeholder="$t('reg.c3')" placeholder-class="placeholder" />
 		</view>
 		<view class="row b-b">
-			<text class="tit">验证码</text>
-			<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
+			<text class="tit">{{$t('safe.a7')}}</text>
+			<input class="input" v-model="captcha" type="text" :placeholder="$t('safe.a6')" placeholder-class="placeholder" />
 			<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 		</view>
 		<view class="row b-b">
-			<text class="tit">新密码</text>
-			<input class="input" v-model="password" type="password" placeholder="请填写新密码" placeholder-class="placeholder" />
+			<text class="tit">{{$t('safe.b3')}}</text>
+			<input class="input" v-model="password" type="password" :placeholder="$t('safe.b4')" placeholder-class="placeholder" />
 		</view>
-		<button class="add-btn" :class="{'bg-gray':loding}" @click="loding?'':confirm()">提交</button>
+		<button class="add-btn" :class="{'bg-gray':loding}" @click="loding?'':confirm()">{{$t('set.a5')}}</button>
 	</view>
 </template>
 
@@ -56,11 +56,11 @@ export default {
 		verification() {
 			let obj = this;
 			if (this.account == '') {
-				this.$api.msg('请输入电话号码');
+				this.$api.msg(obj.$t("reg.a3"));
 				return;
 			}
 			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
-				this.$api.msg('请输入正确的手机号');
+				this.$api.msg(obj.$t("safe.b8"));
 				return;
 			}
 			// 判断是否在倒计时
@@ -91,7 +91,7 @@ export default {
 			})
 				.then(({ data }) => {
 					this.loding = false;
-					this.$api.msg('修改成功');
+					this.$api.msg(obj.$t("safe.d3"));
 				})
 				.catch(err => {
 					this.loding = false;

pages/user/set/set.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="container">
 		<uni-list>
-		    <uni-list-item title="个人资料" clickable showArrow  @click="navTo('/pages/user/set/userinfo')" ></uni-list-item>
-			<uni-list-item title="修改密码" clickable showArrow  @click="navTo('/pages/user/set/password')" ></uni-list-item>
-			<uni-list-item title="交易密码" clickable showArrow  @click="navTo('/pages/user/set/transaction')" ></uni-list-item>
+		    <uni-list-item :title="$t('safe.f6')" clickable showArrow  @click="navTo('/pages/user/set/userinfo')" ></uni-list-item>
+			<uni-list-item :title="$t('safe.f7')" clickable showArrow  @click="navTo('/pages/user/set/password')" ></uni-list-item>
+			<uni-list-item :title="$t('safe.d1')" clickable showArrow  @click="navTo('/pages/user/set/transaction')" ></uni-list-item>
 		</uni-list>
 		<view class="list-cell log-out-btn" @click="toLogout">
-			<text class="cell-tit">退出登录</text>
+			<text class="cell-tit">{{$t('accountSettings.a9')}}</text>
 		</view>
 	</view>
 </template>
@@ -36,7 +36,7 @@
 			toLogout(){
 				let obj = this;
 				uni.showModal({
-				    content: '确定要退出登录么',
+				    content: this.$t('login.b7'),
 				    success: (e)=>{
 				    	if(e.confirm){
 							logout({}).then((e) => {
@@ -49,13 +49,6 @@
 				    }
 				});
 			},
-			//switch切换触发方法
-			switchChange(e){
-				console.log(e);
-				let statusTip = e.value ? '打开': '关闭';
-				this.$api.msg(`${statusTip}消息推送`);
-			},
-
 		}
 	}
 </script>

pages/user/set/transaction.vue

@@ -64,11 +64,11 @@ export default {
 		verification() {
 			let obj = this;
 			if (this.account == '') {
-				this.$api.msg('请输入电话号码');
+				this.$api.msg(obj.$t("safe.b5"));
 				return;
 			}
 			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
-				this.$api.msg('请输入正确的手机号');
+				this.$api.msg(obj.$t("safe.b8"));
 				return;
 			}
 			// 判断是否在倒计时

pages/user/set/userinfo.vue

@@ -23,11 +23,11 @@
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="psw-wrapper">
-				<view class="psw-title">请输入自己的账户</view>
+				<view class="psw-title">{{$t('safe.f3')}}</view>
 				<input type="text" v-model="password" class="psw-ipt" />
 				<view class="psw-btn">
-					<text @click.stop="qx">取消</text>
-					<text class="psw-qd" @click.stop="pswQd">确定</text>
+					<text @click.stop="qx">{{$t('zy.b4')}}</text>
+					<text class="psw-qd" @click.stop="pswQd">{{$t('zy.b3')}}</text>
 				</view>
 			</view>
 		</uni-popup>
@@ -65,7 +65,7 @@ export default {
 		confirm() {
 			userEdit({ avatar: this.userInfo.avatar ,nickname: this.userInfo.nickname})
 				.then(e => {
-					this.$api.msg('修改成功');
+					this.$api.msg(obj.$t("safe.d3"));
 					setTimeout(()=> {
 						uni.switchTab({
 							url:'/pages/user/user'
@@ -76,11 +76,12 @@ export default {
 				.catch(e => {
 					console.log(e);
 				});
+				
 		},
 		toLogout(){
 			let obj = this;
 			uni.showModal({
-			    content: '确定要退出登录么',
+			    content:  this.$t('login.b7'),
 			    success: (e)=>{
 			    	if(e.confirm){
 						logout({}).then((e) => {
@@ -97,7 +98,7 @@ export default {
 			// this.$refs.popup.open();
 			let obj = this;
 			uni.showModal({
-				content: '确定要退出登录么',
+				content:  this.$t('login.b7'),
 				success: e => {
 					if (e.confirm) {
 						logout({}).then(e => {
@@ -121,12 +122,12 @@ export default {
 			if(this.password != this.userInfo.phone){
 				this.$refs.popup.close();
 				this.password = '';
-				this.$api.msg("请输入自己的账户")
+				this.$api.msg(obj.$t("safe.f3"))
 				return
 			}
 			this.$refs.popup.close();
 			this.password = '';
-			this.$api.msg("申请注销成功，请耐心等待审核")
+			this.$api.msg(obj.$t("safe.f4"))
 		}
 	}
 }

pages/user/shareQrCode.vue

@@ -4,13 +4,13 @@
 			<view class="flex padding-b-20">
 				<view class="li">{{$t('set.a7')}}{{item.room.no}}{{$t('set.a8')}}</view>
 				<view class="lis" v-if="item.result === 1">
-					<view class="liss green">中獎</view>
+					<view class="liss green">{{$t('enter.a5')}}</view>
 				</view>
 				<view class="lis" v-if="item.result === 0">
-					<view class="liss red">未中獎</view>
+					<view class="liss red">{{$t('enter.a6')}}</view>
 				</view>
 				<view class="lis" v-if="item.status === 0">
-					<view class="liss primary">進行中</view>
+					<view class="liss primary">{{$t('enter.a4')}}</view>
 				</view>
 			</view>
 			<view class="listT">