From 78247b7e9e5079f7b03f72a73671a87959fd5d45 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 8 Jun 2022 11:17:57 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=96=8A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beta/AppBroadcast1/LiveBroadcast.vue      | 69 +++++++++++++++++--
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/project/beta/AppBroadcast1/LiveBroadcast.vue b/src/project/beta/AppBroadcast1/LiveBroadcast.vue
index 44bd0489..72c8ee14 100644
--- a/src/project/beta/AppBroadcast1/LiveBroadcast.vue
+++ b/src/project/beta/AppBroadcast1/LiveBroadcast.vue
@@ -54,13 +54,16 @@
         <span class="line19 animation"></span>
         <span class="line20 animation"></span>
       </div>
-      <h2>00:00:13</h2>
+      <h2>{{ time }}</h2>
     </div>
   </div>
 </template>
 
 <script>
   import { mapState } from 'vuex'
+  import Recorder from 'recorder-core'
+  import 'recorder-core/src/engine/mp3'
+  import 'recorder-core/src/engine/mp3-engine'
   export default {
     name: 'LiveBroadcast',
 
@@ -77,7 +80,13 @@
         closeW: require('./img/close-w.png'),
         isShow: false,
         isImpact: false,
-        startTime: 0
+        startTime: 0,
+        isRecording: false,
+        recorder: null,
+        blobFile: null,
+        counterDownTime: 0,
+        time: '00:00:00',
+        timingTimeout: null
       }
     },
 
@@ -99,24 +108,76 @@
         this.isImpact = false
         this.startTime = new Date().getTime()
         this.isShow = true
