bhd-components 0.7.20 → 0.7.21

package/esm/customerService/index.js

@@ -5,7 +5,7 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@ice/jsx-runtime/jsx-runtime";
 import React, { useEffect, useState, useRef } from "react";
 import { Modal, Drawer, Input, Tooltip } from "antd";
-import { ViewImage } from "bhd-components";
+import ViewImage from "../viewImage";
 // import html2canvas from "html2canvas";
 import cssStyle from "./index.module.less";
 import cssStyleOnline from "./index2.module.less";
@@ -18,6 +18,7 @@ import { CloseOutlined, RightOutlined, ZoomInOutlined } from "@ant-design/icons"
 import HistoryFun from "./historyFun";
 import ContactsList from "./contactsList";
 import ScreenshotTool from "./screenshotTool";
+import TeacherList from "./teacherList";
 import { parseDate } from "../utils/Date";
 import { Remarkable } from "remarkable";
 import hljs from "highlight.js";
@@ -54,20 +55,21 @@ var CustomerService = function(props) {
     var _useState17 = _sliced_to_array(useState(45), 2), buttomHei = _useState17[0], setButtomHei = _useState17[1]; //底部输入框的高度
     var _useState18 = _sliced_to_array(useState(false), 2), showHistory = _useState18[0], setShowHistory = _useState18[1]; //是否显示历史记录
     var _useState19 = _sliced_to_array(useState(false), 2), showContacts = _useState19[0], setShowContacts = _useState19[1]; //是否显示老师列表
-    var _useState20 = _sliced_to_array(useState(-1), 2), showType = _useState20[0], setShowType = _useState20[1]; //显示聊天框类型 1、侧边栏 2 modal 3 相应的div中 newlabo中使用
-    var _useState21 = _sliced_to_array(useState(-1), 2), answerMode = _useState21[0], setAnswerMode = _useState21[1]; //设置回答模式。1，召唤老师回答
-    var _useState22 = _sliced_to_array(useState([]), 2), teacherList = _useState22[0], setTeacherList = _useState22[1]; //老师列表
-    var _useState23 = _sliced_to_array(useState({}), 2), problem = _useState23[0], setProblem = _useState23[1]; //召唤老师回答的问题
-    var _useState24 = _sliced_to_array(useState([]), 2), contactsList = _useState24[0], setContactsList = _useState24[1]; //老师列表
-    var _useState25 = _sliced_to_array(useState([]), 2), chatObj = _useState25[0], setChatObj = _useState25[1]; //聊天记录id保存，用来在实验报告中记录
-    var _useState26 = _sliced_to_array(useState(""), 2), keyWordProblem = _useState26[0], setKeyWordProblem = _useState26[1]; //历史记录搜索的内容
-    var _useState27 = _sliced_to_array(useState(""), 2), imgBese64 = _useState27[0], setImgBese64 = _useState27[1]; //屏幕截图
-    var _useState28 = _sliced_to_array(useState(""), 2), screenshotBese64 = _useState28[0], setScreenshotBese64 = _useState28[1]; //bese64图片
-    var _useState29 = _sliced_to_array(useState(""), 2), viewBase64 = _useState29[0], setViewBase64 = _useState29[1]; //图片预览
-    var _useState30 = _sliced_to_array(useState(false), 2), visible = _useState30[0], setVisible = _useState30[1]; //是否显示图片预览
-    var _useState31 = _sliced_to_array(useState([]), 2), bottomRecommendationQuestions = _useState31[0], setBottomRecommendationQuestions = _useState31[1]; //底部推荐问题
-    var _useState32 = _sliced_to_array(useState(false), 2), showScreenshot = _useState32[0], setShowScreenshot = _useState32[1]; //是否显示截图 主要用于newlabo页面
-    var _useState33 = _sliced_to_array(useState(-1), 2), saveShowType = _useState33[0], setSaveShowType = _useState33[1]; //保存截图时的状态
+    var _useState20 = _sliced_to_array(useState([]), 2), contactsList = _useState20[0], setContactsList = _useState20[1]; //老师列表
+    var _useState21 = _sliced_to_array(useState(-1), 2), showType = _useState21[0], setShowType = _useState21[1]; //显示聊天框类型 1、侧边栏 2 modal 3 相应的div中 newlabo中使用
+    // const [answerMode, setAnswerMode] = useState(-1); //设置回答模式。1，召唤老师回答
+    // const [teacherList, setTeacherList] = useState([]); //老师列表
+    var _useState22 = _sliced_to_array(useState({}), 2), problem = _useState22[0], setProblem = _useState22[1]; //召唤老师回答的问题
+    var _useState23 = _sliced_to_array(useState([]), 2), chatObj = _useState23[0], setChatObj = _useState23[1]; //聊天记录id保存，用来在实验报告中记录
+    var _useState24 = _sliced_to_array(useState(""), 2), keyWordProblem = _useState24[0], setKeyWordProblem = _useState24[1]; //历史记录搜索的内容
+    var _useState25 = _sliced_to_array(useState(""), 2), imgBese64 = _useState25[0], setImgBese64 = _useState25[1]; //屏幕截图
+    var _useState26 = _sliced_to_array(useState(""), 2), screenshotBese64 = _useState26[0], setScreenshotBese64 = _useState26[1]; //bese64图片
+    var _useState27 = _sliced_to_array(useState(""), 2), viewBase64 = _useState27[0], setViewBase64 = _useState27[1]; //图片预览
+    var _useState28 = _sliced_to_array(useState(false), 2), visible = _useState28[0], setVisible = _useState28[1]; //是否显示图片预览
+    var _useState29 = _sliced_to_array(useState([]), 2), bottomRecommendationQuestions = _useState29[0], setBottomRecommendationQuestions = _useState29[1]; //底部推荐问题
+    var _useState30 = _sliced_to_array(useState(false), 2), showScreenshot = _useState30[0], setShowScreenshot = _useState30[1]; //是否显示截图 主要用于newlabo页面
+    var _useState31 = _sliced_to_array(useState(-1), 2), saveShowType = _useState31[0], setSaveShowType = _useState31[1]; //保存截图时的状态
+    var _useState32 = _sliced_to_array(useState(false), 2), showTeacherList = _useState32[0], setShowTeacherList = _useState32[1]; //是否显示召唤老师列表
     var timer = useRef(null); //文本框输入时
     var receiveMessageTimer = useRef(null); //接收ai发回的消息
     // let voiceCountdownTimer = useRef(null); //语音录制倒计时
@@ -81,6 +83,7 @@ var CustomerService = function(props) {
     var recommendeQuestionID = useRef([]); //推荐问题id
     var videoHotQuestionsList = useRef([]); //视频热门问题
     var newHotQuestionsList = useRef([]); //视频热门问题
+    var newShowType = useRef(false);
     var mid = props.userData.mid;
     var remarkable = new Remarkable({
         highlight: function highlight(str, lang) {
@@ -154,6 +157,7 @@ var CustomerService = function(props) {
         //|| showScreenshot
         if (showType == 5 || showScreenshot) {
             try {
+                newShowType.current = true;
                 setImgBese64("");
                 // let dom = document.getElementById(screenshotAreaId);
                 html2canvas(screenshotAreaId, {
@@ -559,6 +563,7 @@ var CustomerService = function(props) {
     };
     //消息发送给老师type == 1,召唤老师时发送，type == 2，在老师聊天窗口聊天
     var sendToTeacher = function(type) {
+        var message = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
         console.log("消息发送给老师111");
         var obj = {};
         if (type == 1) {
@@ -568,8 +573,11 @@ var CustomerService = function(props) {
                 recevier: chatWith.uid,
                 message: problem.question
             };
+            if (problem.url) {
+                obj.image = problem.url;
+            }
             setProblem({});
-        } else if (type == 2) {
+        } else if (type == 2 || type == 3) {
             var list = contactsList.filter(function(item) {
                 return item.roomId == roomId;
             });
@@ -581,9 +589,13 @@ var CustomerService = function(props) {
                 roomId: roomId,
                 sender: mid,
                 recevier: recevier,
-                message: keyWord,
+                message: type == 2 ? keyWord : message,
                 quotedMessage: citationContent.content || ""
             };
+            if (screenshotBese64) {
+                obj.image = screenshotBese64;
+                setScreenshotBese64("");
+            }
         }
         http.post("".concat(urllocation, "/chat-service/public/v1.0/chat-with-user/messages"), obj).then(function(res) {
             if (res.data.id) {
@@ -594,7 +606,13 @@ var CustomerService = function(props) {
                             id: res.data.id,
                             upvoted: false,
                             downvoted: false,
-                            createdAt: getDataTime(-1)
+                            createdAt: getDataTime(-1),
+                            extraInfo: obj.image ? JSON.stringify([
+                                {
+                                    key: "imageUrl",
+                                    value: obj.image
+                                }
+                            ]) : null
                         }));
                         return newHistoryMessageList;
                     });
@@ -1247,8 +1265,9 @@ var CustomerService = function(props) {
         roomMessage.current = setTimeout(function() {
             getRoomidHistoryMessage(totalNumber, rid);
         }, 5000);
-        if (rid == "") return;
-        // console.log(roomList,2222222);
+        // console.log(showType, imgBese64,showScreenshot,newShowType.current,9999999);
+        //newShowType.current 截图中，不循环
+        if (rid == "" || newShowType.current) return;
         return http.get("".concat(urllocation, "/chat-service/public/v1.0/history-messages"), {
             params: {
                 roomId: rid,
@@ -1505,19 +1524,6 @@ var CustomerService = function(props) {
             }
         }
     };
-    //获取老师列表
-    var getTeacherList = function(keyWord) {
-        http.get("".concat(urllocation, "/chat-service/public/v1.0/teachers"), {
-            params: {
-                name: keyWord
-            }
-        }).then(function(res) {
-            console.log(res);
-            if (res.data) {
-                setTeacherList(res.data.teachers);
-            }
-        });
-    };
     //获取聊天室列表
     var roomsListTimer = function() {
         if (chatRoomList != null) clearTimeout(chatRoomList.current);
@@ -2051,7 +2057,7 @@ var CustomerService = function(props) {
                                             ]
                                         })
                                     }),
-                                    showType == 2 || showType == 4 ? /*#__PURE__*/ _jsx("div", {
+                                    (showType == 2 || showType == 4) && /*#__PURE__*/ _jsx("div", {
                                         className: styles.head_sculpture,
                                         style: {
                                             marginLeft: "12px"
@@ -2059,7 +2065,7 @@ var CustomerService = function(props) {
                                         children: /*#__PURE__*/ _jsx("img", {
                                             src: userData.avatar
                                         })
-                                    }) : ""
+                                    })
                                 ]
                             }, item.id)
                         ]
@@ -2171,28 +2177,7 @@ var CustomerService = function(props) {
                                                                     ]
                                                                 }),
                                                                 //findTeacher//是否在召唤老师过程中，是否是最后一条消息
-                                                                !item.findTeacher && historyMessageList.length - 1 == i && item.id != "123456" && item.id != "123456_date" && renderLastOperateBtn(item, isAiChatWindow, i),
-                                                                //召唤老师回答按钮
-                                                                isAiChatWindow && item.findTeacher && userData.modules.some(function(item) {
-                                                                    return item.short == "TeacherAnswer";
-                                                                }) && /*#__PURE__*/ _jsx("div", {
-                                                                    className: "".concat(styles.operate_modal_bottom, " "),
-                                                                    children: /*#__PURE__*/ _jsx("p", {
-                                                                        className: styles.stop_findTeacher,
-                                                                        children: /*#__PURE__*/ _jsx("span", {
-                                                                            onClick: function() {
-                                                                                setAnswerMode(-1);
-                                                                                setTeacherList([]);
-                                                                                setHistoryMessageList(function(historyMessageList) {
-                                                                                    return historyMessageList.filter(function(item) {
-                                                                                        return item.id != "-1";
-                                                                                    });
-                                                                                });
-                                                                            },
-                                                                            children: "停止召唤老师"
-                                                                        })
-                                                                    })
-                                                                })
+                                                                !item.findTeacher && historyMessageList.length - 1 == i && item.id != "123456" && item.id != "123456_date" && renderLastOperateBtn(item, isAiChatWindow, i)
                                                             ]
                                                         })
                                                     ]
@@ -2238,52 +2223,26 @@ var CustomerService = function(props) {
         if (extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "messageSource" || extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "isVoteMessage") {
             return "";
         }
-        // console.log(historyMessageList,i,'sdcsd;sldcscsdsd')
-        //根据上一行数据，判断是否显示招唤老师按钮
-        var showTeacherBtn = true;
-        var previousLineData = historyMessageList[i - 1];
-        if (!previousLineData) {
-            showTeacherBtn = true;
-        } else if (!previousLineData.extraInfo) {
-            showTeacherBtn = true;
-        } else if (JSON.parse(previousLineData.extraInfo).length > 0 && JSON.parse(previousLineData.extraInfo)[0].key == "imageUrl") {
-            showTeacherBtn = false;
-        }
         return /*#__PURE__*/ _jsxs("p", {
             className: styles.operate,
             children: [
                 // 不在智能客服窗口，并已经点击了召唤老师，并有召唤老师权限
-                isAiChatWindow && answerMode != 1 && userData.modules.some(function(item) {
+                isAiChatWindow && userData.modules.some(function(item) {
                     return item.short == "TeacherAnswer";
-                }) && showTeacherBtn && /*#__PURE__*/ _jsx("span", {
+                }) && /*#__PURE__*/ _jsx("span", {
                     className: styles.ask_question,
                     onClick: function() {
-                        setAnswerMode(1);
+                        console.log(historyMessageList[i - 1], 4444444);
+                        var extraInfo = historyMessageList[i - 1].extraInfo;
+                        var url = "";
+                        if (extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "imageUrl" && JSON.parse(extraInfo)[0].value) {
+                            url = JSON.parse(extraInfo)[0].value;
+                        }
                         setProblem({
                             question: historyMessageList[i - 1].message,
-                            user: problem.user
+                            url: url
                         });
-                        setHistoryMessageList(function(historyMessageList) {
-                            var newHistoryMessageList = historyMessageList.concat({
-                                id: -1,
-                                roomId: roomId,
-                                sender: "AI",
-                                recevier: mid,
-                                message: "请告诉我您要召唤的老师名字",
-                                createdAt: getDataTime(-1),
-                                findTeacher: true,
-                                extraInfo: item.extraInfo == null ? null : JSON.stringify([
-                                    {
-                                        key: "questionId",
-                                        value: "questionId"
-                                    }
-                                ])
-                            });
-                            return newHistoryMessageList;
-                        });
-                        setTimeout(function() {
-                            scrollToBottom();
-                        }, 200);
+                        setShowTeacherList(true);
                     },
                     children: "召唤老师回答"
                 }),
@@ -2296,7 +2255,6 @@ var CustomerService = function(props) {
                         });
                         resettingBottomHei();
                         onEvent(serverName + serverUrl(), "click_智能问答_引用", "提交");
-                        console.log("引用222222");
                     },
                     children: /*#__PURE__*/ _jsx(CustomQuote, {})
                 }),
@@ -2339,7 +2297,6 @@ var CustomerService = function(props) {
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
                         if (!item.upvoted && (historyMessageList.length == i + 1 || historyMessageList.length - 2 == i)) {
-                            console.log("判断是AI还是智能问答", item);
                             if (!item.extraInfo && item.sender == "AI") {
                                 aiSendQuestions(1, {
                                     roomId: roomId,
@@ -2349,7 +2306,6 @@ var CustomerService = function(props) {
                                     generateUpvoteOrDownvoteMessage: true
                                 }, 1);
                             } else {
-                                console.log("AI回答2255555");
                                 sendGreetingMessage(2);
                             }
                         }
@@ -2407,17 +2363,6 @@ var CustomerService = function(props) {
         if (!showStopBtn && isAiChatWindow && (extraInfo != undefined && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "questionId" || extraInfo == null)) {
             findTeacherBtn = true;
         }
-        //根据上一行数据，判断是否显示招唤老师按钮
-        var showTeacherBtn = true;
-        var previousLineData = historyMessageList[i - 1];
-        if (!previousLineData) {
-            showTeacherBtn = true;
-        } else if (!previousLineData.extraInfo) {
-            showTeacherBtn = true;
-        } else if (JSON.parse(previousLineData.extraInfo).length > 0 && JSON.parse(previousLineData.extraInfo)[0].key == "imageUrl") {
-            showTeacherBtn = false;
-        }
-        /// style={{position:showStopBtn && isPosition.current ? 'sticky' : 'relative'}}
         return /*#__PURE__*/ _jsxs("div", {
             className: "".concat(styles.operate_modal_bottom),
             children: [
@@ -2468,35 +2413,19 @@ var CustomerService = function(props) {
                         //在ai窗口并ai已经生成完答案
                         findTeacherBtn && userData.modules.some(function(item) {
                             return item.short == "TeacherAnswer";
-                        }) && showTeacherBtn && /*#__PURE__*/ _jsx("span", {
+                        }) && /*#__PURE__*/ _jsx("span", {
                             className: styles.find_teacher,
                             onClick: function() {
-                                setAnswerMode(1);
+                                var extraInfo = historyMessageList[i - 1].extraInfo;
+                                var url = "";
+                                if (extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "imageUrl" && JSON.parse(extraInfo)[0].value) {
+                                    url = JSON.parse(extraInfo)[0].value;
+                                }
                                 setProblem({
                                     question: historyMessageList[i - 1].message,
-                                    user: problem.user
+                                    url: url
                                 });
-                                setHistoryMessageList(function(historyMessageList) {
-                                    var newHistoryMessageList = historyMessageList.concat({
-                                        id: -1,
-                                        roomId: roomId,
-                                        sender: "AI",
-                                        recevier: mid,
-                                        message: "请告诉我您要召唤的老师名字",
-                                        createdAt: getDataTime(-1),
-                                        findTeacher: true,
-                                        extraInfo: item.extraInfo == null ? null : JSON.stringify([
-                                            {
-                                                key: "questionId",
-                                                value: "questionId"
-                                            }
-                                        ])
-                                    });
-                                    return newHistoryMessageList;
-                                });
-                                setTimeout(function() {
-                                    scrollToBottom();
-                                }, 200);
+                                setShowTeacherList(true);
                             },
                             children: "召唤老师回答"
                         })
@@ -2648,6 +2577,44 @@ var CustomerService = function(props) {
             }
         }
     };
+    //发送截图信息
+    var sendScreenshotData = function(message) {
+        if (contactsList.length > 0 && contactsList[0].roomId == roomId) {
+            setHistoryMessageList(function(historyMessageList) {
+                var newHistoryMessageList = historyMessageList.concat({
+                    id: "p" + new Date().getTime(),
+                    roomId: roomId,
+                    sender: mid,
+                    recevier: "AI",
+                    message: message,
+                    createdAt: getDataTime(-1),
+                    extraInfo: JSON.stringify([
+                        {
+                            key: "imageUrl",
+                            value: screenshotBese64
+                        }
+                    ])
+                });
+                return newHistoryMessageList;
+            });
+            //ai窗口
+            aiSendQuestions(3, {
+                //相关数据
+                roomId: roomId,
+                message: message,
+                image: screenshotBese64,
+                quotedMessage: citationContent.content || "",
+                regenerate: citationContent.content != "" ? false : true,
+                generateUpvoteOrDownvoteMessage: false
+            }, 1);
+            setScreenshotBese64("");
+        } else {
+            //老师窗口
+            sendToTeacher(3, message);
+        }
+        scrollToBottom();
+        resettingBottomHei();
+    };
     //渲染底部按钮
     var renderBottomAnt = function() {
         var placeholder = "";
@@ -2707,35 +2674,7 @@ var CustomerService = function(props) {
                                             children: [
                                                 /*#__PURE__*/ _jsxs("p", {
                                                     onClick: function() {
-                                                        setHistoryMessageList(function(historyMessageList) {
-                                                            var newHistoryMessageList = historyMessageList.concat({
-                                                                id: "p" + new Date().getTime(),
-                                                                roomId: roomId,
-                                                                sender: mid,
-                                                                recevier: "AI",
-                                                                message: "讲解这张图片涉及到的知识内容",
-                                                                createdAt: getDataTime(-1),
-                                                                extraInfo: JSON.stringify([
-                                                                    {
-                                                                        key: "imageUrl",
-                                                                        value: screenshotBese64
-                                                                    }
-                                                                ])
-                                                            });
-                                                            return newHistoryMessageList;
-                                                        });
-                                                        scrollToBottom();
-                                                        aiSendQuestions(3, {
-                                                            //相关数据
-                                                            roomId: roomId,
-                                                            message: "讲解这张图片涉及到的知识内容",
-                                                            image: screenshotBese64,
-                                                            quotedMessage: citationContent.content || "",
-                                                            regenerate: citationContent.content != "" ? false : true,
-                                                            generateUpvoteOrDownvoteMessage: false
-                                                        }, 1);
-                                                        setScreenshotBese64("");
-                                                        resettingBottomHei();
+                                                        sendScreenshotData("讲解这张图片涉及到的知识内容");
                                                     },
                                                     children: [
                                                         /*#__PURE__*/ _jsx(CustomKnowledgeContent, {}),
@@ -2745,35 +2684,7 @@ var CustomerService = function(props) {
                                                 /*#__PURE__*/ _jsx("br", {}),
                                                 /*#__PURE__*/ _jsxs("p", {
                                                     onClick: function() {
-                                                        setHistoryMessageList(function(historyMessageList) {
-                                                            var newHistoryMessageList = historyMessageList.concat({
-                                                                id: "p" + new Date().getTime(),
-                                                                roomId: roomId,
-                                                                sender: mid,
-                                                                recevier: "AI",
-                                                                message: "帮助我更深入地理解图片中的概念",
-                                                                createdAt: getDataTime(-1),
-                                                                extraInfo: JSON.stringify([
-                                                                    {
-                                                                        key: "imageUrl",
-                                                                        value: screenshotBese64
-                                                                    }
-                                                                ])
-                                                            });
-                                                            return newHistoryMessageList;
-                                                        });
-                                                        scrollToBottom();
-                                                        aiSendQuestions(3, {
-                                                            //相关数据
-                                                            roomId: roomId,
-                                                            message: "帮助我更深入地理解图片中的概念",
-                                                            image: screenshotBese64,
-                                                            quotedMessage: citationContent.content || "",
-                                                            regenerate: citationContent.content != "" ? false : true,
-                                                            generateUpvoteOrDownvoteMessage: false
-                                                        }, 1);
-                                                        setScreenshotBese64("");
-                                                        resettingBottomHei();
+                                                        sendScreenshotData("帮助我更深入地理解图片中的概念");
                                                     },
                                                     children: [
                                                         /*#__PURE__*/ _jsx(CustomWenhaoRound, {}),
@@ -2795,22 +2706,14 @@ var CustomerService = function(props) {
                                         setKeyWord(e.target.value);
                                         if (e.target.value == "") {
                                             setQuestionsList([]);
-                                            setTeacherList([]);
                                             clearTimeout(timer.current);
                                         } else {
                                             clearTimeout(timer.current);
                                             timer.current = setTimeout(function() {
-                                                if (answerMode == 1) {
-                                                    getTeacherList(String(e.target.value));
+                                                if (config && config.type == "video") {
+                                                    getQuestiionsList(String(e.target.value), 3);
                                                 } else {
-                                                    var roomList = contactsList;
-                                                    if (roomList.length > 0 && roomList[0].roomId != roomId) return;
-                                                    console.log(props, 333333);
-                                                    if (config && config.type == "video") {
-                                                        getQuestiionsList(String(e.target.value), 3);
-                                                    } else {
-                                                        getQuestiionsList(String(e.target.value), 2);
-                                                    }
+                                                    getQuestiionsList(String(e.target.value), 2);
                                                 }
                                             }, 1000);
                                         }
@@ -2827,44 +2730,21 @@ var CustomerService = function(props) {
                                             setKeyWord("");
                                             setCitationContent({});
                                             setBottomRecommendationQuestions([]);
-                                            resettingBottomHei();
-                                            //查找是否是召唤老师回答并有相应的老师名称
-                                            if (answerMode == 1 && teacherList.length > 0) {
-                                                var list = teacherList.filter(function(v) {
-                                                    return v.name == keyWord.trim();
-                                                });
-                                                if (list.length > 0) {
-                                                    //直接进入召唤老师回答模式
-                                                    enterTeacherChat(list[0]);
-                                                    setButtomHei(45);
-                                                    return;
-                                                }
-                                            }
                                             //跟老师对话
-                                            var roomList = contactsList;
-                                            if (roomList.length > 0 && roomList[0].roomId != roomId) {
+                                            if (contactsList.length > 0 && contactsList[0].roomId != roomId) {
                                                 sendToTeacher(2);
                                             } else {
                                                 setFinished(false);
-                                                clearTimeout(timer.current);
                                                 setQuestionsList([]);
-                                                setAnswerMode(-1);
-                                                setTeacherList([]);
-                                                setTimeout(function() {
-                                                    setQuestionsList([]);
-                                                    setTeacherList([]);
-                                                    clearTimeout(timer.current);
-                                                }, 200);
-                                                setHistoryMessageList(function(historyMessageList) {
-                                                    return historyMessageList.filter(function(item) {
-                                                        return item.id != "-1";
-                                                    });
-                                                });
                                                 sendMessage("", 0);
                                             }
+                                            setTimeout(function() {
+                                                setQuestionsList([]);
+                                                clearTimeout(timer.current);
+                                            }, 200);
+                                            resettingBottomHei();
                                             setButtomHei(45);
                                         } else {
-                                            console.log("回车事件");
                                             resettingBottomHei();
                                         }
                                     },
@@ -2898,9 +2778,9 @@ var CustomerService = function(props) {
                                 })
                             ]
                         }),
-                        userData.modules.some(function(item) {
+                        (userData.modules.some(function(item) {
                             return item.short == "AIservice";
-                        }) && contactsList.length > 0 && contactsList[0].roomId == roomId && /*#__PURE__*/ _jsx("p", {
+                        }) || contactsList.length > 0 && contactsList[0].roomId !== roomId) && /*#__PURE__*/ _jsx("p", {
                             className: styles.screenshot,
                             children: /*#__PURE__*/ _jsx("i", {
                                 className: "".concat(!finished ? styles.disabled : ""),
@@ -2927,40 +2807,20 @@ var CustomerService = function(props) {
                             setCitationContent({});
                             setButtomHei(45);
                             if (keyWord.trim() != "") {
-                                //查找是否是召唤老师回答并有相应的老师名称
-                                if (answerMode == 1 && teacherList.length > 0) {
-                                    var list = teacherList.filter(function(v) {
-                                        return v.name == keyWord.trim();
-                                    });
-                                    if (list.length > 0) {
-                                        //直接进入召唤老师回答模式
-                                        enterTeacherChat(list[0]);
-                                        setButtomHei(45);
-                                        return;
-                                    }
-                                }
                                 setKeyWord("");
                                 //跟老师对话
-                                var roomList = contactsList;
-                                if (roomList.length > 0 && roomList[0].roomId != roomId) {
+                                if (contactsList.length > 0 && contactsList[0].roomId != roomId) {
                                     sendToTeacher(2);
                                 } else {
                                     clearTimeout(timer.current);
                                     setQuestionsList([]);
-                                    setAnswerMode(-1);
-                                    setTeacherList([]);
-                                    setTimeout(function() {
-                                        setQuestionsList([]);
-                                        setTeacherList([]);
-                                        clearTimeout(timer.current);
-                                    }, 200);
-                                    setHistoryMessageList(function(historyMessageList) {
-                                        return historyMessageList.filter(function(item) {
-                                            return item.id != "-1";
-                                        });
-                                    });
                                     sendMessage("", 0);
                                 }
+                                resettingBottomHei();
+                                setTimeout(function() {
+                                    setQuestionsList([]);
+                                    clearTimeout(timer.current);
+                                }, 200);
                                 onEvent(serverName + serverUrl(), "click_智能问答_ Enter", "提交");
                             }
                         },
@@ -2972,15 +2832,12 @@ var CustomerService = function(props) {
     };
     //进入与老师的聊天
     var enterTeacherChat = function(item) {
-        setTeacherList([]);
+        setShowTeacherList(false);
         //提问的问题
-        setProblem({
+        setProblem(_object_spread_props(_object_spread({}, problem), {
             question: problem.question,
             user: item.uid
-        });
-        setKeyWord("");
-        //setUpdateRecords(true);
-        setAnswerMode(-1);
+        }));
         setChatWith(item);
         var roomList = contactsList;
         var list = roomList.filter(function(e) {
@@ -2991,7 +2848,6 @@ var CustomerService = function(props) {
             setRoomId(list[0].roomId); //已有聊天室
         } else {
             createRooms(item.uid).then(function(res) {
-                // childRef.current.roomsListTimer();
                 roomsListTimer();
                 var id = res.data.id;
                 setRoomId(id); //新的聊天室id
@@ -3000,82 +2856,47 @@ var CustomerService = function(props) {
     };
     //渲染联想问题及联想的老师名称
     var renderAssociationProblem = function() {
-        if (answerMode == 1) {
-            return /*#__PURE__*/ _jsx("div", {
-                className: "".concat(styles.issues_list, " ").concat(styles.issues_list_teacherList),
-                style: {
-                    bottom: "".concat(buttomHei + 14, "px")
-                },
-                children: teacherList.map(function(item) {
-                    var reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
-                    var span = "";
-                    //搜索内容是否有特殊字符
-                    if (reg.test(keyWord)) {
-                        span = item.name.replaceAll(keyWord, function(e) {
-                            return "<span class=".concat(styles.sign, ">").concat(e, "</span>");
-                        });
-                    } else {
-                        span = item.name.replaceAll(new RegExp(keyWord, "ig"), function(i) {
-                            // console.log(i,'skdcnsdjk')
-                            return "<span class=".concat(styles.sign, ">").concat(i, "</span>");
-                        });
-                    }
+        return /*#__PURE__*/ _jsx("div", {
+            className: styles.issues_list,
+            style: {
+                bottom: "".concat(buttomHei + 6, "px")
+            },
+            children: questionsList.map(function(item, i) {
+                if (i > 4) return "";
+                var reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+                var span = "";
+                //搜索内容是否有特殊字符
+                if (reg.test(keyWord)) {
+                    span = item.question.replaceAll(keyWord, function(e) {
+                        return "<span class=".concat(styles.sign, ">").concat(e, "</span>");
+                    });
+                } else {
+                    span = item.question.replaceAll(new RegExp(keyWord, "ig"), function(i) {
+                        // console.log(i,'skdcnsdjk')
+                        return "<span class=".concat(styles.sign, ">").concat(i, "</span>");
+                    });
+                }
+                if (userData.modules.some(function(item) {
+                    return item.short == "AIservice";
+                }) || item.answer) {
                     return /*#__PURE__*/ _jsx("p", {
                         className: styles.item,
                         children: /*#__PURE__*/ _jsx("span", {
                             onClick: function() {
-                                enterTeacherChat(item);
+                                sendMessage(item, 2, "AssociativeProblem");
+                                setKeyWord("");
+                                onEvent(serverName + serverUrl(), "click_智能问答_ 发送", "提交");
                             },
                             dangerouslySetInnerHTML: {
                                 __html: span
                             }
                         })
                     });
-                })
-            });
-        } else {
-            return /*#__PURE__*/ _jsx("div", {
-                className: styles.issues_list,
-                style: {
-                    bottom: "".concat(buttomHei + 6, "px")
-                },
-                children: questionsList.map(function(item, i) {
-                    if (i > 4) return "";
-                    var reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
-                    var span = "";
-                    //搜索内容是否有特殊字符
-                    if (reg.test(keyWord)) {
-                        span = item.question.replaceAll(keyWord, function(e) {
-                            return "<span class=".concat(styles.sign, ">").concat(e, "</span>");
-                        });
-                    } else {
-                        span = item.question.replaceAll(new RegExp(keyWord, "ig"), function(i) {
-                            // console.log(i,'skdcnsdjk')
-                            return "<span class=".concat(styles.sign, ">").concat(i, "</span>");
-                        });
-                    }
-                    if (userData.modules.some(function(item) {
-                        return item.short == "AIservice";
-                    }) || item.answer) {
-                        return /*#__PURE__*/ _jsx("p", {
-                            className: styles.item,
-                            children: /*#__PURE__*/ _jsx("span", {
-                                onClick: function() {
-                                    sendMessage(item, 2, "AssociativeProblem");
-                                    setKeyWord("");
-                                    onEvent(serverName + serverUrl(), "click_智能问答_ 发送", "提交");
-                                },
-                                dangerouslySetInnerHTML: {
-                                    __html: span
-                                }
-                            })
-                        });
-                    } else {
-                        return null;
-                    }
-                })
-            });
-        }
+                } else {
+                    return null;
+                }
+            })
+        });
     };
     //视频页面底部推荐问题
     var renderBottomAssociationProblem = function() {
@@ -3251,6 +3072,16 @@ var CustomerService = function(props) {
                             setShowHistory(false);
                         },
                         loadSpecifiedData: loadSpecifiedData
+                    }),
+                    showType == 1 && showTeacherList && /*#__PURE__*/ _jsx(TeacherList, {
+                        type: showType,
+                        userData: userData,
+                        http: http,
+                        urllocation: urllocation,
+                        onClose: function() {
+                            setShowTeacherList(false);
+                        },
+                        enterTeacherChat: enterTeacherChat
                     })
                 ]
             }),
@@ -3338,6 +3169,16 @@ var CustomerService = function(props) {
                                     setShowHistory(false);
                                 },
                                 loadSpecifiedData: loadSpecifiedData
+                            }),
+                            showType == 2 && showTeacherList && /*#__PURE__*/ _jsx(TeacherList, {
+                                type: showType,
+                                userData: userData,
+                                http: http,
+                                urllocation: urllocation,
+                                onClose: function() {
+                                    setShowTeacherList(false);
+                                },
+                                enterTeacherChat: enterTeacherChat
                             })
                         ]
                     })
@@ -3435,6 +3276,16 @@ var CustomerService = function(props) {
                         },
                         loadSpecifiedData: loadSpecifiedData
                     }),
+                    showType == 3 && showTeacherList && /*#__PURE__*/ _jsx(TeacherList, {
+                        type: showType,
+                        userData: userData,
+                        http: http,
+                        urllocation: urllocation,
+                        onClose: function() {
+                            setShowTeacherList(false);
+                        },
+                        enterTeacherChat: enterTeacherChat
+                    }),
                     showType == 3 && /*#__PURE__*/ _jsx("div", {
                         style: {
                             display: "".concat(showType == 3 && showContacts && roomId != "" ? "block" : "none")
@@ -3542,6 +3393,16 @@ var CustomerService = function(props) {
                                             setShowHistory(false);
                                         },
                                         loadSpecifiedData: loadSpecifiedData
+                                    }),
+                                    showTeacherList && /*#__PURE__*/ _jsx(TeacherList, {
+                                        type: showType,
+                                        userData: userData,
+                                        http: http,
+                                        urllocation: urllocation,
+                                        onClose: function() {
+                                            setShowTeacherList(false);
+                                        },
+                                        enterTeacherChat: enterTeacherChat
                                     })
                                 ]
                             })
@@ -3649,6 +3510,7 @@ var CustomerService = function(props) {
             (showType == 5 || showScreenshot) && imgBese64 && /*#__PURE__*/ _jsx(ScreenshotTool, {
                 imgBese64: imgBese64,
                 saveScreenshotBese64: function(base64) {
+                    newShowType.current = false;
                     setScreenshotBese64(base64);
                     if (saveShowType != -1) {
                         setShowType(saveShowType);
@@ -3658,6 +3520,7 @@ var CustomerService = function(props) {
                     setShowScreenshot(false);
                 },
                 cancelScreenshot: function() {
+                    newShowType.current = false;
                     if (saveShowType != -1) {
                         setShowType(saveShowType);
                     } else {