7-27

pages/calculation/myCalculation.vue

@@ -14,7 +14,7 @@
 				<view class="item-val blue">{{ls.machine.first_step_time + ls.machine.second_step_time }}天 + {{ ls.machine.third_step_time}}天</view>
 			</view>
 			<view class="item">
-				<view class="item-name">购买容量</view>
+				<view class="item-name">算力</view>
 				<view class="item-val blue">{{+ls.num}} {{ls.get_money_type==='BZZ'?'节点':'T'}}</view>
 			</view>
 			<view class="item">

unpackage/cache/apk/apkurl

@@ -1 +1,5 @@
-https://service.dcloud.net.cn/build/download/622464b0-eddf-11eb-8cc1-79c7ddc2e8f0
+<<<<<<< HEAD
+https://service.dcloud.net.cn/build/download/622464b0-eddf-11eb-8cc1-79c7ddc2e8f0
+=======
+https://service.dcloud.net.cn/build/download/b7bb6e00-e88b-11eb-83dc-b9d3ba6cbb7f
+>>>>>>> ec3f134a764c558d4629a21030a44ce02463619c