|
@@ -80,7 +80,7 @@ export default {
|
|
|
|
|
|
this.data.reload = false
|
|
|
this.data.showCommodity = false
|
|
|
- options.url = options.url + '&vlog';
|
|
|
+ // options.url = options.url+'&vlog';
|
|
|
if (!this.data.webviewUrl) {
|
|
|
console.log(base)
|
|
|
this.setData({
|
|
@@ -509,25 +509,21 @@ export default {
|
|
|
this.setData({
|
|
|
surplus: this.data.peopleCount - data.roomsPerson.length
|
|
|
})
|
|
|
- //限制只有主持人才可以开麦
|
|
|
- if (this.role == 'leader') {
|
|
|
- if (!this.isAuthorizeRecord) {
|
|
|
- const voiceStatus = Number(await this.authorizeRecord())
|
|
|
- this.isAuthorizeRecord = true
|
|
|
-
|
|
|
- // getApp().setVoiceProps({
|
|
|
- // noMute: !voiceStatus
|
|
|
- // })
|
|
|
-
|
|
|
- // console.log(getApp().globalData.voiceProps.noMute)
|
|
|
- // this.socketSendMessage('changeVoiceStatus', {
|
|
|
- // status: getApp().globalData.voiceProps.noMute ? 0 : 2
|
|
|
- // })
|
|
|
- // this.data.socketOptions.voiceStatus = 1
|
|
|
- // this.socketSendMessage('changeVoiceStatus', {status: noMute ? 0 : 2})
|
|
|
- }
|
|
|
- }
|
|
|
+ if (!this.isAuthorizeRecord) {
|
|
|
+ const voiceStatus = Number(await this.authorizeRecord())
|
|
|
+ this.isAuthorizeRecord = true
|
|
|
+
|
|
|
+ // getApp().setVoiceProps({
|
|
|
+ // noMute: !voiceStatus
|
|
|
+ // })
|
|
|
|
|
|
+ // console.log(getApp().globalData.voiceProps.noMute)
|
|
|
+ // this.socketSendMessage('changeVoiceStatus', {
|
|
|
+ // status: getApp().globalData.voiceProps.noMute ? 0 : 2
|
|
|
+ // })
|
|
|
+ // this.data.socketOptions.voiceStatus = 1
|
|
|
+ // this.socketSendMessage('changeVoiceStatus', {status: noMute ? 0 : 2})
|
|
|
+ }
|
|
|
|
|
|
const socketOptions = this.data.socketOptions
|
|
|
getApp().globalData.roomId = socketOptions.roomId
|
|
@@ -602,7 +598,7 @@ export default {
|
|
|
|
|
|
this.setData({
|
|
|
// peopleCount: this.data.many ? manyCount : 5
|
|
|
- peopleCount: manyCount
|
|
|
+ peopleCount: this.data.many ? manyCount : 2
|
|
|
})
|
|
|
|
|
|
let base = this.base
|
|
@@ -1120,7 +1116,7 @@ export default {
|
|
|
|
|
|
this.setData({
|
|
|
// peopleCount: this.data.many ? manyCount : 5,
|
|
|
- peopleCount: manyCount,
|
|
|
+ peopleCount: this.data.many ? manyCount : 2,
|
|
|
})
|
|
|
|
|
|
if (!res.data.brand.canShow) {
|