2021-5-7

App.vue

@@ -30,16 +30,12 @@ export default {
 				try {
 					obj.url =obj.baseURL + e.data.apk;
 					obj.versionFu = e.data.version_code;
-					console.log(obj.versionFu);
 
 					let ver = plus.runtime.versionCode;
-					uni.showModal({
-						title: ver
-					});
-					if (+ver > +this.versionFu) {
+					if (+ver < +this.versionFu) {
 						uni.showModal({
 							title: '友情提示',
-							content: '当前版本较低请升级小程序',
+							content: '当前版本较低请升级小程序'+ver+this.versionFu ,
 							success: res => {
 								if (res.confirm) {
 									try{
@@ -57,10 +53,7 @@ export default {
 							}
 						});
 					} else {
-						uni.showModal({
-							title: '友情提示',
-							content: '当前版本new'
-						});
+						
 					}
 				} catch (e) {
 					console.log(e);

api/user.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { upFilse} from '@/utils/request';
 
 
 // 获取用户信息
@@ -40,4 +41,18 @@ export function version(data) {
 		method: 'GET',
 		data
 	})
+}
+export function uploads(data){
+	return upFilse({
+		url:'/api/upload/image',
+		method:'post',
+		data
+	});
+}
+export function edit(data){
+	return request({
+		url: '/api/user/edit',
+		method:'post',
+		data
+	});
 }

pages/calculation/details.vue

@@ -28,10 +28,18 @@
 				<view class="item-tpl">{{ list.first_step_time + list.second_step_time + list.third_step_time }}天</view>
 			</view>
 			<!-- <view class="tpl" v-if="list.stand_money > 0">需完成应质押的FIL后，才能开始进入50天封装期</view> -->
+			<view class="flex num-box">
+				<view class="num-title">有效算力</view>
+				<view class="step">{{ list.step * 1 }}T</view>
+			</view>
 			<view class="num-box flex">
 				<view class="num-title">购买数量（1T）</view>
 				<uni-number-box class="step" :value="num" :disabled="false" @eventChange="numberChange"></uni-number-box>
 			</view>
+			<view class="flex money-box">
+				<view class="money-name">购买总数</view>
+				<view class="money-num">{{ list.step * 1 * num}}T</view>
+			</view>
 			<view class="flex money-box">
 				<view class="money-name">金额</view>
 				<view class="money-num">{{ money * 1 }}{{ list._cost_money_type }}</view>
@@ -69,8 +77,9 @@ export default {
 			id: '',
 			type: '',
 			num: 1,
+			step: 0,
 			password: '',
-			money: '',
+			
 			price: '',
 			list: {
 				
@@ -83,9 +92,10 @@ export default {
 		this.type = option.type;
 		this.loadData();
 	},
-	watch: {
-		num(newVal, oldVal) {
-			this.money = this.num * this.price;
+	
+	computed: {
+		money() {
+			return this.num * this.price *this.step ;
 		}
 	},
 	onShow() {},
@@ -94,8 +104,9 @@ export default {
 			let obj = this;
 			miningDateils({}, obj.id).then(({ data }) => {
 				obj.list = data;
-				obj.money = obj.list.cost_money;
+				// obj.money = obj.list.cost_money;
 				obj.price = obj.list.cost_money;
+				obj.step = obj.list.step;
 			});
 		},
 		//阅读并同意
@@ -120,7 +131,7 @@ export default {
 			}
 			buyMining(
 				{
-					num: obj.num,
+					num: obj.num * obj.step,
 					trade_psw: obj.password
 				},
 				obj.id

pages/calculation/myCalculation.vue

@@ -26,6 +26,12 @@
 			<view class="cell-info flex">
 				<view class="tip">到期时间：{{ls.mining_end_time}}</view>
 			</view>
+			<view class="cell-info flex">
+				<view class="tip">购买时间：{{ls._pay_time}}</view>
+			</view>
+			<view class="cell-info flex">
+				<view class="tip">倒计时：</view>
+			</view>
 			<!-- <view class="cell-info flex">
 				<view class="tip">正式挖矿时间：{{ls.mining_start_time}}</view>
 			</view> -->

pages/finance/allMiner.vue

@@ -1,6 +1,18 @@
 <template>
 	<view class="container">
 		<view class="info-box">
+			<view class="nav flex">
+				<view class="next" @click="last" v-if="page != 1">
+					上一页
+				</view>
+				<view class="next" v-else>
+					已经是第一页了
+				</view>
+				<view class="next" @click="next">
+					下一页
+				</view>
+			</view>
+			
 			<view class="list-cell" v-if="list.length > 0">
 				<view class="cell-name flex">
 					<view class="title">成员信息</view>
@@ -42,6 +54,8 @@ export default {
 			loadingType: 'more',
 			data:'',
 			list:'',
+			page: 1,
+			limit: 5,
 		};
 	},
 	onLoad(option){
@@ -53,32 +67,38 @@ export default {
 		// 请求载入数据
 		async loadData(type = "add",loading) {
 			let obj = this;
-			if (type === 'add'){
-				if (obj.loadingType === 'nomore'){
-					return;
-				}
-				obj.loadingType = 'loading';
-			}else {
-				obj.loadingType = 'more';
-			}
+			// if (type === 'add'){
+			// 	if (obj.loadingType === 'nomore'){
+			// 		return;
+			// 	}
+			// 	obj.loadingType = 'loading';
+			// }else {
+			// 	obj.loadingType = 'more';
+			// }
 			
 			miner({
-				page: 1,
-				limit: 20,
+				page: obj.page,
+				limit: obj.limit,
 				
 			}).then(({ data }) => {
 				console.log(data);
 				obj.data = data;
 				obj.list = data.list;
-				if(obj.limit == data.list.length){
-					obj.page++
-					obj.loadingType="more"
-				}else{
-					obj.loadingType="nomore"
-				}
-				
 			});
 		},
+		next(){
+			this.page = this.page + 1;
+			if(this.list.length != this.limit){
+				this.page = 1;
+			}
+			this.loadData();
+		},
+		last(){
+			if(this.page != 1){
+				this.page = this.page - 1;
+			}
+			this.loadData();
+		}
 	}
 }
 </script>
@@ -165,4 +185,10 @@ export default {
 		width: 100%;
 		height: 500rpx;
 	}
+	.next{
+		width: 50%;
+		text-align: center;
+		padding: 20rpx;
+		
+	}
 </style>

pages/finance/recharge.vue

@@ -128,9 +128,9 @@
 				cid: 'cid',
 				size: 150,
 				unit: '150',
-				background: '#000000',
-				foreground: '#ffffff',
-				pdground: '#ffffff',
+				background: '#FFFFFF',
+				foreground: '#000000',
+				pdground: '#000000',
 				icon: '',
 				iconSize: 40,
 				lv: 3,

pages/set/set.vue

@@ -2,11 +2,11 @@
 	<view class="container">
 		<view class="row b-b flex">
 			<text class="tit">头像</text>
-			<image :src="userInfo.avatar"></image>
+			<image :src="userInfo.avatar" @click.stop="imgsub"></image>
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">昵称</text>
-			<input class="input" v-model="userInfo.nickname" type="text" disabled="true" placeholder-class="placeholder" />
+			<input class="input" v-model="userInfo.nickname" type="text" placeholder-class="placeholder" />
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">ID</text>
@@ -16,9 +16,11 @@
 			<text class="tit">用户账号</text>
 			<input class="input" v-model="userInfo.account" type="number" disabled="true" placeholder-class="placeholder" />
 		</view>
-		<view class="submit-box">
+		<view class="submit-box flex" >
+			<view class="submit" @click="edit">确认修改</view>
 			<view class="submit" @click="toLogout">退出登录</view>
 		</view>
+		
 	</view>
 </template>
 <script>
@@ -26,6 +28,9 @@ import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import { mapState, mapMutations } from 'vuex';
 import { logout } from '@/api/set.js';
+import {
+		uploads,edit
+	} from '@/api/user.js';
 export default {
 	components: {
 		uniList,
@@ -64,6 +69,27 @@ export default {
 				}
 			});
 		},
+		imgsub() {
+			console.log('上传头像')
+			uploads({
+				filename: ''
+			}).then(data => {
+				console.log("data",data);
+				this.userInfo.avatar = data[0].url;
+			})
+		},
+		edit() {
+			const that = this;
+			edit({
+				avatar: this.userInfo.avatar,
+				nickname: this.userInfo.nickname
+			}).then( e =>{
+				that.$api.msg('修改成功');
+			}).catch(e =>{
+				console.log(e);
+				that.$api.msg('修改失败');
+			})
+		}
 	}
 };
 </script>
@@ -91,8 +117,10 @@ page {
 	}
 }
 .submit-box{
-		padding: 157rpx 95rpx;
+		 padding-top: 157rpx;
 		.submit{
+			margin: 40rpx;
+			width: 50%;
 			background-color: #5771DF;
 			color: #FFFFFF;
 			text-align: center;