diff --git a/package.json b/package.json index e207eec..649e546 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,8 @@ "dayjs": "^1.11.9", "element-plus": "^2.7.6", "mqtt": "4.1.0", - "pinia": "2.0.17", + "pinia": "2.0.28", + "pinia-plugin-persistedstate": "^3.1.0", "tslib": "^2.6.2", "uview-plus": "^3.1.45", "vue": "3.4.23", diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue index 156e7b0..76bcfa3 100644 --- a/src/page_report/reportForm.vue +++ b/src/page_report/reportForm.vue @@ -221,6 +221,7 @@ export default { update(this.customFormData).then(response => { modal.msgSuccess("修改成功") tab.navigateBack() + uni.$emit('handleSuccess', true) }) }else { this.customFormData.id = null diff --git a/src/pages/index.vue b/src/pages/index.vue index 3fe6a50..47d0f34 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -340,7 +340,7 @@ function planProgress(plan){ background-color: #f1f1f1; padding: 0 20rpx 20rpx 20rpx; .content { - margin: 20rpx 0; + margin: 0 0 20rpx 0; padding: 20rpx; background-color: #ffffff; border-radius: 10rpx; diff --git a/src/pages/report.vue b/src/pages/report.vue index 5ea7983..cf9929a 100644 --- a/src/pages/report.vue +++ b/src/pages/report.vue @@ -44,10 +44,10 @@ - - - - + + + + @@ -84,10 +84,10 @@ - - - - + + + + @@ -107,7 +107,7 @@ - + @@ -123,11 +123,11 @@ - - - - - + + + + + @@ -139,7 +139,6 @@