test

socket.js

@@ -349,7 +349,7 @@ export default {
     console.log('进入房间角色,', this.role);
 
     const isAuthMic = await this.getAuthorizeRecordStatus();
-    
+
     console.log('当前用户录音权限状态', isAuthMic)
 
     const assistantId = (assistant && assistant.userId) ? assistant.userId : '';
@@ -498,6 +498,13 @@ export default {
         options.roomId = Number(data.roomId)
       }
     })
+    // 有MIC通知，主要是其他用户禁MIC
+    socket.on('beHasMic', (data) => {
+      console.log('beHasMic', beHasMic)
+      wx.showToast({
+        title: '测试-beHasMic',
+      })
+    })
 
     socket.on("beKicked", data => {
       const that = this
@@ -510,8 +517,7 @@ export default {
           wx.showToast({
             title: '您已被踢出房间！',
             icon: 'none',
-            complete: () => {
-            }
+            complete: () => {}
           })
           setTimeout(() => {
             that.socketStop();
@@ -1220,6 +1226,7 @@ export default {
           })
           .then(res => {
             if (res.errno === 0) {
+
               that.navDatas[item.category_id] = res.data.goodsList
             }
           })
@@ -1258,6 +1265,7 @@ export default {
           size: that.data.size
         })
         .then(function (res) {
+
           if (res.errno === 0) {
             that.setData({
               goodsList: res.data.goodsList,

webview/shop-container/js/main.js

@@ -51,7 +51,7 @@ function selectType(category_id) {
 }
 
 
-const iconHTML = [1,2,3].map(item => `
+const iconHTML = [1, 2, 3].map(item => `
   <div class="brick brick-${item} enter">
     <div class="brick-top face"></div>
     <div class="brick-bottom face"></div>
@@ -69,7 +69,7 @@ async function getContent(categoryId) {
   formData.append('categoryId', categoryId)
   formData.append('page', 1)
   formData.append('size', 1000)
-  
+
 
   let res = await axios({
     url: data.API_BASE_URL + '/goods/list',
@@ -80,7 +80,7 @@ async function getContent(categoryId) {
     },
     data: formData
   })
-  
+
   let list = res.data.data.goodsList
   let $content = document.querySelector('#content')
 
@@ -111,7 +111,7 @@ async function getContent(categoryId) {
 
 
   Array.from($content.querySelectorAll('.commodity-item')).forEach($item => {
-    $item.addEventListener('click', function() {
+    $item.addEventListener('click', function () {
       socket.emit('clientSyncAction', {
         type: 'gotoGoodsSocket',
         data: this.getAttribute('data-id')
@@ -123,18 +123,18 @@ async function getContent(categoryId) {
       // })
     })
 
-    $item.querySelector('.add-card').addEventListener('click', function(ev) {
+    $item.querySelector('.add-card').addEventListener('click', function (ev) {
       ev.stopPropagation()
       wx.miniProgram.navigateTo({
-        url: '/pages/goods/goods?id=' + this.getAttribute('data-id') + '&oper=addCard' ,
+        url: '/pages/goods/goods?id=' + this.getAttribute('data-id') + '&oper=addCard',
       })
       hideCommodity()
     })
 
-    $item.querySelector('.buy-goods').addEventListener('click', function(ev) {
+    $item.querySelector('.buy-goods').addEventListener('click', function (ev) {
       ev.stopPropagation()
       wx.miniProgram.navigateTo({
-        url: '/pages/goods/goods?id=' + this.getAttribute('data-id') + '&oper=buyGoods' ,
+        url: '/pages/goods/goods?id=' + this.getAttribute('data-id') + '&oper=buyGoods',
       })
       hideCommodity()
     })
@@ -161,8 +161,9 @@ function updateSocket(options) {
     if (data.type === 'hashChange') {
       console.log(data.data)
       this.init(data.data)
-    } else if (data.type === 'newRoom' && data.data && data.data.roomId) {
-     
+    }
+
+    if (data.type === 'newRoom' && data.data && data.data.roomId) {
       console.log('新建房间', data.data)
       debugger
       updateSocket(data.data)
@@ -219,4 +220,4 @@ document.querySelector('.bgd').addEventListener('click', hideCommodity);
 
 (function load() {
   init(JSON.parse(unescape(location.hash.substr(1))))
-})();
+})();