Merge branch 'feat/zl' into 'release-new'

hotfix for chat

See merge request !135

src/store/modules/socket.js

@@ -48,7 +48,8 @@ const socket = {
         context.commit('main/updateNoticeList', l, { root: true });
         console.log('n--------', n);
         const { path } = window._VM.$route;
-        const operateUserId = window._VM.$store.state.main.soketQuest.operateUserId
+        const operateUserId = window._VM.$store.state.main.soketQuest
+          .operateUserId
           ? window._VM.$store.state.main.soketQuest.operateUserId
           : '';
         console.log('operateUserId---', operateUserId);
@@ -121,9 +122,10 @@ const socket = {
                       type: 'warning',
                       duration: 1000,
                     });
-                    return false;
-                  }
+                    cn.close();
+                  } else {
                     window._VM.$store.dispatch('main/gotoInquiry', payload);
+                  }
                   cn.close();
                 },
               },