cmy 2 lat temu
rodzic
commit
791d534f69

+ 11 - 1
api/wallet.js

@@ -146,4 +146,14 @@ export function qianBao(data) {
 		method: 'get',
 		data
 	});
-}
+}
+
+
+// 钱包USDT类型交易明细
+export function getMoneyLog(data,money_type='USDT') {
+	return request({
+		url: `/api/money/log/${money_type}`,
+		method: 'get',
+		data
+	});
+}

+ 36 - 2
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "jingcai",
-    "appid" : "__UNI__E0158B1",
+    "appid" : "__UNI__3DD0668",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -37,7 +37,8 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             "ios" : {
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -48,6 +49,39 @@
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
+                },
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
                 }
             }
         }

+ 69 - 19
pages/index/index.vue

@@ -51,20 +51,24 @@
 		<view class="list flex" v-for="(item,ind) in navList">
 			<view class="list-item flex-start">
 				<!-- <image class="img margin-r-10" :src="item.img" mode="scaleToFill"> </image> -->
-				<text class="tli">{{ind}}</text>
+				<text class="tli">{{item.name}}</text>
 			</view>
 			<view class="list-item">
-				{{item.data[0].idxPx}}
+				{{item.newVlaue}}
 			</view>
-			<view class="list-item ">
-				{{((item.data[0].idxPx - item.data[0].high24h) / item.data[0].high24h) | decimalPlaces}}
+			<view class="list-item flex items-right">
+				<view class="box" :class="{green:item.new24Value>0,red:item.new24Value<=0}">
+					{{item.new24Value}}
+				</view>
 			</view>
 		</view>
 		<taber tab='index'></taber>
 	</view>
 </template>
 <script>
-	import {prices} from "@/api/index.js"
+	import {
+		prices
+	} from "@/api/index.js"
 	import {
 		mapState,
 		mapActions
@@ -80,7 +84,9 @@
 				autoplay: true,
 				interval: 5000,
 				duration: 500,
-				navList: {},
+				navList: [],
+				timeout:'',
+				
 			}
 		},
 		computed: {
@@ -98,22 +104,42 @@
 			}
 		},
 		filters: {
-		  decimalPlaces(value) {
-		    if (typeof value !== 'number') {
-		      return value;
-		    }
-		    return value.toFixed(5);
-		  }
+			decimalPlaces(value) {
+				if (typeof value !== 'number') {
+					return value;
+				}
+				return value.toFixed(5);
+			}
 		},
-		onLoad() {
+		onLoad(option) {
+			// #ifndef MP
+			if (option.spread) {
+				// 存储其他邀请人
+				uni.setStorageSync('spread', option.spread);
+			}
+			// #endif
+			// #ifdef MP
+			if (option.scene) {
+				// 存储小程序邀请人
+				uni.setStorage({
+					key: 'spread_code',
+					data: option.scene
+				});
+			}
+			// #endif
 			this.loadData()
 		},
-		
+		onShow() {
+			this.timeout = setInterval(this.loadData,60000)
+		},
+		onHide() {
+			clearInterval(this.timeout);
+		},
 		methods: {
 			...mapActions({
 				setLang: "setLang",
-			}), 
-			
+			}),
+
 			getCurrent() {
 				let pages = getCurrentPages();
 				let curPage = pages[pages.length - 1];
@@ -131,14 +157,23 @@
 					.then(({
 						data
 					}) => {
-						console.log('1111',data );
-						that.navList = data.prices
+						let arr = [];
+						for (let key in data.prices) {
+							let item = data.prices[key];
+							let ar = item.data[0];
+							arr.push({
+								name: key,
+								newVlaue: ar.idxPx,
+								new24Value: Number(((ar.idxPx - ar.high24h) / ar.high24h).toFixed(5))
+							})
+						}
+						that.navList = arr
 					})
 					.catch(e => {
 						console.log(e);
 					});
 			},
-			
+
 		},
 	}
 </script>