+        this.record()
+      },
+
+      record () {
+        this.duration = 0
+        this.recorder = Recorder({
+          type: 'mp3',
+          sampleRate: 16000,
+          bitRate: 16,
+          onProcess(buffers, powerLevel, bufferDuration, bufferSampleRate, newBufferIdx, asyncEnd) {
+            //可利用extensions/waveview.js扩展实时绘制波形
+          }
+        })
+
+        this.recorder.open(() => {
+          this.recorder.start()
+          this.timing()
+        })
+      },
+
+      timing () {
+        var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
+        var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
+        var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
+        var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
+
+        this.time = hours + ':' + min + ':' + seconds
+        this.counterDownTime++
+        this.timingTimeout = setTimeout(() => {
+          this.timing()
+        }, 1000)
+      },
+
+      stop (isCancel) {
+        this.counterDownTime = 0
+        clearTimeout(this.timingTimeout)
+        this.recorder.stop((blob, duration) => {
+          this.recorder.close()
+          this.recorder = null
+
+          if (!isCancel) {
+            this.blobFile = blob
+          }
+
+          this.time = '00:00:00'
+          console.log(blob, (window.URL || webkitURL).createObjectURL(blob), '时长:' + duration + 'ms')
+        }, msg => {
+          console.log('录音失败:' + msg)
+          this.recorder.close()
+          this.recorder = null
+        })
       },
 
       onTouchend () {
         if (this.isShow && new Date().getTime() - this.startTime < 1500) {
           this.isImpact = false
           this.isShow = false
+          this.stop(true)
           return this.$u.toast('说话时间太短')
         }
 
         if (this.isImpact) {
           this.isShow = false
           this.isImpact = false
-
+          this.stop(true)
           return false
         }
 
         this.isImpact = false
-        this.submit()
+        this.stop()
       },
 
       onTouchmove (e) {

From 04ef27f3f96d292a18ec63ab19e6e73437d7ea57 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 11:35:00 +0800
Subject: [PATCH 2/8] BUG 30090

---
 src/project/beta/AppGridManagement/AddUser.vue    |  1 -
 src/project/beta/AppGridManagement/SelectGird.vue | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/project/beta/AppGridManagement/AddUser.vue b/src/project/beta/AppGridManagement/AddUser.vue
index 52f25e7e..1bad91f6 100644
--- a/src/project/beta/AppGridManagement/AddUser.vue
+++ b/src/project/beta/AppGridManagement/AddUser.vue
@@ -21,7 +21,6 @@
         <span class="tips">*</span>所属网格
       </div>
       <div class="value" @click="linkTo('./SelectGird?formType=2')">
-        
         <span v-if="selectGird.girdName">{{selectGird.girdName}}</span>
         <span style="color:#999;" v-else>请选择</span>
         <img src="./components/img/right-icon.png" alt="" /></div>
diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue
index 06d66eef..2afef034 100644
--- a/src/project/beta/AppGridManagement/SelectGird.vue
+++ b/src/project/beta/AppGridManagement/SelectGird.vue
@@ -53,13 +53,15 @@ export default {
     },
     isGridMember() {
       return this.user.girdCheckType > 0
-    }
+    },
+    //是否是网格员申报
+    isApply: v => v.$route.query.formType == 2
   },
   onLoad(option) {
     if (option.isFormMap) {
       this.isFormMap = option.isFormMap
     }
-    this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长')
+    this.isGridMember || this.isApply ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长')
   },
   methods: {
     getAllGrids() {
@@ -67,6 +69,10 @@ export default {
       let {girdMemberId} = this.user,
           url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
           params = {girdMemberId}
+      if (this.isApply) {
+        url = `/app/appgirdinfo/listByInfo`
+        params = {}
+      }
       if (this.isMyGirds) {
         url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`
         params = {}
@@ -81,7 +87,7 @@ export default {
     },
     treeInit(isClick) {
       let last = uni.getStorageSync("lastSelectedGrid")
-      if (!isClick && last) {
+      if (!isClick && last && !this.isApply) {
         this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, {
           params: {girdId: last}
         }).then(res => {

From 42fbe2fcbb341318507348ab89244b750576bfad Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 11:36:21 +0800
Subject: [PATCH 3/8] BUG 30082

---
 src/project/beta/AppGridManagement/gridMembers.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/project/beta/AppGridManagement/gridMembers.vue b/src/project/beta/AppGridManagement/gridMembers.vue
index f1f07f14..bad74aa6 100644
--- a/src/project/beta/AppGridManagement/gridMembers.vue
+++ b/src/project/beta/AppGridManagement/gridMembers.vue
@@ -2,7 +2,7 @@
   <section class="gridMembers">
     <div class="title">{{ detail.girdName }}</div>
     <div flex v-for="(item, index) in list" :key="index" class="listItem">
-<!--      <img class="avatar" :src="item.photo"/>-->
+      <!--      <img class="avatar" :src="item.photo"/>-->
       <div class="fill">
         <div class="memberName" v-text="item.name"/>
         <div flex>
@@ -12,9 +12,10 @@
       </div>
       <div class="btns">
         <div @click="gotoFamilyList(item)">责任家庭</div>
-<!--        <div @click="handleTag(item)">标签设置</div>-->
+        <!--        <div @click="handleTag(item)">标签设置</div>-->
       </div>
     </div>
+    <AiEmpty v-if="!list.length"/>
     <div class="btn" v-if="detail.girdRight == 1">
       <span class="del" @click="del" v-if="!!detail.parentGirdId">删除网格</span>
       <span class="edit" @click="edit">编辑网格</span>

From 37340e04af6ed02c2f51f0cd6b4d31c0c81f3ad8 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 11:37:33 +0800
Subject: [PATCH 4/8] BUG 30076

---
 src/project/beta/AppGridManagement/SetGird.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/project/beta/AppGridManagement/SetGird.vue b/src/project/beta/AppGridManagement/SetGird.vue
index edc2facf..240bc9fa 100644
--- a/src/project/beta/AppGridManagement/SetGird.vue
+++ b/src/project/beta/AppGridManagement/SetGird.vue
@@ -21,8 +21,8 @@
     </AiGroup>
     <div class="subBtn" v-if="detail.girdRight==1">
       <div @click="toAddGird">添加下级网格</div>
-      <div @click="handleDelete">编辑网格</div>
-      <div class="delete" @click="toAddGird">删除网格</div>
+      <div @click="toAddGird">编辑网格</div>
+      <div class="delete" @click="handleDelete">删除网格</div>
     </div>
   </div>
 </template>

From a85429a9892f1678d8a00820b20f52df2f3afeed Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 11:38:27 +0800
Subject: [PATCH 5/8] BUG 30076

---
 src/project/beta/AppGridManagement/SetGird.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/beta/AppGridManagement/SetGird.vue b/src/project/beta/AppGridManagement/SetGird.vue
index 240bc9fa..20328c4f 100644
--- a/src/project/beta/AppGridManagement/SetGird.vue
+++ b/src/project/beta/AppGridManagement/SetGird.vue
@@ -21,7 +21,7 @@
     </AiGroup>
     <div class="subBtn" v-if="detail.girdRight==1">
       <div @click="toAddGird">添加下级网格</div>
-      <div @click="toAddGird">编辑网格</div>
+      <div @click="edit">编辑网格</div>
       <div class="delete" @click="handleDelete">删除网格</div>
     </div>
   </div>

From d50e2bf91f46b49e1d0779de8fc974d69849ca74 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 11:41:45 +0800
Subject: [PATCH 6/8] BUG 30080

---
 src/project/beta/AppGridManagement/SetGird.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/project/beta/AppGridManagement/SetGird.vue b/src/project/beta/AppGridManagement/SetGird.vue
index 20328c4f..ac6dab06 100644
--- a/src/project/beta/AppGridManagement/SetGird.vue
+++ b/src/project/beta/AppGridManagement/SetGird.vue
@@ -74,11 +74,11 @@ export default {
       uni.navigateTo({url: `./AddGird?id=${this.detail.id}&fromType=edit`})
     },
     handleDelete() {
-      this.$confirm('删除网格后，会清除网格内网格员和责任家庭信息，如有下级网格，会同步删除下级网格所有数据', `您确认要删除该网格？`).then(() => {
+      this.$confirm('删除网格后，会清除网格内网格员的责任家庭信息，如有下级网格，会同步删除下级网格所有数据', `您确认要删除该网格？`).then(() => {
         this.$http.post(`/app/appgirdinfo/delete?ids=${this.detail.id}`).then((res) => {
           if (res?.code == 0) {
             this.$u.toast('删除成功!')
-            this.getDetail()
+            uni.navigateBack({})
           }
         })
       })

From 227990b9cb84b2bbea78cc29c826a4684d9e79e9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 11:44:13 +0800
Subject: [PATCH 7/8] BUG 30081

---
 src/project/beta/AppGridManagement/AppGridManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/beta/AppGridManagement/AppGridManagement.vue b/src/project/beta/AppGridManagement/AppGridManagement.vue
index a30f9df6..bde8f712 100644
--- a/src/project/beta/AppGridManagement/AppGridManagement.vue
+++ b/src/project/beta/AppGridManagement/AppGridManagement.vue
@@ -10,7 +10,7 @@
             <AiMore v-model="params.girdName" icon="arrow-down"/>
           </div>
         </AiPagePicker>
-        <span @click="linkTo('./SetGird?id='+params.id)" v-if="isGridAdmin">网格配置</span>
+        <span @click="linkTo('./SetGird?id='+params.id)" v-if="isGridAdmin&&!!params.id">网格配置</span>
       </div>
       <component v-if="refresh" :is="component" @change="onChange" :params="params"/>
       <div class="tabs" v-if="isTab">

From b95c8cb291f411296a98f989ffd1e8455040b58d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jun 2022 14:31:55 +0800
Subject: [PATCH 8/8] BUG 30075

---
 src/project/beta/AppGridManagement/AddGird.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/project/beta/AppGridManagement/AddGird.vue b/src/project/beta/AppGridManagement/AddGird.vue
index 4d88f200..dd9bd7c0 100644
--- a/src/project/beta/AppGridManagement/AddGird.vue
+++ b/src/project/beta/AppGridManagement/AddGird.vue
@@ -20,7 +20,7 @@
         </AiPagePicker>
       </AiItem>
     </AiGroup>
-    <div class="footer" @click="confirm">{{ fromType == 'add' ? '确认添加' : '确认修改' }}</div>
+    <div class="footer" @click="$u.debounce(confirm)">{{ fromType == 'add' ? '确认添加' : '确认修改' }}</div>
   </div>
 </template>
 
@@ -86,7 +86,6 @@ 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('提交成功')
@@ -97,8 +96,7 @@ export default {
         }
       }).catch((err) => {
         this.$u.toast(err)
-      }).finally(() => uni.hideLoading())
-
+      })
     },
     getArrayLabel(arr, key = 'name', separation = '，') {
       return arr?.map(e => e[key])?.join(separation)