diff --git a/pages/station/item1.vue b/pages/station/item1.vue index 1f2b36b..61757d4 100644 --- a/pages/station/item1.vue +++ b/pages/station/item1.vue @@ -86,7 +86,9 @@
-
+
@@ -610,7 +612,7 @@ .item { //width: 100%; //height: 100%; - &.z1 { + &.z1 { color: #00d40e; } &.z2 { @@ -630,7 +632,7 @@ padding: 2upx; justify-content: space-around; &.eight-item { - width: 184upx; + width: 300upx; } .img-it { width: 70upx; diff --git a/pages/station/item2.vue b/pages/station/item2.vue index 29e8bde..46cc87d 100644 --- a/pages/station/item2.vue +++ b/pages/station/item2.vue @@ -66,6 +66,7 @@ 时间:{{ timer }} + {{ !infoData.powerLimitTime ? '未限制功率' : `限制功率: ${infoData.powerLimit.p}%` }}
@@ -451,6 +452,7 @@ } }) _data._name = _data.equipmentName.split(' ')[1] + _data.powerLimit = JSON.parse( _data.powerLimit) this.infoData = Object.assign({_itemList }, _data) }) }, @@ -671,10 +673,19 @@ } .content { + position: relative; padding: 20upx; .timer { margin-bottom: 20upx; } + .limit-timer { + position: absolute; + right: 20upx; + top: 20upx; + &.limit { + color: #fc6; + } + } background: #000; color: #f5f5f5; } diff --git a/pages/station/list.vue b/pages/station/list.vue index 2139551..7c2277d 100644 --- a/pages/station/list.vue +++ b/pages/station/list.vue @@ -269,6 +269,9 @@ // max-height: 90vh; // overflow-y: scroll; } +/deep/ .uni-card { + padding: 0 !important; +} .station-info { // margin-top: 20px; display: flex; @@ -297,7 +300,7 @@ } .right { color: #4aaf0b; - letter-spacing: 2upx; + // letter-spacing: 2upx; } }