|
|
@@ -47,7 +47,7 @@
|
|
|
{{item.updateTime}}{{item.remark?':'+item.remark:''}}
|
|
|
</view>
|
|
|
<view class="chargeTime" v-if="item.status==1">
|
|
|
- <p>剩余时长<span>(时分)</span></p>
|
|
|
+ <p>剩余时长<span>({{getPercent(item).time}})</span></p>
|
|
|
<u-line-progress active-color="#ececec" height="48" :percent="getPercent(item).percent">
|
|
|
<div style="
|
|
|
border-radius: 100px;
|
|
|
@@ -214,8 +214,9 @@
|
|
|
if (ms > 0) {
|
|
|
var Hour = parseInt(Math.floor(ms / (60 * 60)));
|
|
|
var Fen = parseInt(Math.floor(ms % (60 * 60) / 60));
|
|
|
-
|
|
|
- obj.value = (Hour > 9 ? "" : "0") + Hour + ":" + (Fen > 9 ? "" : "0") + Fen
|
|
|
+ var miao =ms%60 ;
|
|
|
+ obj.value = "充电中"
|
|
|
+ obj.time = (Hour > 9 ? "" : "0") + Hour + ":" + (Fen > 9 ? "" : "0") + Fen+":"+miao
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -229,13 +230,13 @@
|
|
|
obj.percent = "50";
|
|
|
}
|
|
|
//特殊情况默认值
|
|
|
- if (!obj.value) {
|
|
|
- obj.value = "00:00"
|
|
|
+ if (!obj.time) {
|
|
|
+ obj.time = "00:00:00"
|
|
|
}
|
|
|
if (!obj.percent) {
|
|
|
obj.percent = "100";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return obj;
|
|
|
},
|
|
|
showTips(item) {
|
zhengkaixin