Merge branch 'master_jnryy_customerservice' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice

src/pages/customerservice/support/conversation/index.jsx

@@ -151,7 +151,7 @@ const conversation = (props) => {
       msgAlert && msgAlert()
     }
   }
-  //点击获取更多信息
+  //点击获取更多信息,和uat不一致
   const getMoreMessage = (pageNum)=>{
     let serverAvatar = user
     let customerAvatar = client
@@ -255,6 +255,7 @@ const getToken = ()=>{
     supplierNo:kfType==1?'EMPTY':agentNumber
   }).then(res => {
     if (res && res.success) {
+      setShow(true)
       websocketInit(staffId)
       setLoading(true)
       getMoreMessage(1)
@@ -281,7 +282,6 @@ const monitorWebSocket = (ws)=>{
     console.log("Connection open ..."); 
     //记录ws
     CUSTOMERSERVICE_WEBSOCKET.push(ws)
-    setShow(true)  //连接建立后，才可以显示弹窗、收发消息
   }
   // 接收服务端数据时触发事件
   ws.onmessage = function (res) {