diff --git a/src/views/nobleman/GoldWater.vue b/src/views/nobleman/GoldWater.vue
index 3f7b284..29ae753 100644
--- a/src/views/nobleman/GoldWater.vue
+++ b/src/views/nobleman/GoldWater.vue
@@ -21,7 +21,6 @@
           type="date"
           placeholder="结束时间"
           format="YYYY-MM-DD 23:59:59"
-          value-format="YYYY-MM-DD 23:59:59"
         >
         </el-date-picker>
       </div>
@@ -205,11 +204,24 @@ export default {
     getData() {
       this.loading = true;
       let time = this.inquire.time;
-      let startTime = "";
-      let endTime = "";
-      if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      let startTime = null;
+      let endTime = null;
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd 59:59:59")
+          : null;
+      }
+      if (!startTime || !endTime) {
+        ElMessage({
+          showClose: true,
+          message: "请输入开始时间和结束时间",
+          type: "error",
+        });
+        this.loading = false;
+        return;
       }
       incomePageFamily({
         erbanNo: this.inquire.id,
@@ -220,8 +232,17 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
       }).then((res) => {
-        this.total = res.data.total;
-        this.tableData = res.data.rows;
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
         this.loading = false;
       });
     },