7-6

pages/calculation/details.vue

@@ -39,8 +39,8 @@
 					</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-if="list.get_money_type == 'BZZ'">{{+list.step}}节点</view>
+						<view class="item-val" v-else>{{ +list.step}}TB</view>
 					</view>
 					<view class="list-item">
 						<view class="item-title">管理费</view>
@@ -50,14 +50,18 @@
 						<view class="item-title">上架期</view>
 						<view class="item-val">{{ list.stand_time }}天</view>
 					</view>
-					<!-- <view class="list-item">
+					<view class="list-item">
 						<view class="item-title">宽带费</view>
-						<view class="item-val">{{ list.stand_time }}元/月</view>
+						<view class="item-val">{{ list.broadband || 0 }}元/月</view>
 					</view>
 					<view class="list-item">
 						<view class="item-title">IP地址费</view>
-						<view class="item-val">{{ list.stand_time }}元/月</view>
-					</view> -->
+						<view class="item-val">{{ list.ip_address || 0 }}元/月</view>
+					</view>
+					<view class="list-item">
+						<view class="item-title">质押币</view>
+						<view class="item-val">{{ list.pledge || 0 }}个</view>
+					</view>
 			</view>
 		</view>
 		<view class="list">

unpackage/cache/apk/apkurl

@@ -1 +1,5 @@
-https://service.dcloud.net.cn/build/download/96c84010-e0a8-11eb-831c-a5ed677c0e9c
+<<<<<<< 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

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=C:/Users/Administrator/Desktop/com.liuniu.keystore
+andrCertfile=C:/Users/coderLHL/Desktop/com.liuniu.keystore
 andrCertAlias=com.liuniu.inc
 andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==