Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

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 {

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 = '，') {