feat: 修复头像不存在是名字endefind

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'
 }
 
 

pages/webview/index.js

@@ -19,8 +19,8 @@ Page({
     rnd: '',
     temp: '',
     live_base_url: 'rtmp://120.24.85.77:1935/hls',
-    peopleCount: 5,
-    surplus: 5,
+    peopleCount: 50,
+    surplus: 50,
     type: '',
     shareStatus: 0
     // url: 'https://www.4dkankan.com/showProPC.html?m=vroMUXdx&origin=4Dplaza&sid=1046051&room_id=1596785144930&user_id=44'

project.config.json

@@ -19,9 +19,9 @@
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
         "lazyloadPlaceholderEnable": false,
-        "useMultiFrameRuntime": false,
-        "useApiHook": false,
-        "useApiHostProcess": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
         "babelSetting": {
             "ignore": [],
             "disablePlugins": [],

socket.js

@@ -180,8 +180,12 @@ export default {
   async getUserInfo() {
     let userInfo = wx.getStorageSync('userInfo');
     let token = wx.getStorageSync('token');
+
     if (userInfo && userInfo.userId && token) {
       let info = await this.agetUserInfo()
+      if (info.avatar == "" || !info.avatar ) {
+        info.avatar = 'static/img/avatar_default.jpg'
+      }
       return {
         ...userInfo,
         ...info,
@@ -247,8 +251,7 @@ export default {
     // this.setData({
     //   userInfoa: userInfo.nickname.split('').join(' ')
     // })
-
-    userInfo.nickname = userInfo.nickname.replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
+    // userInfo.nickname = userInfo.nickname.replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
     if (userInfo.nickname == "") {
       userInfo.nickname = "口"
     }
@@ -259,13 +262,12 @@ export default {
       if (this.options.roomId) {
         this.role = 'leader'
       }
-      console.log('**************')
       console.log(this.options)
     }
     // wx.showToast({
     //   title: this.data.peopleCount.toString(),
     // })
-
+    console.error('avatar', userInfo)
     return {
       role: this.role || 'leader',
       userId: userInfo.userId,
@@ -507,7 +509,7 @@ export default {
     if (!data) return;
 
     this.setData({
-      surplus: this.data.peopleCount - data.roomsPerson.length
+      surplus: data.roomsPerson.length > 0 ? this.data.peopleCount - data.roomsPerson.length : this.data.peopleCount - 1
     })
     //限制只有主持人才可以开麦
     if (this.role == 'leader') {
@@ -571,7 +573,7 @@ export default {
       // this.stopCall()
     }
     this.setData({
-      surplus: this.data.peopleCount - data.roomsPerson.length
+      surplus: data.roomsPerson.length > 0 ? this.data.peopleCount - data.roomsPerson.length : this.data.peopleCount - 1
     })
   },
   async newRoom(data) {