|
@@ -152,13 +152,13 @@
|
|
|
<svg-icon
|
|
|
v-if="item.connection_mode === 1 && item.connection_status !== 0"
|
|
|
icon-class="hang-up"
|
|
|
- @click="handsDown"
|
|
|
+ @click="handsDown(item.room_user_id)"
|
|
|
/>
|
|
|
<svg-icon v-else icon-class="video" @click="invite(item, 1)" />
|
|
|
<svg-icon
|
|
|
v-if="item.connection_mode === 2 && item.connection_status !== 0"
|
|
|
icon-class="hang-up"
|
|
|
- @click="handsDown"
|
|
|
+ @click="handsDown(item.room_user_id)"
|
|
|
/>
|
|
|
<svg-icon v-else icon-class="voice" @click="invite(item, 2)" />
|
|
|
</div>
|
|
@@ -315,7 +315,11 @@ export default {
|
|
|
},
|
|
|
connectUid() {
|
|
|
let connect = this.student_list.find(item => item.connection_status !== 0);
|
|
|
- return connect ? connect.room_user_id : '';
|
|
|
+ let room_user_id = connect ? connect.room_user_id : '';
|
|
|
+
|
|
|
+ return 'room_user_id' in this.connectStudent
|
|
|
+ ? this.connectStudent.room_user_id
|
|
|
+ : room_user_id;
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -519,19 +523,19 @@ export default {
|
|
|
},
|
|
|
|
|
|
// 下麦
|
|
|
- handsDown() {
|
|
|
- console.log(this.connectUid);
|
|
|
+ handsDown(uid) {
|
|
|
+ let connectUid = typeof uid === 'string' ? uid : this.connectUid;
|
|
|
common.handsDown({
|
|
|
- uid: this.connectUid,
|
|
|
+ uid: connectUid,
|
|
|
success: str => {
|
|
|
if (this.callLoading) {
|
|
|
common.sendPublishMessage({
|
|
|
type: 'handsDown-load',
|
|
|
- uid: this.connectUid
|
|
|
+ uid: connectUid
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- this.dealStudentConnection(this.connectUid, 0, this.connectStudent.connection_mode);
|
|
|
+ this.dealStudentConnection(connectUid, 0, this.connectStudent.connection_mode);
|
|
|
|
|
|
this.callLoading = false;
|
|
|
common.updateMcResult('', 0);
|