2024-1-15

libs/i18n/lang/cn.json

@@ -263,7 +263,7 @@
 		"a3": "充值10000U",
 		"a4": "共享区下注5000U，中5010U，一天有2小时，24期可压如果中12期就有120U的收益 共享区没中返本金",
 		"a5": "流水",
-		"a6": "如V1级別，流水5000U*24期=120000U的流水*0.001=120U流水的收益如V8级別，流水5000U*24期=120000U的流水*0.005=600U流水的收益互娱区流水更大"
+		"a6": "如V1级別，流水5000U*24期=120000U的流水*0.00001=12U流水的收益如V8级別，流水5000U*24期=120000U的流水*0.0005=60U流水的收益互娱区流水更大"
 	},
 	"set": {
 		"a1": "头像",

libs/i18n/lang/en.json

@@ -264,7 +264,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.001=120U flow, as at V8 level, the return on flow of 5000U * 24 periods=120000U flow * 0.005=600U flow is greater in the Mutual entertainment field flow"
+		"a6": "For example, at V1 level, the return on flow of 5000U * 24 periods=120000U flow * 0.0001=12U flow, as at V8 level, the return on flow of 5000U * 24 periods=120000U flow * 0.0005=60U flow is greater in the Mutual entertainment field flow"
 	},
 	"set": {
 		"a1": "Avatar",

libs/i18n/lang/tw.json

@@ -260,12 +260,12 @@
 		"a13": "直推流水收益的10%"
 	},
 	"game": {
-		"a1": "遊戲舉例",
+		"a1": "共享區",
 		"a2": "舉例",
 		"a3": "充值10000U",
 		"a4": "共享區下注5000U，中5010U，一天有2小時，24期可壓如果中12期就有120U的收益 共享區沒中返本金",
 		"a5": "流水",
-		"a6": "如V1級別，流水5000U*24期=120000U的流水*0.001=120U流水的收益如V8級別，流水5000U*24期=120000U的流水*0.005=600U流水的收益互娛區流水更大"
+		"a6": "如V1級別，流水5000U*24期=120000U的流水*0.0001=12U流水的收益如V8級別，流水5000U*24期=120000U的流水*0.0005=60U流水的收益互娛區流水更大"
 	},
 	"set": {
 		"a1": "頭像",

pages/index/entertainment.vue

@@ -98,54 +98,56 @@
 		</view>
 
 		<view class="history-list">
-			<view class="history-title-type flex" >
+			<view class="history-title-type flex">
 				<view class="history-item">
 					{{$t('indexenter.期号')}}
 				</view>
 				<view class="history-item" v-if="historyType==0">
 					{{$t('indexenter.竞猜值')}}
 				</view>
-				<view class="history-item" >
+				<view class="history-item">
 					{{$t('indexenter.竞猜数')}}
 				</view>
 				<view class="history-item">
 					{{$t('indexenter.结果')}}
 				</view>
 			</view>
-			<view class="history-title-type flex margin-t-30" v-for="(item,ind) in betList.list" :key="ind" v-if="historyType==0">
-				<view class="history-item font-color-yellow" :class="{'font-color-gray':item.result==0,'font-color-red':item.result==1}">
+			<view class="history-title-type flex margin-t-30" v-for="(item,ind) in betList.list" :key="ind"
+				v-if="historyType==0">
+				<view class="history-item font-color-yellow"
+					:class="{'font-color-gray':item.result==0,'font-color-red':item.result==1}">
 					{{item.room.no}}
 				</view>
 				<view class="history-item font-color-red">
-					<text class="margin-l-10"
-						 v-for="(ll,ind) in history.base.include_function" v-if="item.bet==ll.id">{{$t(`indexenter.${ll.name}`)}}</text>
+					<text class="margin-l-10" v-for="(ll,ind) in history.base.include_function"
+						v-if="item.bet==ll.id">{{$t(`indexenter.${ll.name}`)}}</text>
 				</view>
-				<view class="history-item font-color-red" >
+				<view class="history-item font-color-red">
 					{{item.room.result_info||$t('enter.a2')}}
 				</view>
 				<view class="history-item font-color-yellow" v-if="item.typelist.length>0">
-					<text class="margin-l-10"
-						v-for="ll in item.typelist">{{$t(`indexenter.${ll.type}`)}}</text>
+					<text class="margin-l-10" v-for="ll in item.typelist">{{$t(`indexenter.${ll.type}`)}}</text>
 				</view>
 				<view class="history-item font-color-yellow" v-else>
 					{{$t('enter.a2')}}
 				</view>
 			</view>
-			<view class="history-title-type flex margin-t-30" v-for="(item,ind) in history.list" :key="ind" v-if="historyType==1">
-				<view class="history-item font-color-yellow" :class="{'font-color-gray':item.result==0,'font-color-red':item.result==1}">
+			<view class="history-title-type flex margin-t-30" v-for="(item,ind) in history.list" :key="ind"
+				v-if="historyType==1">
+				<view class="history-item font-color-yellow"
+					:class="{'font-color-gray':item.result==0,'font-color-red':item.result==1}">
 					{{item.no}}
 				</view>
 				<!-- <view class="history-item font-color-red">
 					<text class="margin-l-10"
 						 v-for="(ll,ind) in history.base.include_function" v-if="item.bet==ll.id">{{$t(`indexenter.${ll.name}`)}}</text>
 				</view> -->
-				<view class="history-item font-color-red flex" >
-					<image v-for="ls in item.result_info" class="dice-number"
-						:src="`../../static/img/dice${ls}.png`" mode="scaleToFill"></image>
+				<view class="history-item font-color-red flex">
+					<image v-for="ls in item.result_info" class="dice-number" :src="`../../static/img/dice${ls}.png`"
+						mode="scaleToFill"></image>
 				</view>
 				<view class="history-item font-color-yellow" v-if="item.typelist.length>0">
-					<text class="margin-l-10"
-						v-for="ll in item.typelist">{{$t(`indexenter.${ll.type}`)}}</text>
+					<text class="margin-l-10" v-for="ll in item.typelist">{{$t(`indexenter.${ll.type}`)}}</text>
 				</view>
 				<view class="history-item font-color-yellow" v-else>
 					{{$t('enter.a2')}}
@@ -191,7 +193,7 @@
 		},
 		data() {
 			return {
-				historyType:0,//记录类型
+				historyType: 0, //记录类型
 				// 当前选中的大小奇偶
 				actiontype: 0,
 				id: '',
@@ -244,8 +246,7 @@
 				},
 				// 保存获取下次游戏对象
 				getNextTimeObj: '',
-				// 判断是否当前页面中
-				loadPage: false,
+				loadPage:true,
 			};
 		},
 		onLoad(option) {
@@ -255,7 +256,6 @@
 			});
 		},
 		onShow() {
-			this.loadPage = true;
 			if (!this.hasLogin) {
 				uni.showModal({
 					title: this.$t('enter.c4'),
@@ -279,29 +279,32 @@
 		},
 		// 关闭循环
 		onHide() {
-			this.loadPage = false;
+			const that = this;
 			// 倒计时清理
-			this.initData();
+			that.initData();
+		},
+		onUnload() {
+			const that = this;
+			that.initData();
 		},
 		methods: {
 			getTime,
 			// 初始化
-			async gameInit(id) {
+			gameInit(id) {
 				console.log('id', id);
 				// await gameTest();
 				// 获取基础信息
-				await this.getGame(id);
+				this.getGame(id);
 			},
 			// 获取游戏信息
 			getGame(id) {
 				const that = this;
-				return getGame({
+				getGame({
 					page: that.history.page,
 					limit: that.history.limit
 				}, id).then(({
 					data
 				}) => {
-
 					that.history.base = data.game || {};
 					that.history.base.include_function = that.history.base.include_function.map((res) => {
 						res.bfb = res.ratio * 1 * that.history.base.success_ratio / 100;
@@ -309,7 +312,7 @@
 					})
 					that.history.next = data.now_game || '';
 					that.history.now = data.now_game || '';
-					
+
 					if (data.list) {
 						that.history.list = data.list.map((res) => {
 							res.result_info = res.result_info.split(",");
@@ -321,14 +324,14 @@
 						that.history.list = [];
 					}
 					// 判断是否不存在游戏，并且没有倒计时对象，且在当前页面
-					if (that.loadPage && !that.history.next && !that.getNextTimeObj) {
-						that.getNextTimeObj = setInterval(() => {
+					if (that.loadPage && !that.history.next) {
+						that.getNextTimeObj = setTimeout(() => {
 							that.getGame(id)
 						}, 1000)
 						return
 					}
 					if (that.history.next && that.getNextTimeObj) {
-						clearInterval(that.getNextTimeObj);
+						clearTimeout(that.getNextTimeObj);
 						// 清空倒计时对象
 						that.getNextTimeObj = '';
 					}
@@ -343,27 +346,27 @@
 			resultLottery(st) {
 				const that = this;
 				let typelist = [];
-				if(st){
-				st.split(",").forEach((r) => {
-					const ar = r.split(':');
-					if (ar[1] == '1') {
-						for (let i = 0; i < that.history.base.include_function.length; i++) {
-							if (that.history.base.include_function[i].id == ar[0] * 1) {
-								typelist.push({
-									type: that.history.base.include_function[i].name
-								})
-								break
+				if (st) {
+					st.split(",").forEach((r) => {
+						const ar = r.split(':');
+						if (ar[1] == '1') {
+							for (let i = 0; i < that.history.base.include_function.length; i++) {
+								if (that.history.base.include_function[i].id == ar[0] * 1) {
+									typelist.push({
+										type: that.history.base.include_function[i].name
+									})
+									break
+								}
 							}
 						}
-					}
-				});
+					});
 				}
 				return typelist
 			},
 			// 游戏押注记录
 			gameBetList() {
 				const that = this;
-				if(that.historyType==0){
+				if (that.historyType == 0) {
 					const lineNum = that.history.base.decimal;
 					gameBetList({
 						page: 1,
@@ -378,7 +381,7 @@
 						});
 					})
 				}
-				
+
 			},
 			// 开始倒计时
 			async opTiem() {
@@ -396,11 +399,12 @@
 					console.log(e, '定时');
 				}
 			},
-			// 倒计时清理
+			// 清除加载
 			initData() {
-				const that = this
+				const that = this;
+				that.loadPage = false;
 				// 关闭倒计时
-				clearInterval(that.getNextTimeObj);
+				clearTimeout(that.getNextTimeObj);
 				clearInterval(that.time.t);
 				// 清空倒计时对象
 				that.getNextTimeObj = '';
@@ -674,7 +678,8 @@
 
 	.history-title {
 		font-size: $font-lg;
-		.action{
+
+		.action {
 			color: $yellow;
 		}
 	}
@@ -692,20 +697,25 @@
 			.history-item {
 				text-align: center;
 				width: 25%;
-				.dice-number{
+
+				.dice-number {
 					width: 40rpx;
 					height: 40rpx;
 				}
+
 				&:nth-child(1) {
 					text-align: left;
 					width: 30%;
 				}
+
 				&:nth-child(2) {
 					width: 30%;
 				}
+
 				&:nth-child(3) {
 					width: 20%;
 				}
+
 				&:nth-child(4) {
 					text-align: right;
 					width: 20%;

pages/index/index.vue

@@ -6,7 +6,7 @@
 				<text class="tet">{{$t('login.a0')}}</text>
 			</view>
 			<view class="flex">
-				<view class="icon2 text clamp margin-r-10" >
+				<view class="icon2 text clamp margin-r-10">
 					{{userInfo.account||'链接钱包'}}
 				</view>
 				<view class="icon1  margin-r-10">
@@ -23,18 +23,17 @@
 			</view>
 		</view>
 		<view class="flex item">
-			<navigator v-for="(item,ind) in gameList" :url="`entertainment?title=${item.name}&id=${item.id}`">
-				<view class="item-style flex">
-					<image class="item-tip" :src="`../../static/shouye/index_item_${ind+1}.png`" mode="scaleToFill">
-					</image>
-					<view class="name">
-						{{item.name}}
-					</view>
-					<view class="item-next flex-center">
-						<image src="../../static/img/zhiya1.png" mode="widthFix" class="next-img"></image>
-					</view>
+			<view class="item-style flex" v-for="(item,ind) in gameList"
+				@click="openurl(`/pages/index/entertainment?title=${item.name}&id=${item.id}`)">
+				<image class="item-tip" :src="`../../static/shouye/index_item_${ind+1}.png`" mode="scaleToFill">
+				</image>
+				<view class="name">
+					{{item.name}}
+				</view>
+				<view class="item-next flex-center">
+					<image src="../../static/img/zhiya1.png" mode="widthFix" class="next-img"></image>
 				</view>
-			</navigator>
+			</view>
 		</view>
 		<view class="flex shop-detail-data">
 			<view class="data-list">
@@ -137,6 +136,18 @@
 			...mapActions({
 				setLang: "setLang",
 			}),
+			openurl(url){
+				uni.navigateTo({
+					url: url,
+					fail: (err) => {
+						uni.showModal({
+							title: '错误',
+							content: err,
+							showCancel: false,
+						});
+					}
+				});
+			},
 			// 请求载入数据
 			async loadData() {
 				getIndex({})

pages/public/forget.vue

@@ -1,251 +1,21 @@
 <template>
 	<view class="container">
-		<view class="container_text">
-			<image class="banner-img" src="/static/img/logo.png" mode="widthFix"></image>
-		</view>
-		<view class="login_text">
-			<view class="login_input flex_item">
-				<view class="login_img"><image src="/static/icon/ze.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="text" v-model="account" focus :placeholder="$t('login.a1')" /></view>
-			</view>
-			<view class="login_input flex_item">
-				<view class="login_img"><image src="/static/icon/ze2.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus :placeholder="$t('password.a3')" /></view>
-			</view>
-			<view class="login_input flex_item">
-				<view class="login_img"><image src="/static/icon/ze2.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password2" focus :placeholder="$t('password.a5')" /></view>
-			</view>
-			<view class="login_input flex">
-				<view class="login_img"><image class="codeimg" src="/static/icon/ze2.png"></image></view>
-				<view class="login_name flex">
-					<input class="uni-input" v-model="captcha" type="number" focus :placeholder="$t('password.a6')" />
-					<view class="code" @click="verification">{{ countDown == 0 ? $t('login.b5') : countDown }}</view>
-				</view>
-			</view>
-			<view class="uni-button uni-button-green" @click="updatalogin">{{$t('safe.b7')}}</view>
-		</view>
+		
 	</view>
 </template>
 <script>
-import { registerReset } from '@/api/set.js';
-import { verify } from '@/api/login.js';
 export default {
 	data() {
 		return {
-			account: '', //用户
-			captcha: '', //验证码
-			password2: '',
-			password: '',
-			time: '', //保存倒计时对象
-			countDown: 0 //倒计时
 		};
 	},
 	onLoad() {},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
 	methods: {
-		updatalogin() {
-			let obj = this;
-			if (obj.account == '') {
-				obj.$api.msg(obj.$t("login.a1"));
-				return;
-			}
-			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.account) && !/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
-				obj.$api.msg(obj.$t("safe.b8"));
-				return;
-			}
-			if (obj.password == '') {
-				obj.$api.msg(obj.$t("login.a3"));
-				return;
-			}
-			if (obj.password2 == '') {
-				obj.$api.msg(obj.$t("login.c6"));
-				return;
-			}
-			if (obj.password2 != obj.password) {
-				obj.$api.msg(obj.$t("login.c7"));
-				return;
-			}
-			if (obj.captcha == '') {
-				obj.$api.msg(obj.$t("login.b6"));
-				return;
-			}
-			registerReset({
-				account: obj.account, //账号
-				password: obj.password,
-				password2: obj.password2,
-				type: 1,
-				captcha: obj.captcha
-			})
-				.then(function(e) {
-					obj.$api.msg(e.msg);
-					uni.navigateTo({
-						url: '/pages/public/login'
-					});
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
 		//发送验证码
-		verification() {
-			let obj = this;
-			if (this.account == '') {
-				this.$api.msg(obj.$t("login.c8"));
-				return;
-			}
-			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.account) && !/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
-				obj.$api.msg(obj.$t("login.c9"));
-				return;
-			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				verify({
-					phone: obj.account,
-					type: 'login'
-				})
-					.then(({ data }) => {
-						uni.showToast({
-							title: obj.$t("login.c10"),
-							duration: 2000,
-							position: 'top',
-							icon: 'none'
-						});
-					})
-					.catch(err => {
-						console.log(err);
-					});
-			}
-		}
 	}
 };
 </script>
 
 <style lang="scss">
-page {
-	min-height: 100%;
-	background-color: #000;
-	.container {
-		width: 100%;
-	}
-}
-.container_text {
-	position: relative;
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 144rpx;
-		margin-top: 100rpx;
-		margin-left: 302rpx;
-	}
-	.title-img {
-		position: absolute;
-		left: 50%;
-		top: 100rpx;
-		margin-left: -130rpx;
-		width: 260rpx;
-		height: 156rpx;
-		.title-image {
-			width: 260rpx;
-			height: 156rpx;
-		}
-	}
-}
-
-.loginTitle {
-		position: absolute;
-		top: 250rpx;
-		width: 100%;
-		text-align: center;
-		color: #cbb174;
-		font-size: 40rpx;
-	}
-.phone {
-	height: 43rpx !important;
-	width: 27rpx !important;
-}
-.codeimg {
-	height: 39rpx !important;
-	width: 31rpx !important;
-}
-.login_text {
-	margin: -150rpx 0 0;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #000;
-	
-	.login_input {
-		border-bottom: 1px solid #fff;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 36rpx;
-			width: 30rpx;
-			margin-right: 20rpx;
-		}
-		.uni-input {
-			text-align: left;
-			font-size: 28rpx !important;
-			color: #ffffff;
-		}
-		.login_name {
-			color: #333333;
-		}
-	}
-
-	.uni-button-green {
-		text-align: center;
-		color: #ffffff;
-		background-color: #feb041;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button-green-plain {
-		border: 1px solid #E6C79D;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-		color: #E6C79D;
-		background-color: #feb041;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
-	}
-}
-
-.code {
-	color: #E6C79D;
-	font-size: 23rpx;
-	border-left: 1px solid #eeeeee;
-	width: 150rpx;
-	flex-shrink: 0;
-	text-align: center;
-}
-
-.width {
-	width: 325rpx !important;
-}
 
-.login {
-	background: #E6C79D;
-	margin-top: 96rpx;
-	color: #ffffff;
-	text-align: center;
-	padding: 26rpx 0rpx;
-	border-radius: 20rpx;
-}
 </style>