diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index 1ca9e37..64f8d3d 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -52,6 +52,7 @@
width:1rpx;
.name{
display: flex;
+ align-items: center;
justify-content: space-between;
margin-bottom:15rpx;
text{
@@ -59,19 +60,26 @@
font-weight: bold;
flex-grow: 1;
}
- &:nth-child(2){
+ &.total{
flex-shrink: 0;
- font-weight: bold;
- font-size:32rpx;
+ color:#10C176;
+ font-size:24rpx;
+ margin-right:20rpx;
+ &:after{
+ content:'kg';
+ }
+ }
+ &.surplus{
+ flex-shrink: 0;
+ font-size:24rpx;
+ color:#FFC760;
&:before{
content:"剩余:";
font-weight: normal;
- font-size:24rpx;
}
&:after{
- content:attr(data-unit);
+ content:'kg';
font-weight: normal;
- font-size:24rpx;
}
}
}
@@ -120,7 +128,8 @@
{{v.plantName}}
- {{v.harvestNum}}
+ 200
+ {{v.harvestNum}}
负责人:{{v.principal}}
采收日期:{{v.harvestTime}}
diff --git a/pages/massif/pestType.vue b/pages/massif/pestType.vue
index e5393c7..9e38bad 100644
--- a/pages/massif/pestType.vue
+++ b/pages/massif/pestType.vue
@@ -103,7 +103,7 @@
{{v}}
-
+
@@ -139,7 +139,7 @@ export default {
params:{code:"B09"}
})
if(res.statu){
- this.cropList=res.data.map(v=>({...v,children:v.children.length>0?v.children:[{label:"全部",value:'all'}]}))
+ this.cropList=res.data.map(v=>({...v,children:v?.children?.length>0?v.children:[{label:"全部",value:'all'}]}))
this.agrSearch(res.data[0]?.children?.[0]?.value||"")
}else{
uni.showModal({