8-27-修改分页

.hbuilderx/launch.json

@@ -1,11 +1,20 @@
 { // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
-    "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

manifest.json

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

pages/calculation/myCalculation.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container">
+		<view class="empty-box" v-show="list.length === 0"><empty></empty></view>
 		<view class="item-wrapper" v-if="list.length > 0" v-for="(ls,index) in list" :key='index'>
 			<view class="item">
 				<view class="item-name">设备名称</view>
@@ -38,7 +39,9 @@
 				<view class="item-val">{{ls._pay_time}}</view>
 			</view>
 		</view>
-		<view class="jg" v-if="list.length !== 0"></view>
+		
+		<!-- <view class="jg" v-if="list.length !== 0"></view> -->
+		<uni-load-more :status="loadingType"></uni-load-more>
 		<!-- <view class="list-cell" v-if="list.length > 0" v-for="(ls,index) in list" :key='index'>
 			<view class="cell-title flex">
 				<view class="cellTpl flex_item">
@@ -83,10 +86,11 @@
 							></uni-countdown></view>
 			</view>
 		</view> -->
-		<view class="empty-box" v-show="list.length === 0"><empty></empty></view>
+		
 	</view>
 </template>
 <script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import { mymining } from '@/api/calculation.js';
 import empty from '@/components/empty';
 import { timeComputed } from '@/utils/rocessor.js';
@@ -97,7 +101,10 @@ export default {
 	},
 	data() {
 		return {
-			list:'',
+			list:[],
+			page: 1,
+			limit: 10,
+			loadingType: 'more',
 		};
 	},
 	onLoad(option){
@@ -106,43 +113,54 @@ export default {
 	onShow() {
 		
 	},
-	//下拉刷新
-	onPullDownRefresh() {
+	onReachBottom() {
 		this.loadData();
 	},
 	methods: {
 		async loadData() {
 			let obj = this;
+			if(obj.loadingType == 'loading' || obj.loadingType == 'noMore' ) {
+				return
+			}
+			obj.loadingType = 'loading'
 			mymining({
-				page:1,
-				limit:1000,
+				page:obj.page,
+				limit:obj.limit,
 			}).then(({ data }) => {
 				console.log(data,"基础数据")
-				obj.list = data.data;
-				obj.list = data.data.map((e,ind) => {
-					let ar = e;
-					console.log(e,"饿");
-					// 判断是否为进行中的活动
-					if (ar.status === 0) {
-						// 计算倒计时时间
-						obj.timeComputed(ar.mining_start_time * 1000, ar);
-						console.log(ar.stopTimeD)
-					} else {
-						console.log('++++++++++')
-						// 获取距离开始还需要多少时间
-						if( ar.time){
-						let arTime = ar.time.split(':');
-						let h = arTime[0];
-						let m = arTime[1];
-						let time = new Date();
-						// 设置时间
-						time.setHours(h, m, 0);
-						// 计算倒计时时间
-						obj.timeComputed(time.getTime(), ar);}
-					}
+				// obj.list = data.data;
+				obj.list = obj.list.concat(data.data)
+				
+				if(data.data.length == obj.limit) {
+					obj.page++
+					obj.loadingType = 'more'
+				}else {
+					obj.loadingType = 'noMore'
+				}
+				// obj.list = data.data.map((e,ind) => {
+				// 	let ar = e;
+				// 	console.log(e,"饿");
+				// 	// 判断是否为进行中的活动
+				// 	if (ar.status === 0) {
+				// 		// 计算倒计时时间
+				// 		obj.timeComputed(ar.mining_start_time * 1000, ar);
+				// 		console.log(ar.stopTimeD)
+				// 	} else {
+				// 		console.log('++++++++++')
+				// 		// 获取距离开始还需要多少时间
+				// 		if( ar.time){
+				// 		let arTime = ar.time.split(':');
+				// 		let h = arTime[0];
+				// 		let m = arTime[1];
+				// 		let time = new Date();
+				// 		// 设置时间
+				// 		time.setHours(h, m, 0);
+				// 		// 计算倒计时时间
+				// 		obj.timeComputed(time.getTime(), ar);}
+				// 	}
 					
-					return e;
-				})
+				// 	return e;
+				// })
 			});
 		},
 		// 计算倒计时时间

pages/finance/details.vue

@@ -15,6 +15,7 @@
 			></lb-picker>
 			<image src="../../static/img/img37.png"></image>
 		</view>
+		<view class="empty-box" v-show="list.length == 0"><empty></empty></view>
 		<view class="list" v-show="list.length > 0">
 			<view class="list-box" v-for="(ls, index) in list" :key="index" @click="nav(index)">
 				<view class="flex">
@@ -28,7 +29,7 @@
 				<view class="tpl-time">{{ ls.add_time }}</view>
 			</view>
 		</view>
-		<view class="empty-box" v-show="list.length == 0"><empty></empty></view>
+		<uni-load-more :status="loadingType"></uni-load-more>
 		<view class="flex submit-box">
 			<view class="submit" @click="recharge">充币</view>
 			<view class="tip"></view>
@@ -82,10 +83,12 @@ import { moneyLog, recharge } from '@/api/finance.js';
 import { moneyType } from '@/api/index.js';
 import LbPicker from '@/components/lb-picker';
 import empty from '@/components/empty';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		LbPicker,
-		empty
+		empty,
+		uniLoadMore
 	},
 	data() {
 		return {
@@ -95,7 +98,7 @@ export default {
 			value: '',
 			index: 0,
 			typeList: [],
-			list: '',
+			list: [],
 			num: '',
 			moneyTypeList: [],
 			money: '',
@@ -119,8 +122,9 @@ export default {
 			waypath: '',
 			less: '',
 			page: 1,
-			limit: 5,
-			isLast: true
+			limit: 10,
+			isLast: true,
+			loadingType: 'more',
 		};
 	},
 	onLoad(option) {
@@ -142,24 +146,56 @@ export default {
 		this.ids = option.ids;
 		this.keysAddr = option.keysAddr;
 		this.moneyType();
-		this.loadData();
+		this.firstLoad()
 	},
 	onShow() {},
+	onReachBottom() {
+		this.loadData();
+	},
 	methods: {
-		async loadData() {
+		firstLoad() {
+			
+			this.loadData();
+			
+		},
+		loadData() {
 			let obj = this;
+			if(obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+				return
+			}
+			obj.loadingType = 'loading'
+			// if(obj.page == 1) {
+			// 	uni.showLoading({
+			// 		title: '加载中...',
+			// 		mask: true
+			// 	})
+			// }
 			moneyLog(
 				{
-					page: 1,
-					limit: 10000,
+					page: obj.page,
+					limit: obj.limit,
 					type: obj.type
 				},
 				obj.code
 			).then(({ data }) => {
 				obj.typeList = data.type_list;
-				obj.list = data.list;
+				console.log(data.list,'data.list')
+				obj.list = obj.list.concat(data.list);
 				console.log(obj.list);
-			});
+				// if(obj.page == 1) {
+				// 	uni.hideLoading()
+				// }
+				
+				if(data.list.length == obj.limit) {
+					obj.page++
+					obj.loadingType = 'more'
+				}else {
+					obj.loadingType = 'noMore'
+				}
+			}).catch( e => {
+				uni.hideLoading()
+				console.log()
+			})
 		},
 		// 所有币种
 		async moneyType() {

pages/user/myTeam.vue

@@ -2,39 +2,37 @@
 	<view class="container">
 		<view class="list-box flex">
 			<view class="list-tpl">
-				<view class="num">{{data.recommend_num || 0}}</view>
+				<view class="num">{{ data.recommend_num || 0 }}</view>
 				<view class="name">推荐会员数</view>
 			</view>
 			<view class="list-tpl" @click="nav('/pages/finance/allMiner')">
-				<view class="num">{{data.group_num || 0}}</view>
+				<view class="num">{{ data.group_num || 0 }}</view>
 				<view class="name">团队会员数</view>
 			</view>
 			<!-- <view class="list-title">我的团队</view> -->
 		</view>
 		<view class="info-box">
 			<view class="info-name flex">
-        <scroll-view scroll-x="true" style="width: 750rpx;">
-          <view class="flex">
-            <view class="info-cell">
-            	<view class="cell">{{data.recommend_achievement || 0}}T</view>
-            	<view class="cell-title">分享业绩</view>
-            </view>
-            <view class="info-cell" >
-            	<view class="cell">{{data.group_achievenent || 0}}T</view>
-            	<view class="cell-title">团队总业绩</view>
-            </view>
-            <view class="info-cell" >
-            	<view class="cell">{{data.today_achievement || 0}}T</view>
-            	<view class="cell-title">今日新增业绩</view>
-            </view>
-            <view class="info-cell" >
-            	<view class="cell">{{data.small_group_achievenent || 0}}T</view>
-            	<view class="cell-title">小区业绩</view>
-            </view>
-          </view>
-         
-        </scroll-view>
-				
+				<scroll-view scroll-x="true" style="width: 750rpx;">
+					<view class="flex">
+						<view class="info-cell">
+							<view class="cell">{{ data.recommend_achievement || 0 }}T</view>
+							<view class="cell-title">分享业绩</view>
+						</view>
+						<view class="info-cell">
+							<view class="cell">{{ data.group_achievenent || 0 }}T</view>
+							<view class="cell-title">团队总业绩</view>
+						</view>
+						<view class="info-cell">
+							<view class="cell">{{ data.today_achievement || 0 }}T</view>
+							<view class="cell-title">今日新增业绩</view>
+						</view>
+						<view class="info-cell">
+							<view class="cell">{{ data.small_group_achievenent || 0 }}T</view>
+							<view class="cell-title">小区业绩</view>
+						</view>
+					</view>
+				</scroll-view>
 			</view>
 			<view class="list-cell" v-if="list.length > 0">
 				<view class="cell-name flex">
@@ -45,35 +43,27 @@
 						<view class="title">等级</view>
 					</view>
 				</view>
-				<view class="cell-box flex" v-for="(ls,index) in list" :key='index' @click="nav('/pages/user/rake?uid='+ls.uid)">
+				<view class="cell-box flex" v-for="(ls, index) in list" :key="index" @click="nav('/pages/user/rake?uid=' + ls.uid)">
 					<view class="cell-tit flex_item">
 						<image :src="ls.avatar"></image>
 						<view class="tit-box">
-<!-- 							<view class="tit-tpl clamp">{{ls.nickname}}</view>
+							<!-- 							<view class="tit-tpl clamp">{{ls.nickname}}</view>
 							<view class="tit-tip">{{ls.phone}}</view> -->
-							<view class="tit-tpl ">{{ls.phone}}</view>
-							<view class="tit-tip">UID：{{ls.uid}}</view>
+							<view class="tit-tpl ">{{ ls.phone }}</view>
+							<view class="tit-tip">UID：{{ ls.uid }}</view>
 						</view>
 					</view>
 					<view class="flex num-box">
-						<view class="num clamp">{{ls.wait_mining}}T</view>
-						<view class="num clamp">{{ls.mining}}T</view>
-						<view class="level">V{{ls.level}}</view>
+						<view class="num clamp">{{ ls.wait_mining }}T</view>
+						<view class="num clamp">{{ ls.mining }}T</view>
+						<view class="level">V{{ ls.level }}</view>
 					</view>
 				</view>
 				<view class="nav flex" v-show="page == 1 && isLast">
-					<view class="next" @click="last" v-if="page != 1">
-						上一页
-					</view>
-					<view class="next" v-else>
-						已经是第一页了
-					</view>
-					<view class="next" v-if="isLast" @click="next">
-						下一页
-					</view>
-					<view class="next" v-else>
-						已经是最后一页了
-					</view>
+					<view class="next" @click="last" v-if="page != 1">上一页</view>
+					<view class="next" v-else>已经是第一页了</view>
+					<view class="next" v-if="isLast" @click="next">下一页</view>
+					<view class="next" v-else>已经是最后一页了</view>
 				</view>
 			</view>
 			<view class="empty-box" v-show="list.length === 0"><empty></empty></view>
@@ -91,17 +81,16 @@ export default {
 		return {
 			page: 1,
 			limit: 5,
-			data:'',
-			list:'',
-			isLast: true,
+			data: '',
+			list: '',
+			isLast: true
 		};
 	},
-	onLoad(option){
+	onLoad(option) {
 		this.loadData();
 		this.loadDataNext();
 	},
-	onShow() {
-	},
+	onShow() {},
 	methods: {
 		// 请求载入数据
 		async loadData() {
@@ -112,36 +101,35 @@ export default {
 			}).then(({ data }) => {
 				obj.data = data;
 				obj.list = data.list;
-			   console.log(obj)
+				console.log(obj);
 			});
 		},
 		async loadDataNext() {
 			let obj = this;
-			console.log(obj.page)
+			console.log(obj.page);
 			spread({
 				page: obj.page + 1,
-				limit: obj.limit,
-				
+				limit: obj.limit
 			}).then(({ data }) => {
-				if(data.list.length === 0){
+				if (data.list.length === 0) {
 					obj.isLast = false;
-				}else{
+				} else {
 					obj.isLast = true;
 				}
 			});
 		},
-		nav(url){
+		nav(url) {
 			uni.navigateTo({
-				url:url
-			})
+				url: url
+			});
 		},
-		next(){
+		next() {
 			this.page = this.page + 1;
 			this.loadData();
 			this.loadDataNext();
 		},
-		last(){
-			if(this.page != 1){
+		last() {
+			if (this.page != 1) {
 				this.page = this.page - 1;
 			}
 			this.loadData();
@@ -159,53 +147,53 @@ page {
 		width: 100%;
 	}
 }
-.list-box{
+.list-box {
 	width: 100%;
 	padding: 50rpx 41rpx;
 	padding-top: 80rpx !important;
-	background-color: #5771DF;
+	background-color: #5771df;
 	position: relative;
-	.list-title{
+	.list-title {
 		position: absolute;
 		top: 80rpx;
-		color: #FFFFFF;
+		color: #ffffff;
 		left: 40%;
 		font-size: 36rpx;
 	}
-	.list-tpl{
-		background-color: #FFFFFF;
+	.list-tpl {
+		background-color: #ffffff;
 		width: 314rpx;
 		height: 168rpx;
 		text-align: center;
-		padding-top:40rpx;
+		padding-top: 40rpx;
 		border-radius: 15rpx;
-		.num{
+		.num {
 			font-size: 36rpx;
 			font-weight: bold;
 			color: #333333;
 			padding-bottom: 15rpx;
 		}
-		.name{
+		.name {
 			font-size: 26rpx;
 			font-weight: 500;
 			color: #999999;
 		}
 	}
 }
-.info-box{
+.info-box {
 	// padding: 25rpx 25rpx;
-	.info-name{
+	.info-name {
 		padding: 40rpx 0rpx;
-		.info-cell{
+		.info-cell {
 			width: 33.33%;
 			text-align: center;
-      flex-shrink: 0;
-			.cell{
+			flex-shrink: 0;
+			.cell {
 				font-size: 38rpx;
 				font-weight: bold;
 				color: #333333;
 			}
-			.cell-title{
+			.cell-title {
 				font-size: 26rpx;
 				font-weight: 500;
 				color: #999999;
@@ -213,32 +201,32 @@ page {
 			}
 		}
 	}
-	.list-cell{
+	.list-cell {
 		padding: 40rpx 25rpx;
-		.cell-name{
-			padding:50rpx 50rpx;
-			.title-box{
+		.cell-name {
+			padding: 50rpx 50rpx;
+			.title-box {
 				width: 60%;
 			}
 		}
-		.cell-box{
+		.cell-box {
 			margin-bottom: 94rpx;
-			.cell-tit{
+			.cell-tit {
 				width: 40%;
-				image{
+				image {
 					width: 80rpx;
 					height: 80rpx;
 					border-radius: 100%;
 				}
-				.tit-box{
+				.tit-box {
 					padding-left: 15rpx;
 					width: 70%;
-					.tit-tpl{
+					.tit-tpl {
 						font-size: 30rpx;
 						font-weight: 500;
 						color: #333333;
 					}
-					.tit-tip{
+					.tit-tip {
 						font-size: 24rpx;
 						font-weight: 500;
 						color: #999999;
@@ -246,14 +234,14 @@ page {
 					}
 				}
 			}
-			.num-box{
+			.num-box {
 				width: 60%;
-				.num{
+				.num {
 					width: 33.33%;
 					text-align: center;
 				}
-				.level{
-					background-color: #FED82F;
+				.level {
+					background-color: #fed82f;
 					border-radius: 25rpx;
 					padding: 8rpx 50rpx;
 					font-size: 26rpx;
@@ -262,20 +250,20 @@ page {
 		}
 	}
 }
-.empty-box{
+.empty-box {
 	margin-top: 60rpx;
 	width: 100%;
 	height: 500rpx;
 }
-.nav{
-	.next{
+.nav {
+	.next {
 		margin: 40rpx;
 		width: 50%;
-		background-color: #5771DF;
-		color: #FFFFFF;
+		background-color: #5771df;
+		color: #ffffff;
 		text-align: center;
-		padding:26rpx 0rpx;
+		padding: 26rpx 0rpx;
 		border-radius: 50rpx;
 	}
 }
-</style>
+</style>

pages/user/rake.vue

@@ -1,6 +1,9 @@
 <template>
-	<view class="rake">
-		<view class="item" v-for="(ls,index) in list" v-if="ls.stock != 0">
+	<view class="rake">
+		<view class="jg" style="height: 20rpx;">
+			
+		</view>
+		<view class="item" v-for="(ls,index) in list" v-if="ls.stock != 0" :key="index">
 			<view class="top">
 				<view class="info-title">
 					<image :src="ls.logo" mode=""></image>
@@ -202,7 +205,7 @@ page {
 	// padding-top: 30rpx;
 }
 .item {
-	margin: 20rpx auto;
+	margin:0 auto 25rpx;
 	width: 670rpx;
 	// height: 438rpx;
 	background: #f7f6fb;

pages/user/revenue.vue

@@ -1,447 +1,497 @@
-<template>
-	<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>
-		<view class="list">
-			<view class="list-item flex">
-				<view class="item-tpl">
-					<view class="tpl name">有效算力</view>
-					<view class="tpl num">{{ list.doing }}{{ navList[currentIndex].slUnit }}</view>
-				</view>
-				<view class="item-tpl">
-					<view class="tpl name">待生效算力</view>
-					<view class="tpl num">{{ list.stand }}{{ navList[currentIndex].slUnit }}</view>
-				</view>
-			</view>
-			<view class="list-item">
-				<view class="item-tpl tols">
-					<view class="tpl name">可用</view>
-					<view class="tpl num">{{ list.all_mining }}{{ navList[currentIndex].unit }}</view>
-				</view>
-				<!-- <view class="item-tpl">
-					<view class="tpl name">当前锁仓</view>
-					<view class="tpl num">{{list.all_lock}}FIL</view>
-				</view> -->
-			</view>
-		</view>
-		<view class="all-num">
-			<view class="num-item">
-				<view class="title">总收益</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">{{ navList[currentIndex].all_unlock }}{{ navList[currentIndex].unit }}</view>
-			</view>
-			<view class="num-item">
-				<view class="title">待释放</view>
-				<view class="num">{{ navList[currentIndex].all_lock }}{{ navList[currentIndex].unit }}</view>
-			</view>
-		</view>
-
-		<view class="tip">
-			<view class="line"></view>
-			<view class="title">每日收益记录</view>
-			<view class="line"></view>
-		</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 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 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">
-						<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>
+<template>
+	<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>
+		<view class="list">
+			<view class="list-item flex">
+				<view class="item-tpl">
+					<view class="tpl name">有效算力</view>
+					<view class="tpl num">{{ list.doing  }}{{ navList[currentIndex].slUnit }}</view>
+				</view>
+				<view class="item-tpl">
+					<view class="tpl name">待生效算力</view>
+					<view class="tpl num">{{ list.stand }}{{ navList[currentIndex].slUnit }}</view>
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="item-tpl tols">
+					<view class="tpl name">可用</view>
+					<view class="tpl num">{{ list.all_mining | four }}{{ navList[currentIndex].unit }}</view>
+				</view>
+				<!-- <view class="item-tpl">
+					<view class="tpl name">当前锁仓</view>
+					<view class="tpl num">{{list.all_lock}}FIL</view>
+				</view> -->
+			</view>
+		</view>
+		<scroll-view scroll-x="true" style="width: 750rpx; padding-top: 20rpx;">
+			<view class="flex">
+				<view class="info-cell">
+					<view class="cell">总收益</view>
+					<view class="cell-title">
+						{{
+							(navList[currentIndex].all_unlock * 1 + navList[currentIndex].all_lock + list.all_mining + navList[currentIndex].all_recommend)| four
+						}}{{ navList[currentIndex].unit }}
+					</view>
+				</view>
+				<view class="info-cell">
+					<view class="cell">累计释放</view>
+					<view class="cell-title">{{ navList[currentIndex].all_unlock | four }}{{ navList[currentIndex].unit }}</view>
+				</view>
+				<view class="info-cell">
+					<view class="cell">待释放</view>
+					<view class="cell-title">{{ navList[currentIndex].all_lock  | four }}{{ navList[currentIndex].unit }}</view>
+				</view>
+				<view class="info-cell" v-if="navList[currentIndex].all_recommend != 0">
+					<view class="cell">累计推荐</view>
+					<view class="cell-title">{{navList[currentIndex].all_recommend | four}}{{ navList[currentIndex].unit }}</view>
+				</view>
+				<view class="info-cell" v-if="navList[currentIndex].today_recommend != 0">
+					<view class="cell">今日推荐</view>
+					<view class="cell-title">{{navList[currentIndex].today_recommend | four}}{{ navList[currentIndex].unit }}</view>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- <view class="all-num">
+			<view class="num-item">
+				<view class="title">总收益</view>
+				<view class="num">{{ (+navList[currentIndex].all_unlock + navList[currentIndex].all_lock + list.all_mining) == 0 ? 0 : (+navList[currentIndex].all_unlock + navList[currentIndex].all_lock + list.all_mining).toFixed(6)  }}{{ navList[currentIndex].unit }}</view>
+			</view>
+			<view class="num-item">
+				<view class="title">累计释放</view>
+				<view class="num">{{ navList[currentIndex].all_unlock }}{{ navList[currentIndex].unit }}</view>
+			</view>
+			<view class="num-item">
+				<view class="title">待释放</view>
+				<view class="num">{{ navList[currentIndex].all_lock }}{{ navList[currentIndex].unit }}</view>
+			</view>
+		</view> -->
+
+		<view class="tip">
+			<view class="line"></view>
+			<view class="title">每日收益记录</view>
+			<view class="line"></view>
+		</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 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 | four }}{{ 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) | four }}{{ item.get_money_type }}</view>
+					</view>
+				</view>
+				<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">
+						<view class="item-title">
+							今日获得：
+							<text>{{ +item.machine.second_step_get_ratio }}%</text>
+						</view>
+						<view class="item-value">{{ (item.get_money*1 - item.unlock*1) | four }}{{ item.get_money_type }}</view>
+					</view>
+					<view class="item" v-if="item.all_lock*1 != 0">
+						<view class="item-title">
+							今日冻结：
+							<text>{{ 100 - item.machine.second_step_get_ratio }}%</text>
 						</view>
 						<view class="item-value">
-							<text>{{(+item.unlock).toFixed(8)}}{{item.get_money_type}}</text>
-						</view>
-					</view>
-				</view>
-
-				<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>
-			</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',
-						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);
-					});
-				},
-				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);
-				});
-			},
-			//切换币种
-			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;
-				}
-				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;
+							<text>{{ (+item.all_lock) | four }}{{ 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) | four}}{{ item.get_money_type }}</text>
+						</view>
+					</view>
+				</view>
+
+				<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 | four}}{{ 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 | four }}{{ item.get_money_type }}</view>
+					</view>
+				</view>
+			</view>
+			<uni-load-more :status="navList[currentIndex].loadingType" v-if="navList[currentIndex].list !=0"></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',
+					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: 'Mass',
+					unit: 'MASS',
+					slUnit: 'T',
+					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 //累计释放
+		};
+	},
+	filters: {
+		four(val) {
+			if (val) {
+				val = val.toString();
+				let index = val.indexOf('.');
+				if (index !== -1) {
+					val = val.substring(0, 4 + index + 1);
+				} else {
+					val = val.substring(0);
+				}
+				return parseFloat(val).toFixed(4);
+			}
+			return '0.0000';
+		}
+	},
+	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);
+			});
+		},
+		//切换币种
+		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;
+			}
+			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;
-		}
-
-		.active {
-			background: #5771df;
-			color: #fff;
-		}
-	}
-
-	.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;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-
-			.title {
-				padding-bottom: 20rpx;
-			}
-
-			.num {
-				font-weight: 500;
-			}
-		}
-	}
-
-	.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;
-				}
-			}
-		}
-	}
-
-	.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;
-		}
-	}
+					navItem.all_unlock = data.all_unlock;
+					navItem.all_recommend = data.all_recommend*1
+					navItem.today_recommend = data.today_recommend*1
+					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;
+	}
+
+	.active {
+		background: #5771df;
+		color: #fff;
+	}
+}
+
+.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;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		.title {
+			padding-bottom: 20rpx;
+		}
+
+		.num {
+			font-weight: 500;
+		}
+	}
+}
+
+.tip {
+	width: 627rpx;
+	margin: 30rpx auto 30rpx;
+	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;
+			}
+		}
+	}
+}
+
+.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: 20rpx 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;
+	}
+}
+.info-cell {
+	width: 33.33%;
+	text-align: center;
+	flex-shrink: 0;
+	.cell {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333333;
+	}
+	.cell-title {
+		font-size: 26rpx;
+		font-weight: 500;
+		color:#333333;
+		padding-top: 20rpx;
+	}
+}
 </style>

unpackage/cache/apk/apkurl

@@ -1,5 +1 @@
-<<<<<<< HEAD
-https://service.dcloud.net.cn/build/download/622464b0-eddf-11eb-8cc1-79c7ddc2e8f0
-=======
-https://service.dcloud.net.cn/build/download/b7bb6e00-e88b-11eb-83dc-b9d3ba6cbb7f
->>>>>>> ec3f134a764c558d4629a21030a44ce02463619c
+https://service.dcloud.net.cn/build/download/e9550df0-f4c5-11eb-b3d2-4b744823eb2b