123

manifest.json

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

pages/calculation/buyCalculation.vue

@@ -45,7 +45,7 @@
 					</view>
 					<view class="tpl">
 						<view class="">算力</view>
-						<view class="">{{ ls.step }}T</view>
+						<view class="">{{ ls.step }}{{ls.unit}}</view>
 						<!-- <view class="" v-else>{{ ls.step }}T</view> -->
 					</view>
 					<view class="tpl">

pages/calculation/details.vue

@@ -35,12 +35,12 @@
 					</view>
 					<view class="list-item">
 						<view class="item-title">预计日产出</view>
-						<view class="item-val">{{list.day_get*1+list.get_money_type| daiding}}天</view>
+						<view class="item-val">{{(list.day_get*1*list.step).toFixed(8)+list.get_money_type | daiding}}/天</view>
 					</view>
 					<view class="list-item">
 						<view class="item-title">算力</view>
 						<view class="item-val" v-if="list.get_money_type == 'BZZ'">{{+list.step}}节点</view>
-						<view class="item-val" v-else>{{ +list.step}}TB</view>
+						<view class="item-val" v-else>{{ +list.step}}{{list.unit}}</view>
 					</view>
 					<view class="list-item">
 						<view class="item-title">管理费</view>
@@ -198,7 +198,7 @@ export default {
 				// obj.money = obj.list.cost_money;
 				obj.price = obj.list.cost_money;
 				obj.step = obj.list.step;
-				console.log(obj.list);
+				console.log(obj.list,'222');
 			});
 		},
 		//阅读并同意

pages/finance/withdraw.vue

@@ -29,6 +29,7 @@
 			<view class="all-num">可用<text>{{money *1 }}</text>{{name}}</view>
 			<view class="submit" @click="cash">确定</view>
 			<view class="tpl-box" v-show="showText == true">认真核对提币地址；手续费：{{data.service}}{{data.service_type}}</view>
+			<view class="tpl-box">（目前只支持trc链usdt提币，请您谨慎核对地址，以免造成损失。）</view>
 		</view>
 	</view>
 </template>
@@ -46,10 +47,8 @@
 				code: '',
 				logo: '',
 				money:'',
-				
 				addr: '',
 				num: '',
-				
 				data:'',
 				showText:false
 			};
