10.24

libs/i18n/lang/cn.json

@@ -201,23 +201,23 @@
 	},
 	"introduce": {
 		"a1": "五分钟一期",
-		"a2": "自由区",
+		"a2": "互娱区",
 		"a3": "压和值（01234）上，（56789）下，(13579)奇，（02468）偶，压100U中180U",
-		"a4": "体验区",
-		"a5": "压和值（01234）上，（56789）下，(13579)奇，（02468）偶，压100U中100.2U，没中返本金。 体验区每天1小時，每晚19点-20点，共12期。"
+		"a4": "共享区",
+		"a5": "压和值（01234）上，（56789）下，(13579)奇，（02468）偶，压100U中100.2U，没中返本金。 共享区每天1小時，每晚19点-20点，共12期。"
 	},
 	"promotion": {
 		"a1": "推广计划",
 		"a2": "会员",
 		"a3": "充值100U就是有效会员",
-		"a4": "推荐2个有效会员，自由场流水1%，体验场流水0.1%",
-		"a5": "推荐3个有效会员，其中2个V1，自由流水 水2%，体验场流水0.2%",
-		"a6": "推荐4个有效会员，其中2个V2，自由流水 水3%，体验场流水0.3%",
-		"a7": "推荐5个有效会员，其中2个V3，自由流水 水4%，体验场流水0.4%",
-		"a8": "推荐6个有效会员，其中2个V4，自由流水 水5%，体验场流水0.5%",
-		"a9": "推荐7个有效会员，其中2个V5，自由流水 水6%，体验场流水0.6%",
-		"a10": "推荐8个有效会员，其中2个V6，自由流水 水7%，体验场流水0.7%",
-		"a11": "推荐9个有效会员，其中2个V7，自由流水 水8%，体验场流水0.8%",
+		"a4": "推荐2个有效会员，互娱区流水1%，共享区流水0.1%",
+		"a5": "推荐3个有效会员，其中2个V1，互娱流水 水2%，共享区流水0.2%",
+		"a6": "推荐4个有效会员，其中2个V2，互娱流水 水3%，共享区流水0.3%",
+		"a7": "推荐5个有效会员，其中2个V3，互娱流水 水4%，共享区流水0.4%",
+		"a8": "推荐6个有效会员，其中2个V4，互娱流水 水5%，共享区流水0.5%",
+		"a9": "推荐7个有效会员，其中2个V5，互娱流水 水6%，共享区流水0.6%",
+		"a10": "推荐8个有效会员，其中2个V6，互娱流水 水7%，共享区流水0.7%",
+		"a11": "推荐9个有效会员，其中2个V7，互娱流水 水8%，共享区流水0.8%",
 		"a12": "平级奖",
 		"a13": "直推流水收益的10%"
 	},
@@ -225,9 +225,9 @@
 		"a1": "游戏举例",
 		"a2": "举例",
 		"a3": "充值10000U",
-		"a4": "体验场下注5000U，中5010U，一天有2小时，24期可压如果中12期就有120U的收益 体验场没中返本金",
+		"a4": "共享区下注5000U，中5010U，一天有2小时，24期可压如果中12期就有120U的收益 共享区没中返本金",
 		"a5": "流水",
