diff --git a/components/newArchives/breeding.vue b/components/newArchives/breeding.vue
index 1eae1ed..7345791 100644
--- a/components/newArchives/breeding.vue
+++ b/components/newArchives/breeding.vue
@@ -48,11 +48,11 @@
-
-
+
+
-
-
+
+
@@ -67,10 +67,10 @@
-
-
+
+
-
+
@@ -202,7 +202,9 @@
this.formData = this.$props.datas;
let keys = Object.keys(this.formData);
keys.forEach(item => {
- if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+ if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+ parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+ }
})
}
},
@@ -212,7 +214,9 @@
this.formData = this.$props.datas;
let keys = Object.keys(this.formData);
keys.forEach(item => {
- if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+ if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+ parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+ }
})
}
}
diff --git a/components/newArchives/plant.vue b/components/newArchives/plant.vue
index 9810db6..068c0e9 100644
--- a/components/newArchives/plant.vue
+++ b/components/newArchives/plant.vue
@@ -12,8 +12,8 @@
-
-
+
+
@@ -45,8 +45,8 @@
-
-
+
+
@@ -62,11 +62,11 @@
-
-
+
+
-
-
+
+
@@ -81,11 +81,11 @@
-
-
+
+
-
-
+
+
@@ -217,7 +217,9 @@
this.formData = this.$props.datas;
let keys = Object.keys(this.formData);
keys.forEach(item => {
- if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+ if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+ parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+ }
})
}
},
@@ -227,7 +229,9 @@
this.formData = this.$props.datas;
let keys = Object.keys(this.formData);
keys.forEach(item => {
- if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+ if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+ parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+ }
})
}
}
diff --git a/components/newArchives/residents.vue b/components/newArchives/residents.vue
index de8e50f..5f656e3 100644
--- a/components/newArchives/residents.vue
+++ b/components/newArchives/residents.vue
@@ -10,13 +10,13 @@
-
+
-
+
@@ -39,7 +39,7 @@
-
+
diff --git a/components/newArchives/store.vue b/components/newArchives/store.vue
index f220605..3616408 100644
--- a/components/newArchives/store.vue
+++ b/components/newArchives/store.vue
@@ -21,8 +21,8 @@
-
-
+
+
@@ -141,9 +141,10 @@
this.formData = this.$props.datas;
let keys = Object.keys(this.formData);
keys.forEach(item => {
- if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+ if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+ parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+ }
})
- // console.log(this.formData);
}
},
watch: {
@@ -152,7 +153,9 @@
this.formData = this.$props.datas;
let keys = Object.keys(this.formData);
keys.forEach(item => {
- if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+ if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+ parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+ }
})
}
}
diff --git a/router/router.js b/router/router.js
index 96a2cec..3f0338a 100644
--- a/router/router.js
+++ b/router/router.js
@@ -22,6 +22,20 @@ const initRouter = () => {
functionList.forEach(item => {
uni.addInterceptor(item, {
invoke(args) {
+ uni.getSystemInfo({
+ success: function(res) {
+ console.log('系统信息', res)
+ // 获取内存相关指标
+ var totalMem = res.totalMem // 总内存大小（单位：MB）
+ var usedMem = res.usedMem // 已使用内存大小（单位：MB）
+ var availableMem = res.availableMem // 可用内存大小（单位：MB）
+
+ // 输出结果
+ console.log('总内存大小（MB）:', totalMem)
+ console.log('已使用内存大小（MB）:', usedMem)
+ console.log('可用内存大小（MB）:', availableMem)
+ }
+ })
if (!hasPermission(args.url)) {
Toast('登录后查看更多')
return false;
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 4a36b2f..30a506d 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -244,9 +244,7 @@
} else {
this.loadConfig.page++;
}
- console.log(this.list);
this.list = [...this.list, ...res.data];
- console.log(this.list);
},
changeCurrent(e) {
this.current = e.index;
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index 35eafe2..1f5cfd4 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -193,7 +193,7 @@
年龄 :
- {{item.age+'岁'}}
+ {{item.age + '岁'}}
年级 :
@@ -222,7 +222,7 @@
年龄 :
- {{item.age}}
+ {{item.age + '岁'}}
@@ -487,6 +487,10 @@
.check_view_group {
display: flex;
+ margin-top: 4rpx;
+ &:last-child{
+ margin-top: 0;
+ }
// line-height: 70rpx;
.radio{
margin-left: 16rpx;
@@ -494,8 +498,7 @@
margin-bottom: 0 !important;
}
}
-
-
+
// align-items: center;
}
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
index 0e774e6..b6b0306 100644
--- a/subpkg/blockTransaction/blockTransaction.vue
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -127,6 +127,7 @@
}
Object.keys(this.card).forEach((key)=>{
if(res.data?.arr[key]!=null&&res.data?.arr[key]!=undefined)this.card[key] = res.data.arr[key];
+ // if(res.data?.extend?.transaction?.arr[key]!=null&&res.data?.extend?.transaction?.arr[key]!=undefined)this.card[key] = res.data?.extend?.transaction?.arr[key];
})
this.list = [...this.list, ...res.data?.list]
} catch (e) {
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index 3c294f5..d4e0c3e 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -28,12 +28,12 @@
@click="navTo(`/subpkg/archives/archives?id=${item.id}&task_id=${task_id}`)">
最后更新: {{item.informationg_update_time.split(' ')[0]}}
- {{'管理户数: '+item.informationg_count+" 户"}}{{'管理户数: '+item.informationg_count+" 户"}}
- {{'更新户数: '+item.informationg_update_count+" 户"}}
+ {{'更新户数: '+item.informationg_update_count+" 户"}}
+ name="arrow-right">
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 573361c..9673299 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -9,8 +9,6 @@
-
-