diff --git a/common/style/layout.styl b/common/style/layout.styl
index 8e7c877..c7f3f2f 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -501,25 +501,63 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
justify-content: flex-start;
}
.point-item {
+ position: relative;
width: 32.5%;
font-size: 28rpx;
line-height: 28rpx;
- height: 84rpx;
- padding: 14rpx 4rpx;
+ height: 96rpx;
+ padding: 20rpx 4rpx;
color: #303133;
text-align: center;
background: #fff;
border: 2rpx solid #DCDFE6;
border-radius: 10rpx;
- overflow: hidden;
+}
+.point-item.cgreen {
+ background: #67C23A;
+ border-color: #67C23A;
+ color: #fff;
+}
+.point-item.cyellow {
+ background: #E6A23C;
+ border-color: #E6A23C;
+ color: #fff;
+}
+.item-checked-wrap {
+
+}
+.item-checked {
+ position: absolute;
+ right: -6px;
+ top: -8px;
+}
+.point-item.checked {
+ background: #ff6a00;
+ border-color: #ff6a00;
+ color: #fff;
}
.point-item:nth-child(3n+2) {
margin-left: 1.25%
margin-right: 1.25%
}
.point-item:nth-child(n+4) {
- margin-top: 16rpx
+ margin-top: 20rpx
}
-.point-item.checked {
- background: #DCDFE6;
+.point-item_n5 {
+ width: 19%;
+ height: 142rpx;
+}
+.point-item_n5:nth-child(5n+1), .point-item_n5:nth-child(5n+2), .point-item_n5:nth-child(5n+3), .point-item_n5:nth-child(5n+4) {
+ margin-left: 0;
+ margin-right: 1.25%
+}
+.point-item_n5:nth-child(5n+5) {
+ margin-left: 0;
+ margin-right: 0
+}
+.point-item_n5:nth-child(4), .point-item_n5:nth-child(5) {
+ margin-top: 0
+}
+.point-item_n5:nth-child(n+6) {
+ margin-top: 20rpx
}
\ No newline at end of file
diff --git a/pages/manage/area-lock.vue b/pages/manage/area-lock.vue
index 60126bf..10b45b9 100644
--- a/pages/manage/area-lock.vue
+++ b/pages/manage/area-lock.vue
@@ -32,7 +32,10 @@
-->
- {{e.point_name}}
+
+ {{e.point_name}}
+
+
@@ -51,8 +54,8 @@