-		"a6": "如V1级別，流水5000U*24期=120000U的流水*0.1=120U流水的收益如V8级別，流水5000U*24期=120000U的流水*0.8=960U流水的收益自由场流水更大"
+		"a6": "如V1级別，流水5000U*24期=120000U的流水*0.1=120U流水的收益如V8级別，流水5000U*24期=120000U的流水*0.8=960U流水的收益互娱区流水更大"
 	},
 	"set": {
 		"a1": "头像",

libs/i18n/lang/en.json

@@ -199,23 +199,23 @@
 	},
 	"introduce": {
 		"a1": "Five minute installment",
-		"a2": "Free zone",
+		"a2": "Mutual entertainment area",
 		"a3": "Pressure sum value (01234) above, (56789) below, (13579) odd, (02468) even, 180U in 100U pressure",
-		"a4": "Experience area",
-		"a5": "Above the pressure sum value (01234), below (56789), (13579) odd, (02468) even, under the pressure of 100U, 100.2U is returned, and the principal is not returned. The experience area lasts for 1 hour per day, from 19:00 to 20:00 every night, for a total of 12 sessions."
+		"a4": "Share area",
+		"a5": "Above the pressure sum value (01234), below (56789), (13579) odd, (02468) even, under the pressure of 100U, 100.2U is returned, and the principal is not returned. The share area lasts for 1 hour per day, from 19:00 to 20:00 every night, for a total of 12 sessions."
 	},
 	"promotion": {
 		"a1": "Campaign",
 		"a2": "member",
 		"a3": "Recharging 100U is a valid member",
-		"a4": "Recommend 2 valid members, 1% free field flow, and 0.1% experience field flow",
-		"a5": "Recommend 3 valid members, of which 2 are V1, with 2% free flowing water and 0.2% experience field flowing water",
-		"a6": "Recommend 4 valid members, including 2 V2, 3% free flowing water, and 0.3% experience field flowing water",
-		"a7": "Recommend 5 valid members, including 2 V3 members, 4% free flowing water, and 0.4% experience field flowing water",
-		"a8": "Recommend 6 valid members, including 2 V4 members with 5% free flowing water and 0.5% experience field flowing water",
-		"a9": "Recommend 7 valid members, including 2 V5 members, 6% free flowing water, and 0.6% experience field flowing water",
-		"a10": "Recommend 8 valid members, including 2 V6, 7% free flowing water, and 0.7% experience field flowing water",
-		"a11": "Recommend 9 valid members, including 2 V7 members, 8% free flowing water, and 0.8% experience field flowing water",
+		"a4": "Recommend 2 valid members, 1% Mutual entertainment field flow, and 0.1% share field flow",
+		"a5": "Recommend 3 valid members, of which 2 are V1, with 2% Mutual entertainment flowing water and 0.2% share field flowing water",
+		"a6": "Recommend 4 valid members, including 2 V2, 3% Mutual entertainment flowing water, and 0.3% share field flowing water",
+		"a7": "Recommend 5 valid members, including 2 V3 members, 4% Mutual entertainment flowing water, and 0.4% share field flowing water",
+		"a8": "Recommend 6 valid members, including 2 V4 members with 5% Mutual entertainment flowing water and 0.5% share field flowing water",
+		"a9": "Recommend 7 valid members, including 2 V5 members, 6% Mutual entertainment flowing water, and 0.6% share field flowing water",
+		"a10": "Recommend 8 valid members, including 2 V6, 7% Mutual entertainment flowing water, and 0.7% share field flowing water",
+		"a11": "Recommend 9 valid members, including 2 V7 members, 8% Mutual entertainment flowing water, and 0.8% share field flowing water",
 		"a12": "Peer level award",
 		"a13": "10% of direct flow revenue"
 	},
@@ -225,7 +225,7 @@
 		"a3": "Recharge 10000U",
 		"a4": "Experience Field Bet 5000U, Medium 5010U, 2 hours per day, 24 installments available for pressure. If 12 installments are available, there will be 120U of returns. Experience Field does not refund principal",
 		"a5": "Flowing water",
