倒计时

App.vue

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

manifest.json

@@ -4,8 +4,8 @@
     // __UNI__6FC8B70
     // "appid" : "__UNI__6FC8B70",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -29,13 +29,10 @@
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },

pages/calculation/myCalculation.vue

@@ -11,8 +11,8 @@
 			<view class="cell-tip">{{ls.machine.first_step_time + ls.machine.second_step_time + ls.machine.third_step_time}}天矿机</view>
 			<view class="flex cell-tpl">
 				<view class="tpl">
-					<view class="">单价</view>
-					<view class="">{{ls.machine.cost_money}}</view>
+					<view class="">单价（T）</view>
+					<view class="">{{ls.machine.cost_money * 1}} {{ls.machine.cost_money_type}}</view>
 				</view>
 				<view class="tpl">
 					<view class="">有效算力</view>
@@ -29,8 +29,15 @@
 			<view class="cell-info flex">
 				<view class="tip">购买时间：{{ls._pay_time}}</view>
 			</view>
-			<view class="cell-info flex">
-				<view class="tip">倒计时：</view>
+			<view class="cell-info flex" v-if="ls.status == 0">
+				<view class="tip">倒计时：<uni-countdown
+								color="#FFF"
+								background-color="#BAC1EF"
+								:day="ls.stopTimeD"
+								:hour="ls.stopTimeH"
+								:minute="ls.stopTimeM"
+								:second="ls.stopTimeS"
+							></uni-countdown></view>
 			</view>
 			<!-- <view class="cell-info flex">
 				<view class="tip">正式挖矿时间：{{ls.mining_start_time}}</view>
@@ -45,9 +52,11 @@
 <script>
 import { mymining } from '@/api/calculation.js';
 import empty from '@/components/empty';
+import { timeComputed } from '@/utils/rocessor.js';
+import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
 export default {
 	components: {
-		empty
+		empty,uniCountdown
 	},
 	data() {
 		return {
@@ -71,10 +80,42 @@ export default {
 				page:1,
 				limit:1000,
 			}).then(({ data }) => {
-				console.log(data);
-			    obj.list = data.data;
+				console.log(data,"基础数据")
+				obj.list = data.data;
+				obj.list = data.data.map((e,ind) => {
+					let ar = e;
+					console.log(e,"饿");
+					// 判断是否为进行中的活动
+					if (ar.status === 0) {
+						// 计算倒计时时间
+						obj.timeComputed(ar.mining_start_time * 1000, ar);
+					} else {
+						// 获取距离开始还需要多少时间
+						let arTime = ar.time.split(':');
+						let h = arTime[0];
+						let m = arTime[1];
+						let time = new Date();
+						// 设置时间
+						time.setHours(h, m, 0);
+						// 计算倒计时时间
+						obj.timeComputed(time.getTime(), ar);
+					}
+					
+					return e;
+				})
 			});
 		},
+		// 计算倒计时时间
+		timeComputed(da, ar) {
+			let obj = this;
+			// 计算时间，保存需要多少时间到期
+			let stopTime = timeComputed(da);
+			console.log(stopTime);
+			ar.stopTimeD = stopTime.day;
+			ar.stopTimeH = stopTime.hours;
+			ar.stopTimeM = stopTime.minutes;
+			ar.stopTimeS = stopTime.seconds;
+		}
 	}
 };
 </script>

unpackage/cache/wgt/__UNI__366DA7E/__uniappview.html → unpackage/cache/wgt/__UNI__36C0ACD/__uniappview.html

@@ -1,25 +1,25 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>