@@ -255,6 +290,21 @@
 		.list-item {
 			width: 33.3%;
 
+			.box {
+				padding: 20rpx 0;
+				min-width: 150rpx;
+				text-align: center;
+				border-radius: 10rpx;
+
+				&.red {
+					background-color: $uni-color-error;
+				}
+
+				&.green {
+					background-color: $color-green;
+				}
+			}
+
 			.img {
 				width: 60rpx;
 				height: 60rpx;

+ 40 - 40
pages/index/user.vue

@@ -19,45 +19,45 @@
 		</view>
 		<!-- 余额 -->
 		<view class="body">
-			<view v-if="show" class="yue">
-				<view class="te">
-					{{$t('user.c1')}}
-				</view>
-				<view class="tex">
-					{{userWallet}}U
-				</view>
-				<view class="btn flex">
-					<button @click="navTo('/pages/user/money/recharge')" class="btn1"> <text>{{$t('user.a7')}}</text>
-					</button>
-					<button @click="navTo('/pages/user/money/withdrawal')" class="btn1"> <text>{{$t('user.a6')}}</text>
-					</button>
-				</view>
-			</view>
-
-			<view v-else class="yue1">
-				<view class="tj">統計表</view>
-				<view class="tj-item flex ">
-					<view class="lj">{{$t('user.a4')}}{{$t('user.a7')}}</view>
-					<view class="ljsu">{{userWallet || 0}}</view>
-				</view>
-				<view class="tj-item flex">
-					<view class="lj">{{$t('user.a4')}}{{$t('user.a6')}}</view>
-					<view class="ljsu">{{extractTotalPrice || 0}}</view>
-				</view>
-				<view class="tj-item flex">
-					<view class="lj">{{$t('user.a8')}}</view>
-					<view class="ljsu">{{sum_win || 0}}</view>
-				</view>
-				<view class="tj-item flex">
-					<view class="lj">{{$t('user.a9')}}</view>
-					<view class="ljsu">{{sum_bet || 0}}</view>
+			<template v-if="hasLogin">
+				<view v-if="show" class="yue margin-b-30">
+					<view class="te">
+						{{$t('user.c1')}}
+					</view>
+					<view class="tex">
+						{{userWallet}}U
+					</view>
+					<view class="btn flex">
+						<button @click="navTo('/pages/user/money/recharge')" class="btn1"> <text>{{$t('user.a7')}}</text>
+						</button>
+						<button @click="navTo('/pages/user/money/withdrawal')" class="btn1"> <text>{{$t('user.a6')}}</text>
+						</button>
+					</view>
 				</view>
-				<view class="tj-item flex">
-					<view class="lj">{{$t('user.a10')}}</view>
-					<view class="ljsu">{{group_sum_bet || 0}}</view>
+				<view v-else class="yue1 margin-b-30">
+					<view class="tj">統計表</view>
+					<view class="tj-item flex ">
+						<view class="lj">{{$t('user.a4')}}{{$t('user.a7')}}</view>
+						<view class="ljsu">{{userWallet || 0}}</view>
+					</view>
+					<view class="tj-item flex">
+						<view class="lj">{{$t('user.a4')}}{{$t('user.a6')}}</view>
+						<view class="ljsu">{{extractTotalPrice || 0}}</view>
+					</view>
+					<view class="tj-item flex">
+						<view class="lj">{{$t('user.a8')}}</view>
+						<view class="ljsu">{{sum_win || 0}}</view>
+					</view>
+					<view class="tj-item flex">
+						<view class="lj">{{$t('user.a9')}}</view>
+						<view class="ljsu">{{sum_bet || 0}}</view>
+					</view>
+					<view class="tj-item flex">
+						<view class="lj">{{$t('user.a10')}}</view>
+						<view class="ljsu">{{group_sum_bet || 0}}</view>
+					</view>
 				</view>
-			</view>
-
+			</template>
 			<!-- 列表 -->
 			<view class="gj">
 				{{$t('user.b1')}}
@@ -92,13 +92,13 @@
 				</view>
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
 			</view>
-			<view class="user-list flex" @click="openKf()">
+			<!-- <view class="user-list flex" @click="openKf()">
 				<image src="../../static/shouye/liuyan.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b6')}}
 				</view>
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
-			</view>
+			</view> -->
 			<view class="user-list flex" @click="navTo('/pages/user/set/transaction')">
 				<image src="../../static/shouye/jiaoyi.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
@@ -338,8 +338,8 @@
 	}
 
 	.gj {
-		margin-top: 50rpx;
 		margin-left: 20rpx;
+		padding-top: 10rpx;
 		font-size: 36rpx;
 		font-weight: bold;
 		color: #FFFFFF;

+ 2 - 10
pages/introduce/game.vue

@@ -46,14 +46,14 @@
 		position: relative;
 		// width: 100vw;
 		height: calc(100vh - var(--status-bar-height));
-		background: url("/index/static/img/youxi1.png");
+		background: url("../../static/img/youxi1.png");
 		background-size: 100% 100%;
 		background-position: 50% 50%;
 		background-repeat: no-repeat;
 	}
 
 	.background2 {
-		background-image: url("/index/static/img/youxi2.png");
+		background:url("../../static/img/youxi2.png");
 		position: absolute;
 		background-size: 100% 100%;
 		width: 650rpx;
@@ -112,12 +112,4 @@
 		margin-left: 60rpx;
 		margin-top: 40rpx;
 	}
-	
-	
-	
-	
-	
-	
-	
-	
 </style>

+ 2 - 2
pages/introduce/introduce.vue

@@ -48,14 +48,14 @@
 		position: relative;
 		// width: 100vw;
 		height: calc(100vh - var(--status-bar-height));
-		background: url("/index/static/shouye/beijing1.png");
+		background: url("../../static/shouye/beijing1.png");
 		background-size: 100% 100%;
 		background-position: 50% 50%;
 		background-repeat: no-repeat;
 	}
 
 	.background2 {
-		background-image: url("/index/static/shouye/beijing2.png");
+		background-image: url("../../static/shouye/beijing2.png");
 		position: absolute;
 		background-size: 100% 100%;
 		width: 650rpx;

+ 2 - 2
pages/introduce/promotion.vue

@@ -96,14 +96,14 @@
 		position: relative;
 		width: 750rpx;
 		height: 2400rpx;
-		background: url("/index/static/img/tuiguang2.png");
+		background: url("../../static/img/tuiguang2.png");
 		background-size: 100% 100%;
 		background-position: 50% 50%;
 		background-repeat: no-repeat;
 	}
 
 	.background2 {
-		background-image: url("/index/static/img/tuiguang1.png");
+		background: url("../../static/img/tuiguang1.png");
 		position: absolute;
 		background-size: 100% 100%;
 		width: 650rpx;

+ 282 - 228
pages/public/register.vue

@@ -1,282 +1,336 @@
 <template>
 	<view class="container">
-		<view class="container_text" >
+		<view class="container_text">
 			<image class="banner-img" src="/static/img/shouye1.png" mode="scaleToFill"></image>
 		</view>
 		<view class="loginTitle"><text>{{$t('login.a0')}}</text></view>
 		<view class="login_text">
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="account" focus :placeholder="$t('login.a1')" /></view>
+				<view class="login_img">
+					<image src="/static/icon/img03.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" v-model="account" focus
+						:placeholder="$t('login.a1')" /></view>
 			</view>
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus :placeholder="$t('login.a3')" /></view>
+				<view class="login_img">
+					<image src="/static/icon/img04.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus
+						:placeholder="$t('login.a3')" /></view>
 			</view>
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="trade_password" focus :placeholder="$t('login.b3')" /></view>
+				<view class="login_img">
+					<image src="/static/icon/img04.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="trade_password" focus
+						:placeholder="$t('login.b3')" /></view>
 			</view>
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="text" v-model="spread" focus :placeholder="$t('login.b4')" /></view>
+				<view class="login_img">
+					<image src="/static/icon/img07.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="text" v-model="spread" focus
+						:placeholder="$t('login.b4')" /></view>
 			</view>
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
+				<view class="login_img">
+					<image src="/static/icon/img06.png"></image>
+				</view>
 				<view class="login_name flex">
 					<input class="uni-input width" v-model="captcha" focus :placeholder="$t('login.b6')" />
 					<view class="code" @click="verification">{{ countDown == 0 ? $t('login.b5') : countDown }}</view>
 				</view>
 			</view>
-			<view><button type="green" @click="register" class="uni-button uni-button-green">{{$t('login.a7')}}</button></view>
-			<view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true" hover-class="none" @click="login">{{$t('login.a4')}}</button></view>
+			<view><button type="green" @click="register" class="uni-button uni-button-green">{{$t('login.a7')}}</button>
+			</view>
+			<view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true"
+					hover-class="none" @click="login">{{$t('login.a4')}}</button></view>
 		</view>
 	</view>
 </template>
 <script>
-import { register, verify } from '@/api/login.js';
-export default {
-	data() {
-		return {
-			// phone: '', //用户
-			account: '', //用户
-			password: '', //密码
-			repassword: '',
-			// invitation: '', //邀请码
-			spread: '', //邀请码
-			captcha: '', //验证码
-			time: '', //保存倒计时对象
-			countDown: 0 ,//倒计时
-			trade_password: '', // 交易密码
-		};
-	},
-	onLoad() {
-		// 获取扫码邀请人id
-		this.spread = uni.getStorageSync('spread')||'';
-	},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
-	methods: {
-		// 注册
-		register() {
-			let obj = this;
-			if (obj.account == '') {
-				obj.$api.msg('请输入电话号码');
-				return;
-			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
-				obj.$api.msg('请输入正确的手机号');
-				return;
-			}
-			if (obj.password == '') {
-				obj.$api.msg('请输入密码');
-				return;
-			}
-			if (obj.trade_password == '') {
-				obj.$api.msg('请输入交易密码');
-				return;
+	import {
+		register,
+		verify
+	} from '@/api/login.js';
+	export default {
+		data() {
+			return {
+				// phone: '', //用户
+				account: '', //用户
+				password: '', //密码
+				repassword: '',
+				// invitation: '', //邀请码
+				spread: '', //邀请码
+				captcha: '', //验证码
+				time: '', //保存倒计时对象
+				countDown: 0, //倒计时
+				trade_password: '', // 交易密码
+			};
+		},
+		onLoad(option) {
+			// #ifndef MP
+			if (option.spread) {
+				// 存储其他邀请人
+				uni.setStorageSync('spread', option.spread);
 			}
-			
-			register({
-				account: obj.account, //账号
-				captcha: obj.captcha, //验证码
-				password: obj.password ,//密码
-				trade_password: obj.trade_password, // 交易密码
-				spread:this.spread//上级推广人
-			}).then(function(e) {
-				uni.showToast({
-					title:'注册成功',
-					duration:2000,
-					position:'top'
+			// #endif
+			// #ifdef MP
+			if (option.scene) {
+				// 存储小程序邀请人
+				uni.setStorage({
+					key: 'spread_code',
+					data: option.scene
 				});
-				setTimeout(function () {
-					uni.navigateTo({
-						url: '/pages/public/login'
-					});
-				},1000)
-				
-			});
-			//调用注册接口,成功跳转登录页
-		},
-		//发送验证码
-		verification() {
-			let obj = this;
-			if (this.account == '') {
-				this.$api.msg('请输入电话号码');
-				return;
 			}
-			if (this.account.length < 11) {
-				this.$api.msg('请输入正确的手机号');
-				return;
+			// #endif
+			// 获取扫码邀请人id
+			this.spread = option.spread||uni.getStorageSync('spread') || '';
+		},
+		watch: {
+			// 监听倒计时
+			countDown(i) {
+				if (i == 0) {
+					clearInterval(this.time);
+				}
 			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				verify({
-					phone: obj.account,
-					type: 'register'
-				})
-					.then(({ data }) => {})
-					.catch(err => {
-						console.log(err);
+		},
+		methods: {
+			// 注册
+			register() {
+				let obj = this;
+				if (obj.account == '') {
+					obj.$api.msg('请输入电话号码');
+					return;
+				}
+				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
+					obj.$api.msg('请输入正确的手机号');
+					return;
+				}
+				if (obj.password == '') {
+					obj.$api.msg('请输入密码');
+					return;
+				}
+				if (obj.trade_password == '') {
+					obj.$api.msg('请输入交易密码');
+					return;
+				}
+
+				register({
+					account: obj.account, //账号
+					captcha: obj.captcha, //验证码
+					password: obj.password, //密码
+					trade_password: obj.trade_password, // 交易密码
+					spread: this.spread //上级推广人
+				}).then(function(e) {
+					uni.showToast({
+						title: '注册成功',
+						duration: 2000,
+						position: 'top'
 					});
+					setTimeout(function() {
+						uni.navigateTo({
+							url: '/pages/public/login'
+						});
+					}, 1000)
+
+				});
+				//调用注册接口,成功跳转登录页
+			},
+			//发送验证码
+			verification() {
+				let obj = this;
+				if (this.account == '') {
+					this.$api.msg('请输入电话号码');
+					return;
+				}
+				if (this.account.length < 11) {
+					this.$api.msg('请输入正确的手机号');
+					return;
+				}
+				// 判断是否在倒计时
+				if (obj.countDown > 0) {
+					return false;
+				} else {
+					obj.countDown = 60;
+					obj.time = setInterval(() => {
+						obj.countDown--;
+					}, 1000);
+					//调用验证码接口
+					verify({
+							phone: obj.account,
+							type: 'register'
+						})
+						.then(({
+							data
+						}) => {})
+						.catch(err => {
+							console.log(err);
+						});
+				}
+			},
+			login() {
+				//返回登录
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
 			}
-		},
-		login() {
-			//返回登录
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-	background-color: #000000;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 144rpx;
-		height: 144rpx;
-		margin-top: 100rpx;
-		margin-left: 302rpx;
+	page {
+		height: 100%;
+	}
+
+	.container {
+		width: 100%;
+		height: 100%;
+		background-size: 100%;
+		background-color: #000000;
 	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #000000;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
+
+	.container_text {
+		width: 100%;
+		height: 500rpx;
+		top: 0rpx;
+
+		.banner-img {
+			width: 144rpx;
+			height: 144rpx;
+			margin-top: 100rpx;
+			margin-left: 302rpx;
 		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
+	}
+
+	.login_text {
+		margin: auto 30rpx;
+		position: relative;
+		padding: 100rpx 102rpx;
+		background-color: #000000;
+		margin-top: -180rpx;
+		border-radius: 20rpx;
+
+		.login_input {
+			border-bottom: 1px solid #f0f0f0;
+			margin-bottom: 65rpx;
+
+			.login_img image {
+				height: 35rpx;
+				width: 29rpx;
+				margin-right: 20rpx;
+			}
+
+			.uni-input {
+				text-align: left;
+				width: 470rpx;
+				font-size: 28rpx !important;
+			}
+
+			.login_name {
+				color: #FFFFFF;
+				// width: 640rpx;
+				// height: 99rpx;
+				// background: #FFFFFF;
+				// opacity: 0.1;
+				// border-radius: 50rpx;
+			}
 		}
-		.login_name {
-			color: #FFFFFF;
-			// width: 640rpx;
-			// height: 99rpx;
-			// background: #FFFFFF;
-			// opacity: 0.1;
-			// border-radius: 50rpx;
+
+		.other {
+			margin-top: 60rpx;
+
+			.fenge {
+				width: 30%;
+				height: 2rpx;
+				background-color: #eeeeee;
+			}
+
+			.qita {
+				font-size: 28rpx;
+				color: #999999;
+			}
 		}
-	}
 
-	.other {
-		margin-top: 60rpx;
-		.fenge {
-			width: 30%;
-			height: 2rpx;
-			background-color: #eeeeee;
+		.weixin {
+			width: 75rpx;
+			height: 75rpx;
+			margin: 25rpx auto;
 		}
-		.qita {
+
+		.weixin image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.weixin_text {
+			text-align: center;
 			font-size: 28rpx;
 			color: #999999;
 		}
+
+		.forget {
+			font-size: 28rpx;
+			width: 100%;
+			text-align: right;
+			color: #999999;
+		}
+
+		.uni-button-green {
+			color: #ffffff;
+			background-color: #feb041;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+		}
+
+		.uni-button-green-plain {
+			border: 1px solid #feb041;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+			color: #feb041;
+			background-color: #000000;
+		}
+
+		.uni-button {
+			height: 85rpx;
+			line-height: 85rpx;
+		}
 	}
-	.weixin {
-		width: 75rpx;
-		height: 75rpx;
-		margin: 25rpx auto;
-	}
-	.weixin image {
+
+	.loginTitle {
+		position: absolute;
+		top: 250rpx;
 		width: 100%;
-		height: 100%;
-	}
-	.weixin_text {
 		text-align: center;
-		font-size: 28rpx;
-		color: #999999;
+		color: #c6a674;
+		font-size: 40rpx;
 	}
+
 	.forget {
-		font-size: 28rpx;
-		width: 100%;
-		text-align: right;
-		color: #999999;
+		width: 100rpx;
+		font-size: 24rpx;
+		color: #ffffff;
+		margin: 0px auto;
+		border-bottom: 1px solid #ffffff;
 	}
 
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #feb041;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
+	.width {
+		width: 325rpx !important;
 	}
-	.uni-button-green-plain {
-		border: 1px solid #feb041;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
+
+	.code {
 		color: #feb041;
-		background-color: #000000;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
+		font-size: 23rpx;
+		border-left: 1px solid #eeeeee;
+		width: 150rpx;
+		flex-shrink: 0;
+		text-align: center;
 	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color:#c6a674;
-	font-size: 40rpx;
-}
-
-.forget {
-	width: 100rpx;
-	font-size: 24rpx;
-	color: #ffffff;
-	margin: 0px auto;
-	border-bottom: 1px solid #ffffff;
-}
-.width {
-	width: 325rpx !important;
-}
-.code {
-	color: #feb041;
-	font-size: 23rpx;
-	border-left: 1px solid #eeeeee;
-	width: 150rpx;
-	flex-shrink: 0;
-	text-align: center;
-}
-uni-button {
-	height: 80rpx !important;
-	line-height: 80rpx !important;
-}
-
-</style>
 
+	uni-button {
+		height: 80rpx !important;
+		line-height: 80rpx !important;
+	}
+</style>

+ 41 - 64
pages/user/money/team.vue

@@ -30,18 +30,18 @@
 			</view>
 		</view>
 
-		<scroll-view :style="{height:height}" scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-			<!-- 空白页 -->
-			<empty v-if="loaded === true &&list.length === 0"></empty>
+		<scroll-view :style="{height:height}" scroll-y="true" class="padding-b-20 padding-c-30 list-scroll-content"
+			@scrolltolower="loadData">
 			<!-- 订单列表 -->
-			<view class="list flex" v-for="(item, index) in list" :key="index">
-				<view class="">
-					<view class="tit" v-if="item.title === '充值'">{{$t('user.a7')}}</view>
-					<view class="tit" v-else>{{$t('user.a6')}}</view>
-					<view class="tim">{{item.time}}</view>
+			<view class="list flex padding-v-30" v-for="(item, index) in list" :key="index">
+				<view>
+					<view class="tit padding-b-20">{{item.title}}</view>
+					<view class="tim">{{item.add_time}}</view>
 				</view>
 				<view class="boxT">
-					<view class="mon">{{item.money}}</view>
+					<text v-if="item.pm==1">+</text>
+					<text v-if="item.pm==0">-</text>
+					<text class="mon">{{item.number}}</text>
 				</view>
 			</view>
 		</scroll-view>
@@ -50,7 +50,7 @@
 
 <script>
 	import {
-		qianBao
+		getMoneyLog
 	} from "@/api/wallet.js"
 	import {
 		gameWallet,
@@ -62,9 +62,6 @@
 		getMoneyStyle
 	} from '@/utils/rocessor.js';
 	import empty from '@/components/empty';
-	import {
-		spreadCommission,
-	} from '@/api/wallet.js';
 	export default {
 		filters: {
 			getMoneyStyle
@@ -79,7 +76,10 @@
 				height: '',
 				loaded: false,
 				list: [],
-				money: ''
+				money: '',
+				page: 1,
+				limit: 10,
+				loadingType: 'more',
 			};
 		},
 		onLoad(options) {},
@@ -90,6 +90,8 @@
 					const query = uni.createSelectorQuery();
 					query.select('.list-scroll-content').boundingClientRect();
 					query.exec(function(res) {
+						console.log(res[0].top);
+						console.log(resu.windowHeight);
 						_this.height = resu.windowHeight - res[0].top + 'px';
 					});
 				},
@@ -98,16 +100,10 @@
 		},
 		onShow() {
 			this.getUserInfo();
-			// this.loadData();
+			this.loadData();
 			this.getUserWallet();
-			this.qianBao()
 		},
 		methods: {
-			// 钱包
-			async qianBao() {
-				const res = await qianBao()
-				console.log('qian', res);
-			},
 			// 获取用户余额信息
 			getUserWallet() {
 				gameWallet().then((res) => {
@@ -135,35 +131,25 @@
 
 			//获取收入支出信息
 			async loadData(source) {
-				let obj = this;
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
+				let navItem = this;
+				if (navItem.loaded === true || navItem.loadingType === 'loading') {
 					//tab切换只有第一次需要加载数据
 					return;
 				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
 				// 修改当前对象状态为加载中
 				navItem.loadingType = 'loading';
-
-				spreadCommission({}, state)
+				getMoneyLog({
+						page: navItem.page,
+						limit: navItem.limit
+					})
 					.then(({
 						data
 					}) => {
-						if (data.length > 0) {
-							data.forEach(e => {
-								navItem.orderList = navItem.orderList.concat(e.list);
-							})
-							console.log(navItem.orderList);
-							navItem.page++;
-						}
+
+						navItem.list = navItem.list.concat(data.list);
+						navItem.page++;
 						//判断是否还有数据, 有改为more, 没有改为noMore
-						if (navItem.limit == data.length) {
+						if (navItem.limit == data.list.length) {
 							navItem.loadingType = 'more';
 							return;
 						} else {
@@ -176,24 +162,19 @@
 						console.log(e);
 					});
 			},
-
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-
 		}
 	};
 </script>
 
 <style lang="scss">
-	.content{
+	.content {
 		line-height: 1;
 	}
+
 	.content-money {
 		position: relative;
 		padding: 60rpx 30rpx;
-
+		height: 250rpx;
 		.box {
 			position: absolute;
 			right: 0;
@@ -210,12 +191,13 @@
 				border-right: none;
 			}
 		}
+
 		.money-box {
 			position: relative;
 			z-index: 2;
 			color: #ffffff;
 			text-align: left;
-			
+
 			.money {
 				font-weight: bold;
 				font-size: 72rpx;
@@ -229,6 +211,7 @@
 		border-radius: 20rpx;
 		margin: 0 30rpx;
 		padding: 30rpx;
+
 		.info-item {
 			width: 50%;
 			display: flex;
@@ -240,6 +223,7 @@
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
+				text-align: center;
 				color: #e2e2e2;
 			}
 
@@ -259,7 +243,7 @@
 		}
 	}
 
-	
+
 
 
 
@@ -273,32 +257,25 @@
 	}
 
 	// border-bottom: 1px solid #ffffff;
-	.list {
-		margin: 40rpx 31rpx;
 
+	.list {
+		border-bottom: 1px solid $font-color-light;
 		.tit {
-			height: 26rpx;
-			font-size: 28rpx;
+			font-size: $font-base;
 			font-weight: 500;
 			color: #FFFFFF;
 		}
 
 		.tim {
-			padding-top: 30rpx;
-			height: 17rpx;
 			font-size: 22rpx;
 			font-weight: 400;
 			color: #999999;
 		}
 
 		.boxT {
-			.mon {
-				height: 23rpx;
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #FDB242;
-			}
-
+			font-weight: bold;
+			font-size: 30rpx;
+			color: #FDB242;
 		}
 	}
 </style>

+ 37 - 7
pages/user/shareQrCode.vue

@@ -11,16 +11,35 @@
 				</view>
 			</view>
 			<view class="listT">
-				<view class="TT flex-start">
-					<view class="lsT">{{$t('gameList.a2')}}</view>
+				<view class="TT flex">
+					<view class="lsT">{{$t('gameList.a2')}}</view>
 					<view class="lisT">{{item.room.game.timebar}}</view>
 				</view>
-				<view class="TT flex-start">
-					<view class="lsT">{{$t('gameList.a4')}}</view>
+				<view class="TT flex">
+					<view class="lsT">{{$t('gameList.a4')}}</view>
 					<view class="lisT">{{item.num}}U</view>
 				</view>
-				<view class="TT flex-start">
-					<view class="lsT">{{$t('gameList.a5')}}:</view>
+				<view class="TT flex">
+					<view class="lsT">押注类型</view>
+					<view class="lisT green" v-if="item.bet==1">{{ $t("enter.u6") }}</view>
+					<view class="lisT red" v-if="item.bet==2">{{ $t("enter.u4") }}</view>
+					<view class="lisT green" v-if="item.bet==3">{{ $t("enter.u5") }}</view>
+					<view class="lisT red" v-if="item.bet==4">{{ $t("enter.u7") }}</view>
+				</view>
+				<view class="TT flex">
+					<view class="lsT">返还金额</view>
+					<view class="lisT">{{item.get}}U</view>
+				</view>
+				<view class="TT flex">
+					<view class="lsT">开始价格</view>
+					<view class="lisT" v-if="item.room.result_info">{{item.room.result_info.o}}</view>
+				</view>
+				<view class="TT flex">
+					<view class="lsT">结束价格</view>
+					<view class="lisT" v-if="item.room.result_info">{{item.room.result_info.c}}</view>
+				</view>
+				<view class="TT flex">
+					<view class="lsT">{{$t('gameList.a5')}}</view>
 					<view class="lisT">{{item.open_time}}</view>
 				</view>
 			</view>
@@ -67,7 +86,12 @@
 				}).then(res => {
 					let list = res.data.bet_log.map((res) => {
 						res.num = +res.num;
-						res.open_time = getTime(res.open_time)
+						res.get = +res.get;
+						if(res.room.result_info){
+							res.room.result_info.c = Number(res.room.result_info.c);
+							res.room.result_info.o = Number(res.room.result_info.o);
+						}
+						res.open_time = getTime(res.open_time);
 						return res
 					})
 					that.list = that.list.concat(list)
@@ -135,6 +159,12 @@
 			.lisT {
 				font-size: $font-lg;
 				font-weight: bold;
+				&.red{
+					color: #df5660;
+				}
+				&.green{
+					color: $color-green;
+				}
 			}
 		}
 	}

BIN
static/icon/图层 15.png


BIN
static/icon/竞猜_slices.zip


BIN
static/shouye/下一步 拷贝 3.png


BIN
static/shouye/图层 91.png


+ 4 - 4
utils/loginUtils.js

@@ -10,10 +10,10 @@ export function interceptor() {
 	let url = '/pages/public/login'
 	// #ifdef H5
 	// 判断是否为公众号调用微信授权登录
-	let weichatBrowser = uni.getStorageSync('weichatBrowser');
-	if (weichatBrowser) {
-		url = '/pages/public/wxLogin';
-	}
+	// let weichatBrowser = uni.getStorageSync('weichatBrowser');
+	// if (weichatBrowser) {
+	// 	url = '/pages/public/wxLogin';
+	// }
 	// #endif
 	// #ifdef MP-WEIXIN
 	url = '/pages/public/wxLogin';