From 8470d9ffb49013c553770e1520a30026096de0e2 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 13 Mar 2019 15:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1001078=E3=80=91C=E7=AB=AF=E9=99=90?=
=?UTF-8?q?=E6=97=B6=E6=8A=A2=E8=B4=AD=E5=92=8C=E7=A0=8D=E4=BB=B7=E8=BF=9B?=
=?UTF-8?q?=E8=A1=8C=E6=95=B4=E6=94=B9=E6=97=B6=E9=97=B4=EF=BC=8C=E7=9B=AE?=
=?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E4=B8=8D=E7=AC=A6=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/rushToBuy/index.wxml | 2 +-
project.config.json | 4 ++--
utils/util.js | 9 ++++++++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml
index 854bcb0..a803f89 100644
--- a/pages/rushToBuy/index.wxml
+++ b/pages/rushToBuy/index.wxml
@@ -34,7 +34,7 @@
马上购
立即领
已售罄
- 未开始
+ 即将开始
已结束
diff --git a/project.config.json b/project.config.json
index fe279fd..1ec26d3 100644
--- a/project.config.json
+++ b/project.config.json
@@ -9,10 +9,10 @@
"postcss": true,
"minified": true,
"newFeature": true,
- "autoAudits": false
+ "autoAudits": true
},
"compileType": "miniprogram",
- "libVersion": "2.0.9",
+ "libVersion": "2.2.0",
"appid": "wxb11603577a84a86d",
"projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"isGameTourist": false,
diff --git a/utils/util.js b/utils/util.js
index 9e1caf4..6772948 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -92,7 +92,14 @@ function timechuo(startTime) {
var minute = Math.floor(runTime / 60);
var runTime = runTime % 60;
var second = runTime;
- return (hour+"小时"+minute+"分钟")
+ if (day && !year && !month){
+ return (day + '天' + hour + "小时" + minute + "分钟")
+ } else if (month && !year){
+ return (month+'月'+day + '天' + hour + "小时" + minute + "分钟")
+ } else if (year) {
+ return (year + '年' + month+'个月'+ day + '天' + hour + "小时" + minute + "分钟")
+ }
+
}