From 56789c985c7cd77f74a13d450758debebd2bfd85 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 12 九月 2023 18:20:38 +0800
Subject: [PATCH] 小程序
---
/dev/null | 0
minipro_standard/pages/plannedDistribution/plannedDistribution.vue | 4 +---
minipro_standard/manifest.json | 4 ++--
minipro_standard/pages/plannedProgress/plannedProgress.vue | 12 ++++++++----
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/minipro_standard/components/static/yty-data-picker/yty-data-picker.png b/minipro_standard/components/static/yty-data-picker/yty-data-picker.png
deleted file mode 100644
index d9b72d2..0000000
--- a/minipro_standard/components/static/yty-data-picker/yty-data-picker.png
+++ /dev/null
Binary files differ
diff --git a/minipro_standard/manifest.json b/minipro_standard/manifest.json
index a26c2ed..dd3dade 100644
--- a/minipro_standard/manifest.json
+++ b/minipro_standard/manifest.json
@@ -56,8 +56,8 @@
"es6" : true,
"postcss" : true,
"minified" : true,
- "ignoreDevUnusedFiles": false,
- "ignoreUploadUnusedFiles": false
+ "ignoreDevUnusedFiles": false,
+ "ignoreUploadUnusedFiles": false
},
"usingComponents" : true,
"requiredPrivateInfos" : [ "getLocation" ],
diff --git a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
index 0ce96ac..2f3dbb6 100644
--- a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
+++ b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
@@ -119,9 +119,7 @@
// 鐐瑰嚮褰撳墠椤�
clickItem(i) {
this.list.forEach((item, index) => {
- if (i === index) {
- item.isActive = !item.isActive
- }
+ item.isActive = i === index
})
},
// 鎼滅储
diff --git a/minipro_standard/pages/plannedProgress/plannedProgress.vue b/minipro_standard/pages/plannedProgress/plannedProgress.vue
index 5eb0919..4db1f02 100644
--- a/minipro_standard/pages/plannedProgress/plannedProgress.vue
+++ b/minipro_standard/pages/plannedProgress/plannedProgress.vue
@@ -195,9 +195,11 @@
async onRefresh() {
if (this.isLoading) return;
this.isLoading = true;
- await this.getLists()
- await this.pageCounts()
- this.isLoading = false;
+ this.finished = false;
+ this.loading = false;
+ this.refreshing = false;
+ this.getLists();
+ // await this.pageCounts()
},
// 閲嶇疆
reset() {
@@ -263,7 +265,7 @@
procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
startDate: this.listData.startDate,
endDate: this.listData.endDate,
- statusList: this.listData.cateIds
+ // statusList: this.listData.cateIds
}).then(res => {
if (res.code === 200 && res.data) {
this.tagList[0].num = res.data.allNum.toString()
@@ -347,6 +349,7 @@
]
}).then(res => {
this.loading = false
+ this.isLoading = false;
this.listData.total = res.data.total
if (this.refreshing) {
this.lists = []
@@ -364,6 +367,7 @@
}).catch(err => {
this.loading = false
this.finished = true
+ this.isLoading = false;
if (this.refreshing) {
this.lists = []
this.refreshing = false;
--
Gitblit v1.9.3