7-15

manifest.json

@@ -4,8 +4,8 @@
     // __UNI__6FC8B70
     // "appid" : "__UNI__6FC8B70",
     "description" : "",
-    "versionName" : "1.2.2",
-    "versionCode" : 122,
+    "versionName" : "1.2.7",
+    "versionCode" : 127,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages.json

@@ -105,7 +105,7 @@
 		{
 			"path": "pages/calculation/buyCalculation",
 			"style": {
-				"navigationBarTitleText": "算力商城"
+				"navigationBarTitleText": "市场"
 			}
 		},
 		{
@@ -275,7 +275,7 @@
 				"pagePath": "pages/calculation/buyCalculation",
 				"iconPath": "static/tabBar/tab-calculation.png",
 				"selectedIconPath": "static/tabBar/tab-calculation-current.png",
-				"text": "算力"
+				"text": "市场"
 			},
 			{
 				"pagePath": "pages/finance/index",

pages/calculation/buyCalculation.vue

@@ -3,6 +3,12 @@
 		<image class="logo-img" src="../../static/img/img01.png"></image>
 		<view class="list-box">
 			<scroll-view scroll-x class="list-title">
+				<view class="title" 
+				:class="{ blue: tabCurrent == '全部' }"
+				@click="tabClick('全部', 1)"
+				>
+					全部
+				</view>
 				<view
 					class="title"
 					v-for="(ls, index) in moneyTypeList"
@@ -14,13 +20,14 @@
 					{{ ls.name }}
 				</view>
 			</scroll-view>
-			<view class="flex_item list-name">
+			<view class="flex_item list-name" v-if="tabCurrent!== '全部'">
 				<view class="name" :class="{ black: tabType == 1 }" @click="tabTypeClick(1)">算力包</view>
 				<view class="name" :class="{ black: tabType == 2 }" @click="tabTypeClick(2)">独享矿机</view>
-				<!-- <view class='name' :class="{'black':tabType==3}" @click="tabTypeClick(3)">联合挖矿</view> -->
+				<view class='name' :class="{'black':tabType==3}" @click="tabTypeClick(3)">联合挖矿</view>
 				<!-- <view class='name' :class="{'black':tabCurrent==4}">分类名称</view> -->
 			</view>
-			<view class="list-cell" v-if="list.length > 0" v-for="(ls, index) in list" :key="index">
+			<view class="jg" v-else></view>
+			<view class="list-cell" v-if="list.length > 0" v-for="(ls, index) in list" :key="index" :class="{'mini-list-cell': tabCurrent === '全部'}">
 				<view class="flex">
 					<view>
 						<view class="cell-title flex">
@@ -50,7 +57,7 @@
 					</view>
 					<view class="tpl">
 						<view class="">合约周期</view>
-						<view class="">{{ ls.first_step_time + ls.second_step_time + ls.third_step_time }}天</view>
+						<view class="">{{ ls.first_step_time + ls.second_step_time }}天 + {{ls.third_step_time}}天</view>
 					</view>
 					<!-- <view class="tpl">
 						<view class="">上架期</view>
@@ -105,7 +112,7 @@ export default {
 	},
 	data() {
 		return {
-			tabCurrent: 'XCH',
+			tabCurrent: '全部',
 			tabType: 1,
 			moneyTypeList: [
 				{
@@ -153,10 +160,11 @@ export default {
 		// 所有币种
 		async moneyType() {
 			let obj = this;
-			console.log(obj.moneyTypeList);
+			// console.log(obj.moneyTypeList);
 			moneyType({}).then(({ data }) => {
 				// console.log(data,"+++++++moneyTypeList++++++++++")
 				obj.moneyTypeList = data;
+				console.log(obj.moneyTypeList,"+++++++moneyTypeList++++++++++")
 				// console.log(obj.moneyTypeList,'moneyTypeList----------')
 				// if(obj.moneyTypeList.length > 0){
 				// 	obj.tabCurrent = obj.moneyTypeList[0].code
@@ -169,35 +177,89 @@ export default {
 			uni.showLoading({
 				title: '加载中...'
 			});
-			mining({
-				page: 1,
-				limit: 1000,
-				type: obj.tabType,
-				get_money_type: obj.tabCurrent
-			}).then(({ data }) => {
-				console.log(data, '1111');
-				obj.list = data.data.map(e => {
-					e.step = +e.step;
-					e._cost_money = +e._cost_money.replace(e.cost_money_type, '') + e.cost_money_type;
-					return e;
-				});
-				console.log(obj.list, 'obj.list++++++++++++');
-				let len = obj.list.length;
-
-				for (let i = 0; i < len; i++) {
-					// obj.list[i].tags = obj.list[i].tags.splice(',')
-					for (let j = 0; j < len; j++) {
-						if (obj.list[i].step > obj.list[j].step) {
-							let z = obj.list[i];
-							obj.list[i] = obj.list[j];
-							obj.list[j] = z;
+			if(obj.tabCurrent === '全部'){
+				obj.list = []
+				mining({
+					page: 1,
+					limit: 1000
+				}).then( ({data}) => {
+					uni.hideLoading();
+					console.log(data.data,'9999999999999999999999999999999999')
+					obj.list = data.data.map(e => {
+						e.step = +e.step;
+						e._cost_money = +e._cost_money.replace(e.cost_money_type, '') + e.cost_money_type;
+						return e;
+					});
+					console.log(obj.list, 'obj.list++++++++++++');
+				})
+				// for(let i = 0 ; i<obj.moneyTypeList.length;i++){
+				// 	if(obj.moneyTypeList[i].has_mining !==0){
+				// 		mining({
+				// 			page:1,
+				// 			limit:1000,
+				// 			type: obj.tabType,
+				// 			get_money_type: obj.moneyTypeList[i].code
+				// 		}).then(({ data }) => {
+				// 			console.log(data)
+				// 			let arr = data.data.map(e => {
+				// 				e.step = +e.step;
+				// 				e._cost_money = +e._cost_money.replace(e.cost_money_type, '') + e.cost_money_type;
+				// 				return e;
+				// 			});
+				// 			obj.list = obj.list.concat(arr)
+				// 			// console.log( obj.list.length)
+				// 			let len = obj.list.length
+				// 			for (let i = 0; i < len; i++) {
+				// 				// obj.list[i].tags = obj.list[i].tags.splice(',')
+				// 				for (let j = 0; j < len; j++) {
+				// 					if (obj.list[i].step > obj.list[j].step) {
+				// 						let z = obj.list[i];
+				// 						obj.list[i] = obj.list[j];
+				// 						obj.list[j] = z;
+				// 					}
+				// 				}
+				// 			}
+				// 			// console.log(obj.list, 'new obj.list-------------')
+				// 			uni.hideLoading();
+							
+				// 		})
+				// 	}
+					
+				// }
+				// let len = obj.list.length;
+				
+			}else {
+				mining({
+					page: 1,
+					limit: 1000,
+					type: obj.tabType,
+					get_money_type: obj.tabCurrent
+				}).then(({ data }) => {
+					console.log(data, '1111');
+					obj.list = data.data.map(e => {
+						e.step = +e.step;
+						e._cost_money = +e._cost_money.replace(e.cost_money_type, '') + e.cost_money_type;
+						return e;
+					});
+					console.log(obj.list, 'obj.list++++++++++++');
+					let len = obj.list.length;
+				
+					for (let i = 0; i < len; i++) {
+						// obj.list[i].tags = obj.list[i].tags.splice(',')
+						for (let j = 0; j < len; j++) {
+							if (obj.list[i].step > obj.list[j].step) {
+								let z = obj.list[i];
+								obj.list[i] = obj.list[j];
+								obj.list[j] = z;
+							}
 						}
 					}
-				}
-				
-				console.log(obj.list, 'new obj.list-------------');
-				uni.hideLoading();
-			});
+					
+					console.log(obj.list, 'new obj.list-------------');
+					uni.hideLoading();
+				});
+			}
+			
 		},
 		ToBuy(ls) {
 			// let obj = this;
@@ -234,6 +296,9 @@ export default {
 			this.$refs.popup.close();
 		},
 		tabClick(index, has_mining) {
+			if(index === '全部') {
+				console.log('ddddddddd')
+			}
 			if (has_mining == 0) {
 				this.$api.msg('敬请期待！');
 			} else {
@@ -288,7 +353,7 @@ page {
 		padding: 24rpx 50rpx;
 		.name {
 			font-size: 28rpx;
-			margin-right: 20%;
+			margin-right: 15%;
 			font-weight: 500;
 			color: #666666;
 		}
@@ -297,6 +362,7 @@ page {
 			border-bottom: 2rpx solid #5771df;
 			padding-bottom: 10rpx;
 			font-size: 30rpx;
+			font-weight: bold;
 		}
 	}
 }
@@ -309,6 +375,9 @@ page {
 .all-list {
 	width: 180rpx;
 	height: 180rpx;
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
 }
 .list-cell {
 	box-sizing: border-box;
@@ -318,6 +387,7 @@ page {
 	border-radius: 30rpx 30rpx;
 	background-color: #f7f6fb;
 	margin-bottom: 20rpx;
+	position: relative;
 	.cell-title {
 		padding: 29rpx 38rpx 29rpx 15rpx;
 		font-size: 38rpx;
@@ -339,6 +409,7 @@ page {
 			background-color: #e3f6fa;
 			border-radius: 24rpx 24rpx;
 			margin-right: 20rpx;
+			margin-top: 15rpx;
 		}
 		.cell-tag {
 			display: inline-block;
@@ -443,4 +514,34 @@ page {
 		}
 	}
 }
+.jg {
+	height: 20rpx;
+}
+.mini-list-cell {
+	padding: 0rpx 40rpx 10rpx;
+	.cell-tpl {
+		padding: 10rpx 0 8rpx;
+	}
+	.cell-info {
+		.tip {
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #5771df;
+			opacity: 0;
+			line-height: 40px;
+		}
+		.zhiya-btn {
+			background-color: #5771df;
+			width: 150rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			border-radius: 50rpx;
+			color: #ffffff;
+		}
+		.grey {
+			background-color: #999999;
+		}
+	}
+}
 </style>

pages/calculation/details.vue

@@ -27,7 +27,7 @@
 			<view class="param-list">
 					<view class="list-item">
 						<view class="item-title">使用周期</view>
-						<view class="item-val">{{ list.first_step_time + list.second_step_time + list.third_step_time }}天</view>
+						<view class="item-val">{{ list.first_step_time + list.second_step_time }}天 + {{list.third_step_time}}天</view>
 					</view>
 					<view class="list-item">
 						<view class="item-title">电费</view>
@@ -464,8 +464,9 @@ page {
 		padding-bottom: 24rpx;
 		// margin: 0 19rpx;
 		.list-item {
-			width: 30%;
+			width: 33%;
 			padding: 5rpx 0 0 5rpx;
+			text-align: center;
 			// height: 122rpx;
 			.item-title {
 				font-size: 30rpx;

pages/calculation/pay.vue

@@ -25,7 +25,7 @@
 			</view> -->
 			<view class="flex list-item">
 				<view class="item-name">合约期</view>
-				<view class="item-tpl">{{ list.first_step_time + list.second_step_time + list.third_step_time }}天</view>
+				<view class="item-tpl">{{ list.first_step_time + list.second_step_time}}天 + {{list.third_step_time}}天</view>
 			</view>
 			<view class="flex list-item">
 				<view class="item-name">电费</view>

pages/finance/details.vue

@@ -211,9 +211,7 @@ export default {
 		},
 		handleCancel(e) {},
 		recharge() {
-			uni.navigateTo({
-				url:
-					'/pages/finance/recharge?logo=' +
+			let url = '/pages/finance/recharge?logo=' +
 					this.logo +
 					'&name=' +
 					this.name +
@@ -237,6 +235,36 @@ export default {
 					this.way +
 					'&waypath=' +
 					this.waypath
+			if(this.code === 'FIL') {
+				console.log("555555555")
+				url='/pages/finance/recharge'
+			}
+			uni.navigateTo({
+				url:url
+					// '/pages/finance/recharge?logo=' +
+					// this.logo +
+					// '&name=' +
+					// this.name +
+					// '&code=' +
+					// this.code +
+					// '&_address_qr=' +
+					// this._address_qr +
+					// '&__money_address=' +
+					// this.__money_address +
+					// '&mark=' +
+					// this.mark +
+					// '&ids=' +
+					// this.ids +
+					// '&keysAddr=' +
+					// this.keysAddr +
+					// '&charge=' +
+					// this.charge +
+					// '&address=' +
+					// this.address +
+					// '&way=' +
+					// this.way +
+					// '&waypath=' +
+					// this.waypath
 			});
 			// this.$refs.popup.open();
 		},

pages/finance/recharge.vue

@@ -13,7 +13,8 @@
 			</view>
 		</view>
 
-		<view class="image-box" v-if="charge != 0">
+		<view class="image-box" v-if="way[0] !== 'NO'&&code !== 'USDT'">
+			<!-- <view class="image-box" v-if="charge != 0"> -->
 			<!-- <view class="tuijianbox" v-if="isShow">
 				<view class="item" @click="gogo()">
 					<image v-if="idx == 2" src="../../static/img/befor.png"></image>
@@ -43,12 +44,13 @@
 			/>
 			<!-- <image :src="qr" mode="aspectFit"></image> -->
 		</view>
-		<view class="from-box" v-if="charge != 0">
+		<view class="from-box" v-if="way[0] !== 'NO'&&code !== 'USDT'">
 			<view class="from-title">充币地址</view>
 			<view class="flex input-tpl">
 				<input class="input-box" disabled="disabled" type="text" v-model="address" />
 				<view class="all" @click="copy(address)">复制</view>
 			</view>
+			<!-- 弃用bin -->
 			<!-- <view class="from-title">充币数量</view>
 			<input class="input-box" type="text" v-model="num" placeholder="请输入充币数量" /> -->
 			<!-- <view class="submit" v-if="showBtn" @click="bangidng">绑定钱包</view> -->
@@ -63,7 +65,8 @@
 				</view>
 				<view class="addr-text" @click="moneyList">上传凭证</view>
 			</view> -->
-			<view class="text-box">{{ mark }}</view>
+			<!-- 弃用end -->
+			<view class="text-box" style="text-indent:2em;">{{ mark }}</view>
 		</view>
 		<view class="qidai" v-else>{{ mark }}</view>
 
@@ -160,8 +163,19 @@ export default {
 		async moneyType() {
 			let obj = this;
 			moneyType({}).then(({ data }) => {
-				
+				console.log(data,'9999999999999999999999999S')
 				obj.moneyTypeList = data;
+				//暂时数据
+				for(let i = 0; i< obj.moneyTypeList.length ; i++) {
+					if(obj.moneyTypeList[i].code === 'FIL') {
+						obj.moneyTypeList[i].way = 'FIL'
+						obj.moneyTypeList[i].wallet.address_FIL = 'f1dzghtxhbnxjqhk4ha25majfbmk2w3gft463spyi'
+					}
+					if(obj.moneyTypeList[i].code === 'USDT') {
+						obj.moneyTypeList[i].way = 'NO'
+						obj.moneyTypeList[i].wallet.address_TRC20 = null
+					}
+				}
 				console.log(obj.moneyTypeList)
 				if (obj.logo == '') {
 					// obj.charge = obj.moneyTypeList[0].charge;
@@ -191,13 +205,10 @@ export default {
 							obj.code = obj.moneyTypeList[i].code;
 							obj.money = obj.moneyTypeList[i].price;
 							obj.way = obj.moneyTypeList[i].way.split(",")
-							// if(obj.way[i] === "NO"){
-							// 	obj.address = ''
-							// }else {
-							// 	obj.address = obj.moneyTypeList[i].wallet['address'+obj.way[0]]
-							// }
+							console.log(obj.way,'obj.way++++++++++++++++++++++++++++')
+							
 							obj.address = obj.moneyTypeList[i].wallet['address_'+obj.way[0]]
-							console.log(obj.address)
+							console.log(obj.address,'obj.address----------------')
 							obj.qr = obj.moneyTypeList[i]._address_qr;
 							console.log(obj.qr)
 							obj.mark = obj.moneyTypeList[i].mark;
@@ -301,9 +312,10 @@ export default {
 			});
 		},
 		selectOne(options) {
-			console.log("selectOne",options)
+			console.log("selectOne9999999999999999999",options)
 			this.logo = options.LOGO;
 			this.charge = options.charge;
+			console.log(this.charge,'...........................')
 			this.name = options.name;
 			this.code = options.code;
 			this.money = options.price;
@@ -366,7 +378,7 @@ page {
 
 .list-box {
 	padding: 60rpx 30rpx;
-	height: 350rpx;
+	height: 300rpx;
 	background-color: #5771df;
 
 	.list {

pages/public/forget.vue

@@ -9,16 +9,16 @@
 			</view>
 			<view class="login_input flex_item">
 				<view class="login_img"><image src="/static/img/img26.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus placeholder=" 请输入新的不少于6位的密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password"  placeholder=" 请输入新的不少于6位的密码" /></view>
 			</view>
 			<view class="login_input flex_item">
 				<view class="login_img"><image src="/static/img/img26.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password2" focus placeholder="请重复输入新密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password2"  placeholder="请重复输入新密码" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image class="codeimg" src="/static/img/img27.png"></image></view>
 				<view class="login_name flex">
-					<input class="uni-input width" v-model="code" type="number" focus placeholder="请输入验证码" />
+					<input class="uni-input width" v-model="code" type="number" placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '发送验证码' : countDown }}</view>
 				</view>
 			</view>

pages/set/set.vue

@@ -10,11 +10,11 @@
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">ID</text>
-			<input class="input" v-model="userInfo.uid" type="text" disabled="true" placeholder-class="placeholder" />
+			<input class="input ld" v-model="userInfo.uid" type="text" disabled="true" placeholder-class="placeholder" />
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">用户账号</text>
-			<input class="input" v-model="userInfo.account" type="number" disabled="true" placeholder-class="placeholder" />
+			<input class="input ld" v-model="userInfo.account" type="number" disabled="true" placeholder-class="placeholder" />
 		</view>
 		<view class="submit-box flex" >
 			<view class="submit" @click="edit">确认修改</view>
@@ -133,4 +133,7 @@ page {
 			border-radius: 50rpx;
 		}
 	}
+	.ld {
+		color: #999 !important;
+	}
 </style>

pages/user/revenue.vue

@@ -1,11 +1,35 @@
 <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="">
 				<view class="title">总收益</view>
@@ -20,6 +44,7 @@
 				<view class="num">{{wait}}{{navList[currentIndex].unit}}</view>
 			</view>
 		</view>
+		
 		<view class="tip">
 			<view class="line"></view>
 			<view class="title">每日收益记录</view>
@@ -54,17 +79,20 @@
 <script>
 import empty from '@/components/empty';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { mining,miningIndex } from '@/api/calculation.js';
 export default {
 	components:{
 		empty,
 		uniLoadMore
 	},
 	data() {
-		return {
+		return {
+			list: '',
 			navList: [
 				{
 					title: 'Fil',
-					unit: 'FIL',
+					unit: 'FIL',
+					slUnit:'T',
 					list: [],
 					page: 1,
 					limit: 10,
@@ -72,7 +100,8 @@ export default {
 				},
 				{
 					title: 'Chia',
-					unit: 'XCH',
+					unit: 'XCH',
+					slUnit:'T',
 					list: [],
 					page: 1,
 					limit: 10,
@@ -80,7 +109,8 @@ export default {
 				},
 				{
 					title: 'Bzz',
-					unit: 'BZZ',
+					unit: 'BZZ',
+					slUnit:'节点',
 					list: [],
 					page: 1,
 					limit: 10,
@@ -110,13 +140,33 @@ export default {
 		});
 	},
 	onLoad() {
+		let userInfo = uni.getStorageSync('userInfo') || '';
+		this.level = userInfo.level;
 		this.loadData();
+		this.loadTopDate('FIL')
 	},
-	methods: {
+	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) {
-			this.currentIndex = index;
-			this.loadData('tabChange')
+		navClick(index) {
+			if(index !== this.currentIndex ){
+				this.currentIndex = index;
+				this.loadTopDate(this.navList[index].unit)
+				this.loadData('tabChange')
+			}
+			
 		},
 		loadData(source) {
 			//这里是将list挂载到nav列表下
@@ -183,7 +233,7 @@ page {
 	height: 55rpx;
 }
 .nav-wrapper {
-	margin: 0rpx auto 61rpx;
+	margin: 0rpx auto 10rpx;
 	width: 627rpx;
 	height: 60rpx;
 	border: 2px solid #5771df;
@@ -268,4 +318,34 @@ page {
 		}
 	}
 }
+.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,7 +1,7 @@
 <template>
 	<view class="sharerevenue">
 		<view class="top-jg"></view>
-		<view class="nav-wrapper">邀请算力收益 3%</view>
+		<view class="nav-wrapper">邀请算力收益</view>
 		<view class="all-num">
 			<view class="">
 				<view class="title">总收益</view>

pages/user/user.vue

@@ -14,13 +14,13 @@
 		</view>
 		<view class="list-box">
 			<view class="list-title">我的工具</view>
-			<view class="list-cell flex" @click="navTo('/pages/calculation/index')">
+			<!-- <view class="list-cell flex" @click="navTo('/pages/calculation/index')">
 				<view class="cell-info flex_item">
 					<image src="../../static/tabBar/tab-calculation-current.png" style="width: 40rpx; height: 40rpx;"></image>
 					<view class="cell-name">我的算力</view>
 				</view>
 				<image src="../../static/img/img23.png"></image>
-			</view>
+			</view> -->
 			<view class="list-cell flex" @click="navTo('/pages/user/revenue')">
 				<view class="cell-info flex_item">
 					<image src="../../static/img/img54.png" style="width: 40rpx; height: 40rpx;"></image>
@@ -31,7 +31,7 @@
 			<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>
+					<view class="cell-name">邀请收益</view>
 				</view>
 				<image src="../../static/img/img23.png"></image>
 			</view>

unpackage/cache/apk/apkurl

@@ -1,5 +1 @@
-<<<<<<< HEAD
-https://service.dcloud.net.cn/build/download/96c84010-e0a8-11eb-831c-a5ed677c0e9c
-=======
-https://service.dcloud.net.cn/build/download/a06bdf60-ce8e-11eb-b40d-f9f0d5633d09
->>>>>>> 7d6c259c43a3f335582af59a34e95854bf252854
+https://service.dcloud.net.cn/build/download/31598260-e54e-11eb-b0ef-df631aab9651

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==