7-27 change share

api/calculation.js

@@ -51,4 +51,13 @@ export function myMiningGet(data,id) {
 		method: 'get',
 		data
 	});
+}
+
+//获取分享收益
+export function getMyShare(data) {
+	return request({
+		url: '/api/my_mining_get',
+		method: 'get',
+		data
+	})
 }

manifest.json

@@ -4,8 +4,8 @@
     // __UNI__6FC8B70
     // "appid" : "__UNI__6FC8B70",
     "description" : "",
-    "versionName" : "1.3.1",
-    "versionCode" : 131,
+    "versionName" : "1.3.7",
+    "versionCode" : 137,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/user/revenue.vue

@@ -2,7 +2,8 @@
 	<view class="revenue">
 		<view class="top-jg"></view>
 		<view class="nav-wrapper">
-			<view class="nav-item" v-for="(item, index) in navList" :key="index" :class="{ active: currentIndex === index }" @click="navClick(index)">{{ item.title }}</view>
+			<view class="nav-item" v-for="(item, index) in navList" :key="index"
+				:class="{ active: currentIndex === index }" @click="navClick(index)">{{ item.title }}</view>
 		</view>
 		<view class="list">
 			<view class="list-item flex">
@@ -17,7 +18,7 @@
 			</view>
 			<view class="list-item">
 				<view class="item-tpl tols">
-					<view class="tpl name">累计挖币</view>
+					<view class="tpl name">可用</view>
 					<view class="tpl num">{{ list.all_mining }}{{ navList[currentIndex].unit }}</view>
 				</view>
 				<!-- <view class="item-tpl">
@@ -29,15 +30,15 @@
 		<view class="all-num">
 			<view class="num-item">
 				<view class="title">总收益</view>
-				<view class="num">{{ all_get }}{{ navList[currentIndex].unit }}</view>
+				<view class="num">{{ (+navList[currentIndex].all_unlock + navList[currentIndex].all_lock) == 0 ? 0 : (+navList[currentIndex].all_unlock + navList[currentIndex].all_lock).toFixed(6)  }}{{ navList[currentIndex].unit }}</view>
 			</view>
 			<view class="num-item">
 				<view class="title">累计释放</view>
-				<view class="num">{{ all_unlock }}{{ navList[currentIndex].unit }}</view>
+				<view class="num">{{ navList[currentIndex].all_unlock }}{{ navList[currentIndex].unit }}</view>
 			</view>
 			<view class="num-item">
 				<view class="title">待释放</view>
-				<view class="num">{{ all_lock }}{{ navList[currentIndex].unit }}</view>
+				<view class="num">{{ navList[currentIndex].all_lock }}{{ navList[currentIndex].unit }}</view>
 			</view>
 		</view>
 
@@ -48,339 +49,399 @@
 		</view>
 		<scroll-view :style="{ height: height }" class="days" scroll-y @scrolltolower="loadData()">
 			<empty v-if="navList[currentIndex].loaded === true && navList[currentIndex].list.length === 0"></empty>
+
 			<view class="day-item" v-for="(item, index) in navList[currentIndex].list" :key="index">
-				<view class="item">
-					<view class="item-title">结算日期：</view>
-					<view class="item-value">{{item.add_date}}</view>
+				<view v-if="item.step==1||item.step==0">
+					<view class="item">
+							<view class="item-title">结算日期：</view>
+							<view class="item-value">{{item.add_date}}</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								今日可用
+								<text>{{+item.machine.first_step_get_ratio}}%</text>
+							</view>
+							<view class="item-value">{{(+item.get_money).toFixed(8)}}{{item.get_money_type}}</view>
+						</view>
+						
+						<view class="item" v-if=" (item.get_money*1)/(item.machine.first_step_get_ratio*1)*100-item.get_money*1 != 0">
+							<view class="item-title">
+								今日质押
+								<text>{{100-item.machine.second_step_get_ratio*1}}%</text>
+							</view>
+							<view class="item-value">{{(item.get_money*1)/(item.machine.first_step_get_ratio*1)*100-item.get_money*1}}{{item.get_money_type}}</view>
+						</view>
 				</view>
