From 95e05f40d4467693aa0f0d99797b530ce18039e2 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 19 Jan 2022 19:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sass/AppMeetingNotice/addMeeting.vue |  9 +++------
 src/sass/AppNotification/add.vue         | 12 ++++--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/sass/AppMeetingNotice/addMeeting.vue b/src/sass/AppMeetingNotice/addMeeting.vue
index ddafbb3e..5f56af19 100644
--- a/src/sass/AppMeetingNotice/addMeeting.vue
+++ b/src/sass/AppMeetingNotice/addMeeting.vue
@@ -164,24 +164,21 @@ export default {
   methods: {
     ...mapActions(['selectPrivilegedContact']),
     handleSelectUser() {
-      if (this.clickedUserSelect) return this.$u.toast("正在打开人员选择器")
-      this.clickedUserSelect = true
+      this.$loading()
       this.selectPrivilegedContact({
         fromDepartmentId: 0,
         selectedTickets: this.form.ticket ? [this.form.ticket] : [],
         selectedOpenUserIds: this.form.attendees?.map(e => e.id)
       }).then(res => {
+        uni.hideLoading()
         this.form.attendees = res.userList?.map(e => ({id: e.openUserId})) || []
         this.form.ticket = res.selectedTicket || ""
         this.form.selectCount = res.selectedUserCount
         this.clickedUserSelect = false
       }).catch(() => {
+        uni.hideLoading()
         this.clickedUserSelect = false
       })
-
-      setTimeout(() => {
-        this.clickedUserSelect = false
-      }, 2000)
     },
     fileList(e) {
       this.form.files = e
diff --git a/src/sass/AppNotification/add.vue b/src/sass/AppNotification/add.vue
index 330c15a6..70f9909a 100644
--- a/src/sass/AppNotification/add.vue
+++ b/src/sass/AppNotification/add.vue
@@ -110,8 +110,9 @@ export default {
   methods: {
     ...mapActions(['selectPrivilegedContact', 'wxInvoke']),
     handleSelectUser() {
-      if (this.clickedUserSelect) return this.$u.toast("正在打开人员选择器")
-      this.clickedUserSelect = true
+      // if (this.clickedUserSelect) return this.$u.toast("正在打开人员选择器")
+      // this.clickedUserSelect = true
+      this.$loading()
       this.selectPrivilegedContact({
         fromDepartmentId: 0,
         selectedTickets: this.form.ticket ? [this.form.ticket] : [],
@@ -123,13 +124,8 @@ export default {
         this.form.ticket = res.selectedTicket
         this.form.selectCount = res.selectedUserCount
       }).catch(e => {
-        console.log(e)
-        this.clickedUserSelect = false
+        uni.hideLoading()
       })
-
-      setTimeout(() => {
-        this.clickedUserSelect = false
-      }, 2000)
     },
     confirm(e) {
       if (e.timestamp < (Date.now() / 1000) || 0) {