-		"a6": "For example, at V1 level, the return on flow of 5000U * 24 periods=120000U flow * 0.1=120U flow, as at V8 level, the return on flow of 5000U * 24 periods=120000U flow * 0.8=960U flow is greater in the free field flow"
+		"a6": "For example, at V1 level, the return on flow of 5000U * 24 periods=120000U flow * 0.1=120U flow, as at V8 level, the return on flow of 5000U * 24 periods=120000U flow * 0.8=960U flow is greater in the Mutual entertainment field flow"
 	},
 	"set": {
 		"a1": "Avatar",

libs/i18n/lang/tw.json

@@ -200,23 +200,23 @@
 	},
 	"introduce": {
 		"a1": "五分鐘一期",
-		"a2": "自由區",
+		"a2": "互娛區",
 		"a3": "壓和值（01234）上，（56789）下，(13579)奇，（02468）偶，壓100U中180U",
-		"a4": "体验區",
-		"a5": "壓和值（01234）上，（56789）下，(13579)奇，（02468）偶，壓100U中100.2U，沒中返本金。 體驗區每天1小時，每晚19點-20點，共12期。"
+		"a4": "共享區",
+		"a5": "壓和值（01234）上，（56789）下，(13579)奇，（02468）偶，壓100U中100.2U，沒中返本金。 共享區每天1小時，每晚19點-20點，共12期。"
 	},
 	"promotion": {
 		"a1": "推廣計劃",
 		"a2": "會員",
 		"a3": "充值100U就是有效會員",
-		"a4": "推薦2個有效會員，自由場流水1%，體驗 場流水0.1%",
-		"a5": "推薦3個有效會員，其中2個V1，自由場流 水2%，體驗場流水0.2%",
-		"a6": "推薦4個有效會員，其中2個V2，自由場流 水3%，體驗場流水0.3%",
-		"a7": "推薦5個有效會員，其中2個V3，自由場流 水4%，體驗場流水0.4%",
-		"a8": "推薦6個有效會員，其中2個V4，自由場流 水5%，體驗場流水0.5%",
-		"a9": "推薦7個有效會員，其中2個V5，自由場流 水6%，體驗場流水0.6%",
-		"a10": "推薦8個有效會員，其中2個V6，自由場流 水7%，體驗場流水0.7%",
-		"a11": "推薦9個有效會員，其中2個V7，自由場流 水8%，體驗場流水0.8%",
+		"a4": "推薦2個有效會員，互娛區流水1%，共享區流水0.1%",
+		"a5": "推薦3個有效會員，其中2個V1，互娛區流水2%，共享區流水0.2%",
+		"a6": "推薦4個有效會員，其中2個V2，互娛區流水3%，共享區流水0.3%",
+		"a7": "推薦5個有效會員，其中2個V3，互娛區流水4%，共享區流水0.4%",
+		"a8": "推薦6個有效會員，其中2個V4，互娛區流水5%，共享區流水0.5%",
+		"a9": "推薦7個有效會員，其中2個V5，互娛區流水6%，共享區流水0.6%",
+		"a10": "推薦8個有效會員，其中2個V6，互娛區流水7%，共享區流水0.7%",
+		"a11": "推薦9個有效會員，其中2個V7，互娛區流水8%，共享區流水0.8%",
 		"a12": "平級獎",
 		"a13": "直推流水收益的10%"
 	},
@@ -224,9 +224,9 @@
 		"a1": "遊戲舉例",
 		"a2": "舉例",
 		"a3": "充值10000U",
-		"a4": "體驗場下注5000U，中5010U，一天有2小時，24期可壓如果中12期就有120U的收益 體驗場沒中返本金",
+		"a4": "共享區下注5000U，中5010U，一天有2小時，24期可壓如果中12期就有120U的收益 共享區沒中返本金",
 		"a5": "流水",
-		"a6": "如V1級別，流水5000U*24期=120000U的流水*0.1=120U流水的收益如V8級別，流水5000U*24期=120000U的流水*0.8=960U流水的收益自由場流水更大"
+		"a6": "如V1級別，流水5000U*24期=120000U的流水*0.1=120U流水的收益如V8級別，流水5000U*24期=120000U的流水*0.8=960U流水的收益互娛區流水更大"
 	},
 	"set": {
 		"a1": "頭像",

pages/introduce/introduce.vue

@@ -130,7 +130,7 @@
 	margin-top: 40rpx;
 	padding-top: 40rpx;
 	font-size: 24rpx;
-	font-family: Source Han Sans CN;
+	// font-family: Source Han Sans CN;
 	font-weight: bold;
 	color: #211808;
 	line-height: 42rpx;

pages/introduce/promotion.vue

@@ -95,7 +95,7 @@
 	.background1 {
 		position: relative;
 		width: 750rpx;
-		height: 2400rpx;
+		height: 2600rpx;
 		background: url("../../static/img/tuiguang2.png");
 		background-size: 100% 100%;
 		background-position: 50% 50%;
@@ -107,7 +107,7 @@
 		position: absolute;
 		background-size: 100% 100%;
 		width: 650rpx;
-		height: 2000rpx;
+		height: 2250rpx;
 		top: 53%;
 		left: 50%;
 		transform: translate(-50%, -60%);

pages/user/set/transaction.vue

@@ -24,7 +24,7 @@
 <script>
 import { verify } from '@/api/login.js';
 import { mapState } from 'vuex';
-import { registerReset } from '@/api/set.js';
+import { Reset } from '@/api/set.js';
 export default {
 	data() {
 		return {
@@ -32,8 +32,8 @@ export default {
 			countDown: 0, //倒计时
 			account: '', //手机号
 			captcha: '', //验证码
-			password: '' ,//新密码
-			repeat: '', //重复密码
+			password: '' ,//密码
+			repeat: '', //确认密码
 			loding:false,//是否载入中
 		};
 	},
@@ -41,6 +41,7 @@ export default {
 		...mapState(['userInfo'])
 	},
 	onLoad() {
+		this.Reset()
 		if(this.userInfo.phone == null){
 			this.account = '';
 		}else{