-				<view class="item">
-					<view class="item-title">
-						今日可用
-						<text>{{item.machine.second_step_get_ratio*1}}%</text>
+				<view v-if="item.step==2"> 
+				<!-- <view class=""> -->
+					<view class="item">
+						<view class="item-title">结算日期：</view>
+						<view class="item-value">{{item.add_date}}</view>
 					</view>
-					<view class="item-value">{{item.unlock}}{{item.get_money_type}}</view>
-				</view>
-				<view class="item">
-					<view class="item-title">
-						今日冻结
-						<text>{{100-item.machine.second_step_get_ratio*1}}%</text>
+					<view class="item">
+						<view class="item-title">
+							今日获得：<text>{{+item.machine.second_step_get_ratio}}%</text> 
+						</view>
+						<view class="item-value">
+							{{(+item.get_money-item.unlock).toFixed(8)}}{{item.get_money_type}}
+						</view>
+					</view>
+					<view class="item"  v-if="+item.all_lock != 0">
+						<view class="item-title">
+							今日冻结：
+							<text>{{100-item.machine.second_step_get_ratio}}%</text>
+							
+						</view>
+						<view class="item-value">
+							<text>{{(+item.all_lock).toFixed(8)}}{{item.get_money_type}}</text>
+						</view>
+					</view>
+					<view class="item" v-if="+item.unlock != 0">
+						<view class="item-title">
+							今日释放：
+							<text>1/{{item.machine.third_step_time}}</text>
+						</view>
+						<view class="item-value">
+							<text>{{(+item.unlock).toFixed(8)}}{{item.get_money_type}}</text>
+						</view>
 					</view>
-					<view class="item-value">{{item.all_lock}}{{item.get_money_type}}</view>
 				</view>
-				<view class="item">
-					<view class="item-title">
-						今日释放
-						<text>1/{{item.machine.third_step_time}}</text>
+
+				<view v-if="item.step==3">
+					<view class="item">
+						<view class="item-title">结算日期：</view>
+						<view class="item-value">{{item.add_date}}{{item.get_money_type}}</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							今日释放：
+							<text>1/{{item.machine.third_step_time}}</text>
+						</view>
+						<view class="item-value">{{item.unlock}}{{item.get_money_type}}</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							解除质押：
+							<text>1/{{item.machine.third_step_time}}</text>
+						</view>
+						<view class="item-value">{{item.unstand}}{{item.get_money_type}}</view>
 					</view>
-					<view class="item-value">{{item.unstand}}{{item.get_money_type}}</view>
 				</view>
-				
-			</view>
+			</view>
+
+
+
 			<uni-load-more :status="navList[currentIndex].loadingType"></uni-load-more>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
