From 1a36c8ac09c29c62c41edc24cb215b0c1fc3ba4b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 31 Jul 2021 17:54:42 +0800
Subject: [PATCH] 逻辑完善
---
pages/report/initiate.vue | 4 ++--
pages/dispatch/look.vue | 24 ++++++++++++------------
pages/report/receive.vue | 2 +-
pages/securityStaff/exhibition.vue | 2 +-
pages/message/message.vue | 4 ++--
pages/report/send.vue | 1 +
pages/company/company.vue | 2 +-
pages/dispatch/imgissue.vue | 1 -
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/pages/company/company.vue b/pages/company/company.vue
index 58a6a3d..fd36713 100644
--- a/pages/company/company.vue
+++ b/pages/company/company.vue
@@ -112,7 +112,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
diff --git a/pages/dispatch/imgissue.vue b/pages/dispatch/imgissue.vue
index 531bd69..ddd8e04 100644
--- a/pages/dispatch/imgissue.vue
+++ b/pages/dispatch/imgissue.vue
@@ -68,7 +68,6 @@
};
},
onLoad() {
- console.log(this.$store.state)
},
onReachBottom() {
diff --git a/pages/dispatch/look.vue b/pages/dispatch/look.vue
index ce2ef1c..ff3d45d 100644
--- a/pages/dispatch/look.vue
+++ b/pages/dispatch/look.vue
@@ -144,7 +144,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
@@ -159,7 +159,7 @@
url: this.$store.state.piAPI + "/directive/page?sendDirectiveId=" + this.$store.state.puserID,
method: "get",
data: {
-
+
},
success: (res) => {
var resdata = res.data.data.records;
@@ -167,28 +167,28 @@
that.newsList = [];
that.flag = true;
that.dataList = resdata;
-
+
var flag = true;
-
+
for (var i = 0; i < 5; i++) {
-
+
if (that.pagelist <= that.dataList.length - 2) {
-
+
that.newsList.push(that.dataList[that.pagelist++]);
-
+
} else {
-
+
if (that.dataList.length - 1 == that.pagelist && flag == true) {
-
+
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
-
+
}
}
-
+
}
});
},
diff --git a/pages/message/message.vue b/pages/message/message.vue
index db21a95..df0a518 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -143,7 +143,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
@@ -182,7 +182,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
diff --git a/pages/report/initiate.vue b/pages/report/initiate.vue
index a6824a4..12da868 100644
--- a/pages/report/initiate.vue
+++ b/pages/report/initiate.vue
@@ -82,10 +82,10 @@
form: {
content: '',
category: '',
- type: '',
- recipient: '',
categoryText: '',
+ type: '',
typeText: '',
+ recipient: '',
recipientText: ''
},
rules: {
diff --git a/pages/report/receive.vue b/pages/report/receive.vue
index 434db85..be976ce 100644
--- a/pages/report/receive.vue
+++ b/pages/report/receive.vue
@@ -110,7 +110,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
diff --git a/pages/report/send.vue b/pages/report/send.vue
index fbdf085..a1fd42d 100644
--- a/pages/report/send.vue
+++ b/pages/report/send.vue
@@ -113,6 +113,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
+ this.status = 'nomore';
that.flag = false;
}
diff --git a/pages/securityStaff/exhibition.vue b/pages/securityStaff/exhibition.vue
index 00ae2cd..b7edf33 100644
--- a/pages/securityStaff/exhibition.vue
+++ b/pages/securityStaff/exhibition.vue
@@ -112,7 +112,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
--
Gitblit v1.9.3