222

manifest.json

@@ -4,8 +4,8 @@
     // __UNI__6FC8B70
     // "appid" : "__UNI__6FC8B70",
     "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/finance/transfer.vue

@@ -29,12 +29,12 @@
 			</view>
 			<view class="all-num">可用<text>{{money *1 }}</text>{{name}}</view>
 			<view class="submit" @click="transfer">确定</view>
-			<view class="tpl-box">转账数量10.0个起，手续费：0.0001FIL。</view>
+			<!-- <view class="tpl-box">转账数量10.0个起，手续费：0.0001FIL。</view> -->
 		</view>
 	</view>
 </template>
 <script>
-	import { goPay,trade } from '@/api/finance.js';
+	import { goPay,trade,cashmoney_type } from '@/api/finance.js';
 	import selectss from '@/components/select.vue';
 	export default {
 		components: {
@@ -55,6 +55,7 @@
 			};
 		},
 		onLoad(option) {
+			console.log(option,'22');
 			if (option.name) {
 				this.name = option.name;
 				this.logo = option.logo;
@@ -73,6 +74,7 @@
 					data
 				}) => {
 					obj.moneyTypeList = data;
+					console.log(data,'2');
 					if (obj.logo == '') {
 						obj.logo = obj.moneyTypeList[0].LOGO;
 						obj.name = obj.moneyTypeList[0].name;

pages/finance/withdraw.vue

@@ -28,7 +28,7 @@
 			</view>
 			<view class="all-num">可用<text>{{money *1 }}</text>{{name}}</view>
 			<view class="submit" @click="cash">确定</view>
-			<view class="tpl-box" v-show="showText == true">提币数量在1.0-10000.0个之间，认真核对提币地址；手续费：{{data.service}}{{data.service_type}}</view>
+			<view class="tpl-box" v-show="showText == true">认真核对提币地址；手续费：{{data.service}}{{data.service_type}}</view>
 		</view>
 	</view>
 </template>
@@ -82,6 +82,7 @@
 					data
 				}) => {
 					obj.moneyTypeList = data;
+					console.log(obj.moneyTypeList,'22');
 					if (obj.logo == '') {
 						obj.logo = obj.moneyTypeList[0].LOGO;
 						obj.name = obj.moneyTypeList[0].name;

pages/index/index.vue

@@ -88,8 +88,6 @@
 						
 					</view>
 					<view class="between">
-						
-						
 						<text>算力：{{item.step}}T</text>
 						<text>上架期：T+{{item.stand_time}}</text>
 						<text>产币有效期：无限</text>
@@ -153,6 +151,7 @@
 				interceptor();
 			} else {
 				this.loadData();
+				console.log('start')
 				this.loadDatass()
 				// this.moneyType();
 			}
@@ -194,8 +193,8 @@
 			},
 
 
-			async loadDatass() {
-				console.trace()
+			loadDatass() {
+				// console.trace()
 				let obj = this;
 				uni.showLoading({
 					title: '加载中...'

pages/public/forget.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<view class="logo-img"><image src="../../static/img/logo1.png"></image></view>
+		<view class="logo-img"><image src="../../static/user/logo.png"></image></view>
 		<!-- <view class="logo">LOGO</view> -->
 		<view class="login_text">
 			<view class="login_input flex_item">
@@ -182,7 +182,7 @@ page {
 		.login_name {
 			color: #333333;
 			.code {
-				color: #5771DF;
+				color: #141E47;
 				font-size: 23rpx;
 				border-left: 1px solid #eeeeee;
 				width: 150rpx;
@@ -194,7 +194,7 @@ page {
 }
 
 .login{
-	background-color: #5771DF;
+	background-color: #141E47;
 	margin-top: 96rpx;
 	color: #FFFFFF;
 	text-align: center;

pages/public/register.vue

@@ -80,16 +80,16 @@
 					obj.$api.msg('请输入验证码');
 					return;
 				}
-				// if (obj.invitation == '') {
-				// 	obj.$api.msg('请输入邀请码');
-				// 	return;
-				// }
+				if (obj.invitation == '') {
+					obj.$api.msg('请输入邀请码');
+					return;
+				}
 				register({
 					phone: obj.phone, //账号
 					captcha: obj.code, //验证码
 					password:obj.loginPass,
 					trade_password:obj.payPass,
-					// invite_code:obj.invitation
+					invite_code:obj.invitation
 				}).then(function(e) {
 					uni.showToast({
 						title: '注册成功',

pages/user/myTeam.vue

@@ -43,7 +43,8 @@
 						<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)">
+			<!-- 	@click="nav('/pages/user/rake?uid=' + ls.uid)" -->
+				<view class="cell-box flex" v-for="(ls, index) in list" :key="index" >
 					<view class="cell-tit flex_item">
 						<image :src="ls.avatar"></image>
 						<view class="tit-box">

pages/user/revenue.vue

@@ -82,7 +82,7 @@
 				<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 class="item-value">{{ item.add_time }}</view>
 					</view>
 					<view class="item">
 						<view class="item-title">
@@ -160,6 +160,7 @@
 </template>
 
 <script>
+	import{getTime} from '../../utils/rocessor.js'
 import empty from '@/components/empty';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import { mining, miningIndex, myMiningGet } from '@/api/calculation.js';
@@ -171,6 +172,7 @@ export default {
 	data() {
 		return {
 			list: '',
+			// time:0,
 			navList: [
 				{
 					title: 'BTC',
@@ -182,7 +184,8 @@ export default {
 					loadingType: 'more',
 					all_lock: 0, //待释放
 					all_get: 0, //总收益
-					all_unlock: 0 //累计释放
+					all_unlock: 0 ,//累计释放
+					time:"",//结算时间
 				},
 				// {
 				// 	title: 'Chia',
@@ -229,7 +232,7 @@ export default {
 				} else {
 					val = val.substring(0);
 				}
-				return parseFloat(val).toFixed(4);
+				return parseFloat(val).toFixed(8);
 			}
 			return '0.0000';
 		}
@@ -278,6 +281,7 @@ export default {
 			}
 		},
 		loadData(source) {
+			let obj =this
 			console.log('loadnoe');
 			//这里是将list挂载到nav列表下
 			let index = this.currentIndex;
@@ -304,6 +308,14 @@ export default {
 			})
 				.then(({ data }) => {
 					console.log(data, '888888888888888888888');
+					data.list.data.forEach(e=>{
+						// console.log(e,'2');
+					e.add_time=	getTime(e.add_time)
+					// console.log(e.add_time,'时间');
+					})
+					// navItem.time =getTime(data.list.data.add_time) ;
+					// console.log(data.list.data[0].add_time);
+					
 					navItem.all_lock = data.all_lock;
 					navItem.all_get = data.all_get;
 					navItem.all_unlock = data.all_unlock;

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/ef11b510-aa6d-11ec-9a3b-93302ac24606
+https://ide.dcloud.net.cn/build/download/13519e00-af3c-11ec-b97f-61a09b66939a