-import empty from '@/components/empty';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import { mining, miningIndex, myMiningGet } from '@/api/calculation.js';
-export default {
-	components: {
-		empty,
-		uniLoadMore
-	},
-	data() {
-		return {
-			list: '',
-			navList: [
-				{
-					title: 'Fil',
-					unit: 'FIL',
-					slUnit: 'T',
-					list: [],
-					page: 1,
-					limit: 10,
-					loadingType: 'more'
-				},
-				{
-					title: 'Chia',
-					unit: 'XCH',
-					slUnit: 'T',
-					list: [],
-					page: 1,
-					limit: 10,
-					loadingType: 'more'
+	import empty from '@/components/empty';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import {
+		mining,
+		miningIndex,
+		myMiningGet
+	} from '@/api/calculation.js';
+	export default {
+		components: {
+			empty,
+			uniLoadMore
+		},
+		data() {
+			return {
+				list: '',
+				navList: [{
+						title: 'Fil',
+						unit: 'FIL',
+						slUnit: 'T',
+						list: [],
+						page: 1,
+						limit: 10,
+						loadingType: 'more',
+						all_lock: 0, //待释放
+						all_get: 0, //总收益
+						all_unlock: 0 //累计释放
+					},
+					{
+						title: 'Chia',
+						unit: 'XCH',
+						slUnit: 'T',
+						list: [],
+						page: 1,
+						limit: 10,
+						loadingType: 'more',
+						all_lock: 0, //待释放
+						all_get: 0, //总收益
+						all_unlock: 0 //累计释放
+					},
+					{
+						title: 'Bzz',
+						unit: 'BZZ',
+						slUnit: '节点',
+						list: [],
+						page: 1,
+						limit: 10,
+						loadingType: 'more',
+						all_lock: 0, //待释放
+						all_get: 0, //总收益
+						all_unlock: 0 //累计释放
+					}
+				],
+				currentIndex: 0,
+				height: 0,
+				allIncome: 0, //总收益
+				ljIncome: 0, //累计收益
+				wait: 0, //待释放,
+				all_lock: 0, //待释放
+				all_get: 0, //总收益
+				all_unlock: 0 //累计释放
+			};
+		},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.days').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
 				},
-				{
-					title: 'Bzz',
-					unit: 'BZZ',
-					slUnit: '节点',
-					list: [],
-					page: 1,
-					limit: 10,
-					loadingType: 'more'
-				}
-			],
-			currentIndex: 0,
-			height: 0,
-			allIncome: 0, //总收益
-			ljIncome: 0, //累计收益
-			wait: 0, //待释放,
-			all_lock: 0, //待释放
-			all_get: 0, //总收益
-			all_unlock: 0 //累计释放
-		};
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.days').boundingClientRect();
-				query.exec(function(res) {
-					console.log(res, 'ddddddddddddd');
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	onLoad() {
-		let userInfo = uni.getStorageSync('userInfo') || '';
-		this.level = userInfo.level;
-		this.loadData();
-		this.loadTopDate('FIL');
-	},
-	methods: {
-		async loadTopDate(type) {
-			uni.showLoading({
-				title: '加载中...'
-			});
-			let obj = this;
-			miningIndex({
-				type: type
-			}).then(({ data }) => {
-				obj.list = data;
-				uni.hideLoading();
-				console.log(obj.list);
+				fail: res => {}
 			});
 		},
-		//切换币种
-		navClick(index) {
-			if (index !== this.currentIndex) {
-				this.currentIndex = index;
-				this.loadTopDate(this.navList[index].unit);
-				this.loadData('tabChange');
-			}
+		onLoad() {
+			let userInfo = uni.getStorageSync('userInfo') || '';
+			this.level = userInfo.level;
+			this.loadData();
+			this.loadTopDate('FIL');
 		},
-		loadData(source) {
-			console.log('loadnoe')
-			//这里是将list挂载到nav列表下
-			let index = this.currentIndex;
-			let navItem = this.navList[index];
-			// let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			if (navItem.loadingType === 'noMore') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-			myMiningGet({
-				type: navItem.unit,
-				page: navItem.page,
-				limit: navItem.limit
-			}).then(({ data }) => {
-				console.log(data, '888888888888888888888');
-				this.all_lock = data.all_lock;
-				this.all_get = data.all_get;
-				let arr = data.list.data.map(e => {
-					return e;
+		methods: {
+			async loadTopDate(type) {
+				uni.showLoading({
+					title: '加载中...'
+				});
+				let obj = this;
+				miningIndex({
+					type: type
+				}).then(({
+					data
+				}) => {
+					obj.list = data;
+					uni.hideLoading();
+					console.log(obj.list);
 				});
-				navItem.list = navItem.list.concat(arr);
-				console.log(arr)
-				navItem.page++;
-				if (navItem.limit == data.list.data.length) {
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					navItem.loadingType = 'more';
-					console.log('more')
+			},
+			//切换币种
+			navClick(index) {
+				if (index !== this.currentIndex) {
+					this.currentIndex = index;
+					this.loadTopDate(this.navList[index].unit);
+					this.loadData('tabChange');
+				}
+			},
+			loadData(source) {
+				console.log('loadnoe')
+				//这里是将list挂载到nav列表下
+				let index = this.currentIndex;
+				let navItem = this.navList[index];
+				// let state = navItem.state;
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
 					return;
-				} else {
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					navItem.loadingType = 'noMore';
-					console.log('noMore')
-				}
-				this.$set(navItem, 'loaded', true);
-			}).catch( e => {
-				console.log(e)
-			})
-			// orderList({
-			// 	type: state,
-			// 	page: navItem.page,
-			// 	limit: navItem.limit
-			// })
-			// 	.then(({ data }) => {
-			// 		let arr = data.map(e => {
-			// 			return e;
-			// 		});
-			// 		navItem.list = navItem.list.concat(arr);
-			// 		// console.log(navItem.orderList);
-			// 		navItem.page++;
-			// 		if (navItem.limit == data.length) {
-			// 			//判断是否还有数据， 有改为 more， 没有改为noMore
-			// 			navItem.loadingType = 'more';
-			// 			return;
-			// 		} else {
-			// 			//判断是否还有数据， 有改为 more， 没有改为noMore
-			// 			navItem.loadingType = 'noMore';
-			// 		}
-			// 		this.$set(navItem, 'loaded', true);
-			// 	})
-			// 	.catch(e => {
-			// 		console.log(e);
-			// 	});
-			//假数据
-			// let arr = []
-			// navItem.list = navItem.list.concat(arr)
-			// navItem.page++
-			// navItem.loadingType = 'noMore'
-			// this.$set(navItem, 'loaded', true)
-			// console.log(this.navList)
+				}
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				if (navItem.loadingType === 'noMore') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
+				myMiningGet({
+					type: navItem.unit,
+					page: navItem.page,
+					limit: navItem.limit
+				}).then(({
+					data
+				}) => {
+					console.log(data, '888888888888888888888');
+					navItem.all_lock = data.all_lock;
+					navItem.all_get = data.all_get;
+					navItem.all_unlock = data.all_unlock
+					let arr = data.list.data.map(e => {
+						return e;
+					});
+					navItem.list = navItem.list.concat(arr);
+					console.log(arr)
+					navItem.page++;
+					if (navItem.limit == data.list.data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						console.log('more')
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+						console.log('noMore')
+					}
+					this.$set(navItem, 'loaded', true);
+				}).catch(e => {
+					console.log(e)
+				})
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-page {
-	width: 100%;
-}
-.top-jg {
-	height: 55rpx;
-}
-.nav-wrapper {
-	margin: 0rpx auto 10rpx;
-	width: 627rpx;
-	height: 60rpx;
-	border: 2px solid #5771df;
-	border-radius: 5rpx;
-	display: flex;
-	.nav-item {
-		width: 209rpx;
-		text-align: center;
-		line-height: 60rpx;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #5771df;
+	page {
+		width: 100%;
 	}
-	.active {
-		background: #5771df;
-		color: #fff;
+
+	.top-jg {
+		height: 55rpx;
 	}
-}
-.all-num {
-	width: 627rpx;
-	margin: 0 auto;
-	display: flex;
-	justify-content: space-between;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #333333;
-	.num-item {
-		width: 33.3%;
-		flex-shrink: 0;
+
+	.nav-wrapper {
+		margin: 0rpx auto 10rpx;
+		width: 627rpx;
+		height: 60rpx;
+		border: 2px solid #5771df;
+		border-radius: 5rpx;
 		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		.title {
-			padding-bottom: 20rpx;
+
+		.nav-item {
+			width: 209rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #5771df;
 		}
-		.num {
-			font-weight: 500;
+
+		.active {
+			background: #5771df;
+			color: #fff;
 		}
 	}
-}
-.tip {
-	width: 627rpx;
-	margin: 80rpx auto 70rpx;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	.line {
-		width: 193rpx;
-		height: 2rpx;
-		background: #5771df;
-	}
-	.title {
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #5771df;
-	}
-}
-.days {
-	// background-color: red;
-	padding: 0 65rpx;
-	.day-item {
-		// height: 230rpx;
-		border-bottom: 1px solid #f3f4f6;
-		background-color: #fff;
-		font-size: 24rpx;
+
+	.all-num {
+		width: 627rpx;
+		margin: 0 auto;
+		display: flex;
+		justify-content: space-between;
+		font-size: 30rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
 		color: #333333;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-around;
-		padding: 20rpx 0;
-		.item {
+
+		.num-item {
+			width: 33.3%;
+			flex-shrink: 0;
 			display: flex;
-			justify-content: space-between;
-			text {
-				display: inline-block;
-				margin-left: 10rpx;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			.title {
+				padding-bottom: 20rpx;
+			}
+
+			.num {
+				font-weight: 500;
 			}
 		}
 	}
-}
-.list {
-	padding: 10rpx 65rpx 0;
-	.list-item {
-		// padding: 90rpx 118rpx 0 118rpx;
 
-		margin-bottom: 15rpx;
-		.item-tpl {
-			background-color: #f7f6fb;
-			text-align: center;
-			// background-color: #FFFFFF;
-			padding: 41rpx 0;
-			width: 48%;
-			.name {
-				color: #666666;
-				font-size: 24rpx;
-			}
-			.num {
-				font-size: 32rpx;
-				color: #333333;
-				font-weight: bold;
-				padding-top: 10rpx;
+	.tip {
+		width: 627rpx;
+		margin: 80rpx auto 70rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.line {
+			width: 193rpx;
+			height: 2rpx;
+			background: #5771df;
+		}
+
+		.title {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #5771df;
+		}
+	}
+
+	.days {
+		// background-color: red;
+		padding: 0 65rpx;
+
+		.day-item {
+			// height: 230rpx;
+			border-bottom: 1px solid #f3f4f6;
+			background-color: #fff;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			padding: 20rpx 0;
+
+			.item {
+				display: flex;
+				justify-content: space-between;
+
+				text {
+					display: inline-block;
+					margin-left: 10rpx;
+				}
 			}
 		}
 	}
-	.tols {
-		width: 100% !important;
+
+	.list {
+		padding: 10rpx 65rpx 0;
+
+		.list-item {
+			// padding: 90rpx 118rpx 0 118rpx;
+
+			margin-bottom: 15rpx;
+
+			.item-tpl {
+				background-color: #f7f6fb;
+				text-align: center;
+				// background-color: #FFFFFF;
+				padding: 41rpx 0;
+				width: 48%;
+
+				.name {
+					color: #666666;
+					font-size: 24rpx;
+				}
+
+				.num {
+					font-size: 32rpx;
+					color: #333333;
+					font-weight: bold;
+					padding-top: 10rpx;
+				}
+			}
+		}
+
+		.tols {
+			width: 100% !important;
+		}
 	}
-}
 </style>

pages/user/sharerevenue.vue

@@ -1,21 +1,25 @@
 <template>
 	<view class="sharerevenue">
 		<view class="top-jg"></view>
-		<view class="nav-wrapper">邀请算力收益</view>
-		<view class="all-num">
+		<view class="nav-wrapper">
+			<view class="nav-item" v-for="(item, index) in navList" :key="index" :class="{ active: currentIndex === index }" @click="navClick(index)">{{ item.title }}</view>
+		</view>
+		<!-- <view class="top-jg"></view> -->
+		<!-- <view class="nav-wrapper">邀请算力收益</view> -->
+<!-- 		<view class="all-num">
 			<view class="">
 				<view class="title">总收益</view>
-				<view class="num">{{ allIncome }}FIL</view>
+				<view class="num">{{ allIncome }}{{ navList[currentIndex].unit }}</view>
 			</view>
 			<view class="">
 				<view class="title">累计释放</view>
-				<view class="num">{{ ljIncome }}FIL</view>
+				<view class="num">{{ ljIncome }}{{ navList[currentIndex].unit }}</view>
 			</view>
 			<view class="">
 				<view class="title">待释放</view>
-				<view class="num">{{ wait }}FIL</view>
+				<view class="num">{{ wait }}{{ navList[currentIndex].unit }}</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="tip">
 			<view class="line"></view>
 			<view class="title">每日收益记录</view>
@@ -23,9 +27,12 @@
 		</view>
 		<scroll-view :style="{ height: height }" class="days" scroll-y>
 			<empty v-if="navList[currentIndex].loaded === true && navList[currentIndex].list.length === 0"></empty>
-			<view class="day-item" v-for="(item,index) in navList[currentIndex].list" :key="index">
-				<view class="item-time">2021-05-02</view>
-				<view class="item-wrap">
+			<view class="day-item" v-for="(item, index) in navList[currentIndex].list" :key="index">
+				<view class="item-time">{{item.add_time}}</view>
+				<view class="">
+					今日推荐奖励：{{item.number}}{{item.category}}
+				</view>
+				<!-- <view class="item-wrap">
 					<view class="item">
 						<view class="item-title">
 							今日可用
@@ -47,10 +54,9 @@
 						</view>
 						<view class="item-value">0.09FIL</view>
 					</view>
-				</view>
-				<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</view> -->
+				<!-- <uni-load-more :status="tabItem.loadingType"></uni-load-more> -->
 			</view>
-			
 		</scroll-view>
 	</view>
 </template>
@@ -58,6 +64,8 @@
 <script>
 import empty from '@/components/empty';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { mining, miningIndex, myMiningGet ,getMyShare} from '@/api/calculation.js';
+import { moneyLog, recharge } from '@/api/finance.js';
 export default {
 	components: {
 		empty,
@@ -68,25 +76,31 @@ export default {
 			navList: [
 				{
 					title: 'Fil',
+					unit: 'FIL',
+					slUnit: 'T',
+					list: [],
+					page: 1,
+					limit: 10,
+					loadingType: 'more'
+				},
+				{
+					title: 'Chia',
+					unit: 'XCH',
+					slUnit: 'T',
 					list: [],
 					page: 1,
 					limit: 10,
 					loadingType: 'more'
 				},
-				// {
-				// 	title: 'Chia',
-				// 	list: [],
-				// 	page: 1,
-				// 	limit: 10,
-				// 	loadingType: 'more'
-				// },
-				// {
-				// 	title: 'Bzz',
-				// 	list: [],
-				// 	page: 1,
-				// 	limit: 10,
-				// 	loadingType: 'more'
-				// }
+				{
+					title: 'Bzz',
+					unit: 'BZZ',
+					slUnit: '节点',
+					list: [],
+					page: 1,
+					limit: 10,
+					loadingType: 'more'
+				}
 			],
 			currentIndex: 0,
 			height: 0,
@@ -112,6 +126,7 @@ export default {
 	},
 	onLoad() {
 		this.loadData();
+		// this.getIndexDate()
 	},
 	methods: {
 		//切换币种
@@ -120,6 +135,7 @@ export default {
 			this.loadData('tabChange');
 		},
 		loadData(source) {
+			console.log('loadnoe');
 			//这里是将list挂载到nav列表下
 			let index = this.currentIndex;
 			let navItem = this.navList[index];
@@ -138,39 +154,84 @@ export default {
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-
-			// orderList({
-			// 	type: state,
+			moneyLog(
+				{
+					page: navItem.page,
+					limit: navItem.limit,
+					type: 'group_create_brokerage'
+				},
+				navItem.unit
+			).then(({ data }) => {
+				// obj.typeList = data.type_list;
+				// obj.list = data.list;
+				// console.log(obj.list);
+				console.log(data,'5555555555555555')
+				let arr = data.list.map(e => {
+					return e;
+				});
+				console.log(arr)
+				navItem.list = navItem.list.concat(arr);
+				navItem.page++;
+				if (navItem.limit == data.list.data.length) {
+					//判断是否还有数据， 有改为 more， 没有改为noMore
+					navItem.loadingType = 'more';
+					console.log('more');
+					return;
+				} else {
+					//判断是否还有数据， 有改为 more， 没有改为noMore
+					navItem.loadingType = 'noMore';
+					console.log('noMore');
+				}
+				this.$set(navItem, 'loaded', true);
+			}).catch(e => {
+					console.log(e);
+				});
+			// myMiningGet({
+			// 	type: navItem.unit,
 			// 	page: navItem.page,
 			// 	limit: navItem.limit
 			// })
 			// 	.then(({ data }) => {
-			// 		let arr = data.map(e => {
+			// 		console.log(data, '888888888888888888888');
+			// 		this.all_lock = data.all_lock;
+			// 		this.all_get = data.all_get;
+			// 		let arr = data.list.data.map(e => {
 			// 			return e;
 			// 		});
 			// 		navItem.list = navItem.list.concat(arr);
-			// 		// console.log(navItem.orderList);
+			// 		console.log(arr);
 			// 		navItem.page++;
-			// 		if (navItem.limit == data.length) {
+			// 		if (navItem.limit == data.list.data.length) {
 			// 			//判断是否还有数据， 有改为 more， 没有改为noMore
 			// 			navItem.loadingType = 'more';
+			// 			console.log('more');
 			// 			return;
 			// 		} else {
 			// 			//判断是否还有数据， 有改为 more， 没有改为noMore
 			// 			navItem.loadingType = 'noMore';
+			// 			console.log('noMore');
 			// 		}
 			// 		this.$set(navItem, 'loaded', true);
 			// 	})
 			// 	.catch(e => {
 			// 		console.log(e);
 			// 	});
-			let arr = []
-			navItem.list = navItem.list.concat(arr)
-			navItem.page++
-			navItem.loadingType = 'noMore'
-			this.$set(navItem, 'loaded', true)
-			console.log(this.navList)
-		}
+		},
+		// getIndexDate() {
+		// 	moneyLog(
+		// 		{
+		// 			page: 1,
+		// 			limit: 100,
+		// 			type: 'group_create_brokerage'
+		// 		},
+		// 		unit
+		// 	).then(({ data }) => {
+		// 		// obj.typeList = data.type_list;
+		// 		// obj.list = data.list;
+		// 		// console.log(obj.list);
+		// 		console.log(data,'5555555555555555')
+		// 	});
+		// }
 	}
 };
 </script>
@@ -182,20 +243,7 @@ page {
 .top-jg {
 	height: 55rpx;
 }
-.nav-wrapper {
-	margin: 0rpx auto 61rpx;
-	width: 627rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	// border: 2px solid #5771df;
-	border-radius: 5rpx;
-	text-align: center;
-	background-color: #5771df;
-	font-size: 28rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-}
+
 .all-num {
 	width: 627rpx;
 	margin: 0 auto;
@@ -293,4 +341,27 @@ page {
 		}
 	}
 }
+.nav-wrapper {
+	margin: 0rpx auto 10rpx;
+	width: 627rpx;
+	height: 60rpx;
+	border: 2px solid #5771df;
+	border-radius: 5rpx;
+	display: flex;
+
+	.nav-item {
+		width: 209rpx;
+		text-align: center;
+		line-height: 60rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #5771df;
+	}
+
+	.active {
+		background: #5771df;
+		color: #fff;
+	}
+}
 </style>

pages/user/user.vue

@@ -28,7 +28,7 @@
 				</view>
 				<image src="../../static/img/img23.png"></image>
 			</view>
-<!-- 			<view class="list-cell flex" @click="navTo('/pages/user/sharerevenue')">
+			<!-- <view class="list-cell flex" @click="navTo('/pages/user/sharerevenue')">
 				<view class="cell-info flex_item">
 					<image src="../../static/img/img53.png" style="width: 40rpx; height: 40rpx;"></image>
 					<view class="cell-name">邀请收益</view>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/23774bd0-e76e-11eb-a849-839065d939bb
+https://service.dcloud.net.cn/build/download/622464b0-eddf-11eb-8cc1-79c7ddc2e8f0

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=C:/Users/coderLHL/Desktop/com.liuniu.keystore
+andrCertfile=C:/Users/Administrator/Desktop/com.liuniu.keystore
 andrCertAlias=com.liuniu.inc
 andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==