feat:修改

admin/src/api/index.js

@@ -20,7 +20,7 @@ export function fetchUserList (params= {}) {
   const defaultParams = {
     query_name: params.searchKey,
     page_size: 10,
-    page_num: 1
+    page_num: params.pageNum || 1
   }
   return request.get('listAdmin', {params: Object.assign(defaultParams, params)})
 }
@@ -29,7 +29,7 @@ export function fetchUserList (params= {}) {
 // 获取讲解员列表
 export function fetchViewerList (params= {}) {
   const defaultParams = {
-    registerType: '',
+    registerType: '2',
     keyword: params.searchKey,
     pageSize: 10,
     pageNum: 1

admin/src/components/upload/video.vue

@@ -162,13 +162,13 @@ export default {
   padding: 30px 0 !important;
 }
 .tips {
-    position: absolute;
-    bottom: -8px;
-    font-size: 12px;
-    color:rgba(255,255,255,0.38);
-    line-height: 1;
-  }
-  .file-item {
-    cursor: pointer;
-  }
+  position: absolute;
+  bottom: -8px;
+  font-size: 12px;
+  color:rgba(255,255,255,0.38);
+  line-height: 1;
+}
+.file-item {
+  cursor: pointer;
+}
 </style>

admin/src/views/enterprise/components/baseForm.vue

@@ -268,7 +268,7 @@ export default {
   async mounted () {
     await this.getIndustryList()
     this.$watch('form.companyLogo', function (newVal) {
-      if (this.isDetail) {
+      if (this.isDetail && newVal) {
         this.hasLogoUploads = [{img: newVal}]
       }
     }, {

admin/src/views/enterprise/components/videoForm.vue

@@ -6,7 +6,7 @@
           <Input type="text" size="large" v-model="form.introduceVideoDesc" :disabled="isDetail" />
         </FormItem>
         <FormItem label="上传视频">
-          <videoUpload :hideUpload="isDetail" tips="只能上传mp4/mov文件，且不超过10mb" ref="videoUpload" :hasUploads="hasUploads" :preUploads="preUploads" />
+          <videoUpload :hideUpload="isDetail" tips="只能上传mp4/mov文件，且不超过10mb" ref="videoUpload" :hasUploads="hasUploads" :preUploads="preUploads" :limit="1" />
         </FormItem>
       </Form>
     </div>
@@ -32,7 +32,7 @@ export default {
   },
   mounted () {
     this.$watch('form.introduceVideo', function (newVal) {
-      if (this.isDetail) {
+      if (this.isDetail && newVal) {
         this.hasUploads = [{img: `${newVal}?x-oss-process=video/snapshot,t_7000,f_jpg,w_800,h_600,m_fast`, url: newVal}]
       }
     }, {

admin/vue.config.js

@@ -24,9 +24,9 @@ module.exports = {
     },
     proxy: {
       '/admin': {
-        // target: 'https://haowan.4dkankan.com', // 正式环境
+        target: 'https://haowan.4dkankan.com', // 正式环境
         // target: 'http://192.168.0.83:8165'  // 伟玉本地环境
-        target: 'http://haowantest.4dkankan.com'    // 测试环境
+        // target: 'http://haowantest.4dkankan.com'    // 测试环境
       },
       '/node-upload': {
         target: 'http://haowantest.4dkankan.com',

admin/备份/static/css/chunk-441a8fbe.0473a37f.css

@@ -0,0 +1 @@
+.upload[data-v-f5ffe9c6]{padding:30px 0!important}.tips[data-v-f5ffe9c6]{position:absolute;bottom:-8px;font-size:12px;color:hsla(0,0%,100%,.38);line-height:1}.home-admin[data-v-00d8cb8d]{padding:0 30px 30px}.form[data-v-00d8cb8d]{padding-top:30px}.actions-w[data-v-00d8cb8d]{padding-left:86px}.actions-w .submit-btn[data-v-00d8cb8d]{width:116px}.actions-w .cancle-btn[data-v-00d8cb8d]{width:88px;margin-left:15px}

admin/备份/static/js/chunk-2d0abe1d.8c64ea78.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0abe1d"],{"16bd":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c={},l=c,a=t("2877"),o=Object(a["a"])(l,u,r,!1,null,null,null);n["default"]=o.exports}}]);

admin/备份/static/js/chunk-2d0b3248.e3e48ef5.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b3248"],{"26b0":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c={},l=c,o=t("2877"),s=Object(o["a"])(l,u,r,!1,null,null,null);n["default"]=s.exports}}]);

miniprogram/pages/web/web.js

@@ -27,7 +27,8 @@ Page({
     room_id: '',
     hasBeLogin: false,
     vr_link: '',
-    showWebView: true
+    showWebView: true,
+    trtcConfig: {}
   },
   /**
    * 生命周期函数--监听页面加载
@@ -101,9 +102,6 @@ Page({
       this.sendVrCard()
       this.hasSend = true
     }
-    this.socket.emit('getUserSig', {
-      userId: getApp().globalData.userinfo.viewerId
-    })
   },
   createLivePull({
     persons,
@@ -115,10 +113,6 @@ Page({
         arr.push(this.countLiveUrl(item.userId))
       }
     })
-
-    this.setData({
-      pullUrl: arr
-    })
     this.enterAudioRoom()
   },
   someoneLeave() {
@@ -177,56 +171,52 @@ Page({
       showLogin: false
     })
   },
-  enterAudioRoom(sig) {
-    // index.js
-    if (this.hasEnter) {
-      return
-    }
-    
+  enterAudioRoom(user) {
+    this.hasEnter = true
+    getApp().globalData.audioUser = user
+    console.log(user, 'user')
     this.setData({
       trtcConfig: {
-        sdkAppID: '1400393268', // 开通实时音视频服务创建应用后分配的 SDKAppID
-        userID: getApp().globalData.userinfo.viewerId, // 用户 ID，可以由您的帐号系统指定
-        userSig: sig, // 身份签名，相当于登录密码的作用
+        scene: 'rtc',
+        sdkAppID: '1400433526', // 开通实时音视频服务创建应用后分配的 SDKAppID
+        userID: user.userId, // 用户 ID，可以由您的帐号系统指定
+        userSig: user.sig, // 身份签名，相当于登录密码的作用
         template: 'custom', // 画面排版模式
       }
     }, () => {
-      let trtcRoomContext = this.selectComponent('#trtcroom')
-      let EVENT = trtcRoomContext.EVENT
+      this.trtcRoomContext = this.selectComponent('#trtcroom')
+      let EVENT =this.trtcRoomContext.EVENT
 
-      if (trtcRoomContext) {
-        trtcRoomContext.on(EVENT.LOCAL_JOIN, (event) => {
-          // 进房成功后发布本地音频流和视频流 
-          trtcRoomContext.publishLocalAudio()
-        })
-        // 监听远端用户的视频流的变更事件
-        trtcRoomContext.on(EVENT.REMOTE_VIDEO_ADD, (event) => {
-          // 订阅（即播放）远端用户的视频流
-          let userID = event.data.userID
-          let streamType = event.data.streamType // 'main' or 'aux'            
-          trtcRoomContext.subscribeRemoteVideo({
-            userID: userID,
-            streamType: streamType
-          })
+      if (this.trtcRoomContext) {
+        this.trtcRoomContext.on(EVENT.LOCAL_JOIN, (event) => {
+          this.publishLocalAudio()
         })
 
         // 监听远端用户的音频流的变更事件
-        trtcRoomContext.on(EVENT.REMOTE_AUDIO_ADD, (event) => {
+       this.trtcRoomContext.on(EVENT.REMOTE_AUDIO_ADD, (event) => {
           // 订阅（即播放）远端用户的音频流
           let userID = event.data.userID
-          trtcRoomContext.subscribeRemoteAudio({
+         this.trtcRoomContext.subscribeRemoteAudio({
             userID: userID
           })
         })
-
-        trtcRoomContext.enterRoom({
+        // this.trtcRoomContext.on(EVENT.LOCAL_AUDIO_VOLUME_UPDATE, event => {
+        //   console.log(event)
+        // })
+       this.trtcRoomContext.enterRoom({
           roomID: this.roomId
         }).then(() => {
-          this.hasEnter = true
+          console.log('成功进入房间')
         }).catch((res) => {
           console.error('room joinRoom 进房失败:', res)
         })
       }
     })
+  },
+  unpublishLocalAudio () {
+    this.trtcRoomContext && this.trtcRoomContext.unpublishLocalAudio()
+  },
+  publishLocalAudio () {
+    this.trtcRoomContext && this.trtcRoomContext.publishLocalAudio()
   }
 })

miniprogram/pages/web/web.wxml

@@ -5,4 +5,4 @@
 
 <trtc-room id="trtcroom" config="{{trtcConfig}}"></trtc-room>
 
-<login-pannel wx:if="{{showLogin}}" bindloginSuccess="loginSuccess" bindhide="hideLogin" />
+<login-pannel wx:if="{{showLogin}}" bindloginSuccess="loginSuccess" bindhide="hideLogin" />

miniprogram/project.config.json

@@ -1,457 +1,466 @@
 {
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"enhance": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"nodeModules": false,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		}
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.10.4",
-	"appid": "wxd55ee54235e90359",
-	"projectname": "%E7%9C%8B%E5%B1%95%E5%B0%8F%E7%A8%8B%E5%BA%8F",
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
-	"isGameTourist": false,
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": [
-				{
-					"id": -1,
-					"name": "pages/publish-discuss/publish-discuss",
-					"pathName": "pages/index/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/index/index",
-					"pathName": "pages/index/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/message/message-box/message-box",
-					"pathName": "pages/message/message-box/message-box",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/message/message-detail/message-detail",
-					"pathName": "pages/message/message-detail/message-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/chat-list/chat-list",
-					"pathName": "pages/chat-list/chat-list",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/chat/chat",
-					"pathName": "pages/chat/chat",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 6,
-					"name": "pages/list/list",
-					"pathName": "pages/list/list",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/city/city",
-					"pathName": "pages/city/city",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 8,
-					"name": "pages/my/my",
-					"pathName": "pages/my/my",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/map/map",
-					"pathName": "pages/map/map",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 10,
-					"name": "pages/detail/detail",
-					"pathName": "pages/detail/detail",
-					"query": "house_id=1004b1da89be9b4ba281588143559554",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/agent-detail/agent-detail",
-					"pathName": "pages/agent-detail/agent-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/agent-detail/agent-detail",
-					"pathName": "pages/agent-detail/agent-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/chat-input/chat-input",
-					"pathName": "pages/chat-input/chat-input",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/chat/chat",
-					"pathName": "pages/chat/chat",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/web/web",
-					"pathName": "pages/web/web",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/user-info/user-info",
-					"pathName": "pages/user-info/user-info",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/about/about",
-					"pathName": "pages/about/about",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/web/web",
-					"pathName": "pages/web/web",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/map/map",
-					"pathName": "pages/map/map",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/contact/contact",
-					"pathName": "pages/contact/contact",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/login/login",
-					"pathName": "pages/login/login",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/share-history/share-history",
-					"pathName": "pages/share-history/share-history",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/feedback/feedback",
-					"pathName": "pages/feedback/feedback",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/detail-intro/detail-intro",
-					"pathName": "pages/detail-intro/detail-intro",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/view-history/view-history",
-					"pathName": "pages/view-history/view-history",
-					"query": "house_id=1004b1da89be9b4ba281588143559554",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/follow-list/follow-list",
-					"pathName": "pages/follow-list/follow-list",
-					"query": "house_id=1004b1da89be9b4ba281588143559554",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/chat-input/chat-input",
-					"pathName": "pages/chat-input/chat-input",
-					"query": "house_id=1004b1da89be9b4ba281588143559554",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/shared/shared",
-					"pathName": "pages/shared/shared",
-					"query": "img_url= https://houseoss.4dkankan.com/4dHouse/admin/upload/202006221443_954.jpg",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/shared/shared",
-					"pathName": "pages/shared/shared",
-					"query": "img_url= https%3A%2F%2Fhouseoss.4dkankan.com%2F4dHouse%2Fadmin%2Fupload%2F202006221443_954.jpg",
-					"scene": null
-				},
-				{
-					"id": 30,
-					"name": "pages/shared/shared",
-					"pathName": "pages/shared/shared",
-					"query": "shareImg=https%3A%2F%2Fhouseoss.4dkankan.com%2Fdomain%2F4dshow%2Fnull_QRCode.png&img_url=https%3A%2F%2Fhouseoss.4dkankan.com%2F4dHouse%2Fadmin%2Fupload%2F202006221933_324.jpg",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/exhibition-detail/exhibition-detail",
-					"pathName": "pages/exhibition-detail/exhibition-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/exhibition-register/exhibition-register",
-					"pathName": "pages/exhibition-register/exhibition-register",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/exhibition-enterprise/exhibition-enterprise",
-					"pathName": "pages/exhibition-enterprise/exhibition-enterprise",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/goods-tabs/goods-tabs",
-					"pathName": "pages/goods-tabs/goods-tabs",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/search/search",
-					"pathName": "pages/search/search",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/user-info/user-info",
-					"pathName": "pages/user-info/user-info",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/collect-goods/collect-goods",
-					"pathName": "pages/collect-goods/collect-goods",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 38,
-					"name": "名片列表",
-					"pathName": "pages/business-card/business-card",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/goods-detail/goods-detail",
-					"pathName": "pages/goods-detail/goods-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/data-report/data-report",
-					"pathName": "pages/data-report/data-report",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "dataReport/pages/data-report/data-report",
-					"pathName": "dataReport/pages/data-report/data-report",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/goods-tabs/goods-tabs",
-					"pathName": "pages/goods-tabs/goods-tabs",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/exhibition-detail/exhibition-detail",
-					"pathName": "pages/exhibition-detail/exhibition-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/exhibition-enterprise/exhibition-enterprise",
-					"pathName": "pages/exhibition-enterprise/exhibition-enterprise",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 45,
-					"name": "商圈商品详情",
-					"pathName": "pages/goods-detail/goods-detail",
-					"query": "goods_id=1181276&companyId=10403753716a99e763b1594344521495",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/search/search",
-					"pathName": "pages/search/search",
-					"query": "goods_id=fdasf2",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/collect-goods/collect-goods",
-					"pathName": "pages/collect-goods/collect-goods",
-					"query": "goods_id=fdasf2",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/user-info/user-info",
-					"pathName": "pages/user-info/user-info",
-					"query": "goods_id=fdasf2",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/business-card/business-card",
-					"pathName": "pages/business-card/business-card",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/business-card/detail/business-card-detail",
-					"pathName": "pages/business-card/detail/business-card-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "dataReport/pages/data-report/data-report",
-					"pathName": "dataReport/pages/data-report/data-report",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/logout/logout",
-					"pathName": "pages/logout/logout",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/business-card/scan/scan",
-					"pathName": "pages/business-card/scan/scan",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/business-card/scan-result/scan-result",
-					"pathName": "pages/business-card/scan-result/scan-result",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "dataReport/pages/data-report/data-report",
-					"pathName": "dataReport/pages/data-report/data-report",
-					"query": "",
-					"scene": null
-				}
-			]
-		}
-	}
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": []
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.10.4",
+  "appid": "wxd55ee54235e90359",
+  "projectname": "%E7%9C%8B%E5%B1%95%E5%B0%8F%E7%A8%8B%E5%BA%8F",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "isGameTourist": false,
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "plugin": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "gamePlugin": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": [
+        {
+          "id": -1,
+          "name": "pages/publish-discuss/publish-discuss",
+          "pathName": "pages/index/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/message/message-box/message-box",
+          "pathName": "pages/message/message-box/message-box",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/message/message-detail/message-detail",
+          "pathName": "pages/message/message-detail/message-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/chat-list/chat-list",
+          "pathName": "pages/chat-list/chat-list",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/chat/chat",
+          "pathName": "pages/chat/chat",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 6,
+          "name": "pages/list/list",
+          "pathName": "pages/list/list",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/city/city",
+          "pathName": "pages/city/city",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 8,
+          "name": "pages/my/my",
+          "pathName": "pages/my/my",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/map/map",
+          "pathName": "pages/map/map",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 10,
+          "name": "pages/detail/detail",
+          "pathName": "pages/detail/detail",
+          "query": "house_id=1004b1da89be9b4ba281588143559554",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/agent-detail/agent-detail",
+          "pathName": "pages/agent-detail/agent-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/agent-detail/agent-detail",
+          "pathName": "pages/agent-detail/agent-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/chat-input/chat-input",
+          "pathName": "pages/chat-input/chat-input",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/chat/chat",
+          "pathName": "pages/chat/chat",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/web/web",
+          "pathName": "pages/web/web",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/user-info/user-info",
+          "pathName": "pages/user-info/user-info",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/about/about",
+          "pathName": "pages/about/about",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/web/web",
+          "pathName": "pages/web/web",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/map/map",
+          "pathName": "pages/map/map",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/contact/contact",
+          "pathName": "pages/contact/contact",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/login/login",
+          "pathName": "pages/login/login",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/share-history/share-history",
+          "pathName": "pages/share-history/share-history",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/feedback/feedback",
+          "pathName": "pages/feedback/feedback",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/detail-intro/detail-intro",
+          "pathName": "pages/detail-intro/detail-intro",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/view-history/view-history",
+          "pathName": "pages/view-history/view-history",
+          "query": "house_id=1004b1da89be9b4ba281588143559554",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/follow-list/follow-list",
+          "pathName": "pages/follow-list/follow-list",
+          "query": "house_id=1004b1da89be9b4ba281588143559554",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/chat-input/chat-input",
+          "pathName": "pages/chat-input/chat-input",
+          "query": "house_id=1004b1da89be9b4ba281588143559554",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/shared/shared",
+          "pathName": "pages/shared/shared",
+          "query": "img_url= https://houseoss.4dkankan.com/4dHouse/admin/upload/202006221443_954.jpg",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/shared/shared",
+          "pathName": "pages/shared/shared",
+          "query": "img_url= https%3A%2F%2Fhouseoss.4dkankan.com%2F4dHouse%2Fadmin%2Fupload%2F202006221443_954.jpg",
+          "scene": null
+        },
+        {
+          "id": 30,
+          "name": "pages/shared/shared",
+          "pathName": "pages/shared/shared",
+          "query": "shareImg=https%3A%2F%2Fhouseoss.4dkankan.com%2Fdomain%2F4dshow%2Fnull_QRCode.png&img_url=https%3A%2F%2Fhouseoss.4dkankan.com%2F4dHouse%2Fadmin%2Fupload%2F202006221933_324.jpg",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/exhibition-detail/exhibition-detail",
+          "pathName": "pages/exhibition-detail/exhibition-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/exhibition-register/exhibition-register",
+          "pathName": "pages/exhibition-register/exhibition-register",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/exhibition-enterprise/exhibition-enterprise",
+          "pathName": "pages/exhibition-enterprise/exhibition-enterprise",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/goods-tabs/goods-tabs",
+          "pathName": "pages/goods-tabs/goods-tabs",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/search/search",
+          "pathName": "pages/search/search",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/user-info/user-info",
+          "pathName": "pages/user-info/user-info",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/collect-goods/collect-goods",
+          "pathName": "pages/collect-goods/collect-goods",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 38,
+          "name": "名片列表",
+          "pathName": "pages/business-card/business-card",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/goods-detail/goods-detail",
+          "pathName": "pages/goods-detail/goods-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/data-report/data-report",
+          "pathName": "pages/data-report/data-report",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "dataReport/pages/data-report/data-report",
+          "pathName": "dataReport/pages/data-report/data-report",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/goods-tabs/goods-tabs",
+          "pathName": "pages/goods-tabs/goods-tabs",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/exhibition-detail/exhibition-detail",
+          "pathName": "pages/exhibition-detail/exhibition-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/exhibition-enterprise/exhibition-enterprise",
+          "pathName": "pages/exhibition-enterprise/exhibition-enterprise",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 45,
+          "name": "商圈商品详情",
+          "pathName": "pages/goods-detail/goods-detail",
+          "query": "goods_id=1181276&companyId=10403753716a99e763b1594344521495",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/search/search",
+          "pathName": "pages/search/search",
+          "query": "goods_id=fdasf2",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/collect-goods/collect-goods",
+          "pathName": "pages/collect-goods/collect-goods",
+          "query": "goods_id=fdasf2",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/user-info/user-info",
+          "pathName": "pages/user-info/user-info",
+          "query": "goods_id=fdasf2",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/business-card/business-card",
+          "pathName": "pages/business-card/business-card",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/business-card/detail/business-card-detail",
+          "pathName": "pages/business-card/detail/business-card-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "dataReport/pages/data-report/data-report",
+          "pathName": "dataReport/pages/data-report/data-report",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/logout/logout",
+          "pathName": "pages/logout/logout",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/business-card/scan/scan",
+          "pathName": "pages/business-card/scan/scan",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/business-card/scan-result/scan-result",
+          "pathName": "pages/business-card/scan-result/scan-result",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "dataReport/pages/data-report/data-report",
+          "pathName": "dataReport/pages/data-report/data-report",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
 }

miniprogram/utils/socket-handle.js

@@ -28,18 +28,16 @@ export function initSocket(page, options) {
   })
 
   io.on(eventName.someoneInRoom, function (data) {
-    data.persons = data.persons.filter(item => item.userId !== getApp().globalData.userinfo.user_id)
-    page.createLivePull(data)
+    if (data.persons.length < 2) {
+      return
+    }
+    let user = data.persons.find(item => item.userId === getApp().globalData.userinfo.user_id)
+    page.enterAudioRoom(user)
   })
 
   io.on(eventName.someoneLeaveRoom, function (data) {
     page.someoneLeave(data)
   })
-
-  io.on(eventName.getUserSig, sig => {
-    console.log(sig, 'sig')
-    page.enterAudioRoom(sig)
-  })
   return io
 }