@@ -72,9 +71,6 @@
 			}
 		},
 		methods: {
-			['xuhaolan'](){
-				console.log('我是你爹');
-			},
 			// 所有币种
 			async moneyType() {
 				let obj = this;

pages/index/index.vue

@@ -77,7 +77,7 @@
 						</view>
 					</view>
 					<view class="title-right">
-						单价：<text>{{(item.cost_money*1/item.step).toFixed(3)}}  </text>{{item.cost_money_type}}/T
+						单价：<text>{{(item.cost_money*1/item.step).toFixed(3)}}  </text>{{item.cost_money_type}}/{{item.unit}}
 					</view>
 				</view>
 				<view class="cpContent">
@@ -88,7 +88,7 @@
 						
 					</view>
 					<view class="between">
-						<text>算力：{{item.step}}T</text>
+						<text>算力：{{item.step}}{{item.unit}}</text>
 						<text>上架期：T+{{item.stand_time}}</text>
 						<text>产币有效期：无限</text>
 						<text>预计日产出：{{(item.day_get*1*item.step*1).toFixed(8)*1}}{{item.get_money_type}}</text>

pages/index/shoppingDetails.vue

@@ -81,10 +81,10 @@
 						</view>
 						<view class="details-box">
 							<view class="details-left">
-								单份T数
+								单份{{orderList.unit}}数
 							</view>
 							<view class="details-right">
-								{{orderList.step*1}}T
+								{{orderList.step*1}}{{orderList.unit}}
 							</view>
 						</view>
 						<!-- <view class="details-box">
@@ -132,7 +132,7 @@
 								算力到账日
 							</view>
 							<view class="details-right">
-								T+{{orderList.stand_time}}
+								{{orderList.unit}}+{{orderList.stand_time}}
 							</view>
 						</view>
 					</view>

pages/public/login.vue

@@ -10,14 +10,14 @@
 			<view class="username">密码</view>
 			<input class="input-box" type="password" v-model="password" placeholder="请输入密码" />
 		</view>
-		<view class="forget" @click="navTo('/pages/public/forget')">忘记密码</view>
+			<view class="forget" @click="navTo('/pages/public/forget')">忘记密码</view>
 		<view class="login" @click="toLogin">登录</view>
 		<view class="login-tip">还没有账号？<text class="register" @click="navTo('/pages/public/register')">立即注册</text></view>
 	</view>
 </template>
 
 <script>
-import { mapMutations } from 'vuex';
+import { mapMutations,mapState } from 'vuex';
 import { login } from '@/api/login.js';
 import { getUserInfo } from '@/api/user.js';
 export default {
@@ -28,16 +28,24 @@ export default {
 		};
 	},
 	onLoad() {
-		// let obj = this
-		// uni.getStorage({
-		//     key: 'user_name',
-		//     success: function (res) {
-		//         obj.phone = res.data
-		//     }
-		// });
+		let obj = this
+		uni.getStorage({
+		    key: 'user_name',
+		    success: function (res) {
+		        obj.phone = res.data
+		    }
+		});
+		uni.getStorage({
+		    key: 'passWord',
+		    success: function (res) {
+		        obj.password = res.data
+		    }
+		});
+		console.log(this.userInfo,'userInfo');
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'login']),
+		...mapState('user',['userInfo']),
 		//登录
 		async toLogin() {
 			let obj = this;
@@ -55,16 +63,24 @@ export default {
 				password: obj.password
 			})
 				.then(function(e) {
+					
 					uni.setStorageSync('token', e.data.token);
 					getUserInfo({}).then(e => {
 						obj.login();
 						// 保存返回用户数据
 						obj.setUserInfo(e.data);
-						//保存用户账号
-						// uni.setStorage({
-						//     key: 'user_name',
-						//     data: obj.phone
-						// });
+						
+						// 保存用户账号
+						uni.setStorage({
+						    key: 'user_name',
+						    data: obj.phone
+						});
+						//保存密码
+						uni.setStorage({
+						    key: 'passWord',
+						    data: obj.password
+						});
+					
 						uni.switchTab({
 							url:'/pages/index/index'
 						})
@@ -117,6 +133,7 @@ page {
 		font-size: 32rpx;
 	}
 }
+
 .forget{
 	text-align: right;
 	margin: 70rpx 0rpx;

pages/public/register.vue

@@ -80,10 +80,10 @@
 					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, //验证码

pages/user/myTeam.vue

@@ -16,15 +16,15 @@
 				<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">{{ data.recommend_achievement || 0 }}台</view>
 							<view class="cell-title">分享业绩</view>
 						</view>
 						<view class="info-cell">
-							<view class="cell">{{ data.group_achievenent || 0 }}T</view>
+							<view class="cell">{{ data.group_achievenent || 0 }}台</view>
 							<view class="cell-title">团队总业绩</view>
 						</view>
 						<view class="info-cell">
-							<view class="cell">{{ data.today_achievement || 0 }}T</view>
+							<view class="cell">{{ data.today_achievement || 0 }}台</view>
 							<view class="cell-title">今日新增业绩</view>
 						</view>
 						<!-- <view class="info-cell">
@@ -38,8 +38,8 @@
 				<view class="cell-name flex">
 					<view class="title">成员信息</view>
 					<view class="title-box flex">
-						<view class="title">等待算力</view>
-						<view class="title">算力</view>
+						<view class="title">待运行矿机</view>
+						<view class="title">运行矿机</view>
 						<view class="title">等级</view>
 					</view>
 				</view>
@@ -55,8 +55,8 @@
 						</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="num clamp">{{ ls.wait_mining==null?'0':ls.wait_mining }}台</view>
+						<view class="num clamp">{{ ls.mining==null?'0':ls.mining }}台</view>
 						<view class="level">V{{ ls.level }}</view>
 					</view>
 				</view>

pages/user/revenue.vue

@@ -8,11 +8,11 @@
 			<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 class="tpl num">{{ list.doing==null?"0":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 class="tpl num">{{ list.stand==null?"0":list.stand   }}{{ navList[currentIndex].slUnit }}</view>
 				</view>
 			</view>
 			<view class="list-item">
@@ -81,7 +81,7 @@
 			<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-title">结算时间：</view>
 						<view class="item-value">{{ item.add_time }}</view>
 					</view>
 					<view class="item">
@@ -228,7 +228,7 @@ export default {
 				val = val.toString();
 				let index = val.indexOf('.');
 				if (index !== -1) {
-					val = val.substring(0, 4 + index + 1);
+					val = val.substring(0, 8 + index + 1);
 				} else {
 					val = val.substring(0);
 				}
@@ -269,7 +269,7 @@ export default {
 			}).then(({ data }) => {
 				obj.list = data;
 				uni.hideLoading();
-				console.log(obj.list);
+				console.log(obj.list,'222');
 			});
 		},
 		//切换币种

pages/user/user.vue

@@ -101,7 +101,7 @@
 				<view class="popup-dox">
 					<image class="popup-logo" src="../../static/img/img48.png"></image>
 					<!-- <view class="pop-title">已为您定制专属客服</view> -->
-					<image class="popup-text" src="../../static/img/img50.png"></image>
+					<image class="popup-text" src="../../static/img/img50.jpg"></image>
 					<view class="pop-tip">微信咨询客服</view>
 				</view>
 			</view>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/13519e00-af3c-11ec-b97f-61a09b66939a
+https://ide.dcloud.net.cn/build/download/2f6c3490-b339-11ec-9c8b-61c638508295