Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppBroadcast1/LiveBroadcast.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="LiveBroadcast" @touchend="onTouchend" @touchmove="onTouchmove">
     <div class="top" @click="toChoose" hover-class="bg-hover">
-      <h2>请选择设备</h2>
+      <div class="left">
+        <h2 v-if="!equipmentList.length">请选择设备</h2>
+        <h2>{{ equipmentStr }}</h2>
+        <h2 v-if="equipmentList.length > 2">...等</h2>
+        <span v-if="equipmentList.length > 2">{{ equipmentList.length }}</span>
+        <h2 v-if="equipmentList.length > 2">个设备</h2>
+      </div>
       <image src="./img/right.png" />
     </div>
     <div class="middle">
@@ -93,7 +99,15 @@
     },
 
     computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+
+      equipmentStr () {
+        if (!this.equipmentList.length) {
+          return ''
+        }
+
+        return this.equipmentList.filter((item, index) => index < 2).map(v => v.serialName).join('、')
+      }
     },
 
     mounted () {
@@ -113,6 +127,10 @@
 
     methods: {
       onLongtap () {
+        if (!this.equipmentList.length) {
+          return this.$u.toast('请选择播发设备')
+        }
+
         this.isImpact = false
         this.startTime = new Date().getTime()
         this.isShow = true
@@ -327,6 +345,15 @@
       height: 128px;
       padding: 0 32px;
 
+      .left {
+        display: flex;
+        align-items: center;
+      }
+
+      span {
+        color: #1174FE;
+      }
+
       h2 {
         color: #333333;
         font-size: 32px;

src/apps/AppBroadcast1/selectEquipment.vue

@@ -77,8 +77,8 @@ export default {
       this.list.map(item => {
         if(item.isCheck) {
           var info = {
-            serialNo: item.deviceName,
+            serialNo: item.serialNo,
-            serialName: item.serialNo
+            serialName: item.deviceName
           }
           this.selectList.push(info)
         }