Browse Source

Revert "feat:."

This reverts commit d72927f65ec531adfe539e6eefd667d5ff303c4c.
jinx 3 years ago
parent
commit
53b922b9c5
2 changed files with 23 additions and 27 deletions
  1. 6 6
      config.js
  2. 17 21
      socket.js

+ 6 - 6
config.js

@@ -17,12 +17,12 @@ const mal = {
   // socketHost: 'wss://shop.4dkankan.com',
   socketHost: 'wss://rtc-zfb.4dkankan.com/',
   // socketHost: 'wss://192.168.0.79:3031',
-  requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
-  viewChildHost: 'https://cszfb.4dkankan.com', //测试环境
-  viewHost: 'https://cszfb.4dkankan.com'//测试环境
-  // requestHost: 'https://plaza.4dkankan.com',
-  // viewChildHost: 'https://zfb.4dkankan.com',
-  // viewHost: 'https://zfb.4dkankan.com'
+  // requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
+  // viewChildHost: 'https://cszfb.4dkankan.com', //测试环境
+  // viewHost: 'https://cszfb.4dkankan.com'//测试环境
+  requestHost: 'https://plaza.4dkankan.com',
+  viewChildHost: 'https://zfb.4dkankan.com',
+  viewHost: 'https://zfb.4dkankan.com'
 }
 
 

+ 17 - 21
socket.js

@@ -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) {