Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !78

src/components/IM/diagnosis-live.vue

@@ -185,11 +185,11 @@ export default {
       if(data.role == 2 && this.userTrtcEntryStatus != 2){
         return false;
       }
-      console.log('--this.roomId', data, this.roomId);
+      console.log('--this.roomId',this.currentChat, data, this.roomId);
       let url = `/im/team/call/direct/`;
       let params = {
         imAccId: data.accId,
-        imTeamId: this.currentChat.tid,
+        imTeamId: this.currentChat.imTeamId,
         liveRoomId: this.roomId
       };
       this.POST(url, params).then((res) => {

src/components/common/inquirylist.vue

@@ -372,6 +372,7 @@ export default {
         return false;
       }
       const i = this.item;
+      // this.$store.commit("updateCurrentChat", i);
       this.$store.dispatch("gotoInquiry", i);
     },
     openAdvice() {

src/store/module/socket.js

@@ -70,7 +70,10 @@ export default {
         }
       });
       state.socketClient.on('ping', function () {
-        console.log('[E] 心跳请求已发出 →', true);
+        console.log('[E] 心跳请求已发出 →', true, socketTimer);
+        if(socketTimer){
+          clearInterval(socketTimer);
+        }
       });
       //收到
       state.socketClient.on('pong', function () {
@@ -123,11 +126,16 @@ export default {
       })
     },
     RECONNECT_SOCKET: (state, payload) => {
-      socketTimer =  setInterval(function (){
+      if(socketTimer){
+        console.log('RECONNECT_SOCKET--已经存在');
+      }else{
         const i = storejs.get('initSocketInfo');
+        console.log('RECONNECT_SOCKET-- 重新链接', i);
+        socketTimer =  setInterval(function (){
           console.log('----initSocketInfo', i);
           store.dispatch( 'socket/initSocket', i)
         }, 2000);
       }
+    }
   },
 };