From fd047a7b46b38a2e02a6ece07642a0229918b44e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 7 Jun 2022 17:59:18 +0800
Subject: [PATCH 1/2] bug

---
 src/main.js                                      | 2 +-
 src/project/beta/AppBroadcast1/LiveBroadcast.vue | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index e6914f4a..9a5bf0ba 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,7 +30,7 @@ Object.keys(utils).map((e) => (Vue.prototype['$' + e] = utils[e]));
 utils.dict.init({instance: axios})
 utils.action.init(axios)
 App.mpType = 'app';
-process.env.NODE_ENV == 'development' && new VConsole();
+// process.env.NODE_ENV == 'development' && new VConsole();
 const app = new Vue({
   store,
   ...App
diff --git a/src/project/beta/AppBroadcast1/LiveBroadcast.vue b/src/project/beta/AppBroadcast1/LiveBroadcast.vue
index b9705548..032c529f 100644
--- a/src/project/beta/AppBroadcast1/LiveBroadcast.vue
+++ b/src/project/beta/AppBroadcast1/LiveBroadcast.vue
@@ -10,7 +10,7 @@
         <p>请先选择设备再按住下方按钮开始喊话~</p>
       </div>
     </div>
-    <div class="bottom" @longtap="onLongtap">
+    <div class="bottom" @touchstart="onLongtap">
       <image src="./img/microphone.png" />
       <p>按住说话</p>
     </div>
@@ -78,6 +78,7 @@
 
     methods: {
       onLongtap () {
+        this.isImpact = false
         this.startTime = new Date().getTime()
         this.isShow = true
       },
@@ -122,6 +123,7 @@
   .LiveBroadcast {
     height: 100vh;
     overflow: hidden;
+    user-select: none;
     background: #F6F8FC;
 
     .voice {
@@ -140,7 +142,7 @@
       transition: all ease 0.5s;
 
       &.active {
-        z-index: 1;
+        z-index: 1111111111111;
         opacity: 1;
       }
 
@@ -279,6 +281,7 @@
         width: 128px;
         height: 128px;
         margin-bottom: 16px;
+        pointer-events: none;
       }
 
       p {

From fc47eca88a3d16fe907fce48e2446326175f680d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 7 Jun 2022 17:59:35 +0800
Subject: [PATCH 2/2] BUG 29782

---
 src/project/beta/AppGridManagement/AddGird.vue | 3 ++-
 src/saas/AppGridManagement/AddGird.vue         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/project/beta/AppGridManagement/AddGird.vue b/src/project/beta/AppGridManagement/AddGird.vue
index f9976143..4d88f200 100644
--- a/src/project/beta/AppGridManagement/AddGird.vue
+++ b/src/project/beta/AppGridManagement/AddGird.vue
@@ -86,6 +86,7 @@ export default {
           name: item.name
         }
       })
+      uni.showLoading({mask: true})
       this.$http.post(`/app/appgirdinfo/addOrUpdateByEw`, {...this.form, girdMemberManageList, girdMemberList}).then((res) => {
         if (res?.code == 0) {
           this.$u.toast('提交成功')
@@ -96,7 +97,7 @@ export default {
         }
       }).catch((err) => {
         this.$u.toast(err)
-      })
+      }).finally(() => uni.hideLoading())
 
     },
     getArrayLabel(arr, key = 'name', separation = '，') {
diff --git a/src/saas/AppGridManagement/AddGird.vue b/src/saas/AppGridManagement/AddGird.vue
index 6874e3e0..3ee07f7c 100644
--- a/src/saas/AppGridManagement/AddGird.vue
+++ b/src/saas/AppGridManagement/AddGird.vue
@@ -115,6 +115,7 @@ export default {
       if (!this.form.girdName) {
         return this.$u.toast('请输入网格名称')
       }
+      uni.showLoading({mask: true})
       this.$http.post(`/app/appgirdinfo/addOrUpdateByEw`, {...this.form}).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
@@ -125,7 +126,7 @@ export default {
         }
       }).catch((err) => {
         this.$u.toast(err)
-      })
+      }).finally(() => uni.hideLoading())
 
     }
   }