From b1ff429c6502f000e0078e3dc6e2561cf87d6171 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 10 Jun 2022 16:12:44 +0800
Subject: [PATCH] bug

---
 src/apps/AppBroadcast/AppBroadcast.vue   | 12 ++++++------
 src/apps/AppBroadcast1/LiveBroadcast.vue | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppBroadcast/AppBroadcast.vue b/src/apps/AppBroadcast/AppBroadcast.vue
index 7c330a78..58d77b93 100644
--- a/src/apps/AppBroadcast/AppBroadcast.vue
+++ b/src/apps/AppBroadcast/AppBroadcast.vue
@@ -42,12 +42,12 @@ export default {
           path: './addPlay',
           bgClass: 'bg-67A3F4'
         },
-        {
-          title: '实时喊话',
-          text: '实时在线喊话，远程广播通知',
-          imgUrl: require('./img/bigHorn-icon22@2x.png'),
-          bgClass: 'bg-4ED5BB'
-        },
+        // {
+        //   title: '实时喊话',
+        //   text: '实时在线喊话，远程广播通知',
+        //   imgUrl: require('./img/bigHorn-icon22@2x.png'),
+        //   bgClass: 'bg-4ED5BB'
+        // },
         {
           title: '音频录制',
           text: '音频文件的录制',
diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index e4a13178..bc7d4ec2 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="LiveBroadcast" @touchend="onTouchend" @touchmove="onTouchmove">
-    <div class="top">
+    <div class="top" @click="toChoose" hover-class="bg-hover">
       <h2>请选择设备</h2>
       <image src="./img/right.png" />
     </div>
@@ -76,7 +76,7 @@
         y: 0,
         w: 0,
         h: 0,
-        isShowRecord: true,
+        isShowRecord: false,
         close: require('./img/close.png'),
         closeW: require('./img/close-w.png'),
         isShow: false,
@@ -87,7 +87,8 @@
         blobFile: null,
         counterDownTime: 0,
         time: '00:00:00',
-        timingTimeout: null
+        timingTimeout: null,
+        equipmentList: []
       }
     },
 
@@ -96,7 +97,6 @@
     },
 
     mounted () {
-
       const close = document.querySelector('.close')
       this.x = close.offsetLeft
       this.y = close.offsetTop
@@ -104,6 +104,13 @@
       this.h = close.clientHeight
     },
 
+    onLoad () {
+      uni.$on('chooseEquipment', e => {
+        console.log(e)
+        this.equipmentList = e.equipmentList
+      })
+    },
+
     methods: {
       onLongtap () {
         this.isImpact = false
@@ -112,6 +119,12 @@
         this.record()
       },
 
+      toChoose () {
+        uni.navigateTo({
+          url: './selectEquipment'
+        })
+      },
+
       record () {
         this.duration = 0
         this.recorder = Recorder({