From 18566d0b247a102ab5408e9c9df8297c7f00dadf Mon Sep 17 00:00:00 2001
From: harry <harry@fangmingyi.com>
Date: Mon, 23 Mar 2020 16:53:30 +0800
Subject: [PATCH] fix

---
 .../src/components/shixun-card-list/index.jsx |  9 +--
 .../modules/comment/CommentItemKEEditor.js    | 65 ++++++++-----------
 public/react/src/modules/home/index.jsx       |  2 +-
 public/react/src/modules/tpm/NewHeader.js     | 41 +-----------
 4 files changed, 35 insertions(+), 82 deletions(-)

diff --git a/public/react/src/components/shixun-card-list/index.jsx b/public/react/src/components/shixun-card-list/index.jsx
index 28c229c82..d2b6b64b8 100644
--- a/public/react/src/components/shixun-card-list/index.jsx
+++ b/public/react/src/components/shixun-card-list/index.jsx
@@ -1,5 +1,6 @@
 import React, { Fragment } from 'react'
 import { getImageUrl, setImagesUrl } from 'educoder';
+import { Link } from 'react-router-dom'
 import { Tooltip, Rate } from 'antd';
 import './index.less'
 
@@ -30,15 +31,15 @@ export default ({ list = [] }) => {
                 <p className="font-14 color-white">非试用内容，需要授权</p>
               </div>
             }
-            <a href={"/shixuns/" + identifier + "/challenges"} className="square-img" target="_blank">
+            <Link to={"/shixuns/" + identifier + "/challenges"} className="square-img" target="_blank">
               <img src={setImagesUrl(`${pic}`)} />
-            </a>
+            </Link>
 
             <div className="square-main">
               <p className="task-hide">
-                <a href={"/shixuns/" + identifier + "/challenges"} className="justify color-grey-name" title={name} target="_blank">
+                <Link to={"/shixuns/" + identifier + "/challenges"} className="justify color-grey-name" title={name} target="_blank">
                   {name}
-                </a>
+                </Link>
               </p>
 
               <p className="clearfix mt8 ml-3">
diff --git a/public/react/src/modules/comment/CommentItemKEEditor.js b/public/react/src/modules/comment/CommentItemKEEditor.js
index 2425357a1..d9fecdc04 100644
--- a/public/react/src/modules/comment/CommentItemKEEditor.js
+++ b/public/react/src/modules/comment/CommentItemKEEditor.js
@@ -1,21 +1,13 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
 
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-const $ = window.$;
 const _origin = window.location.origin;
 
 class CommentItemKEEditor extends Component {
 
 	componentDidUpdate(prevProps) {
 		const { item, currentReplyComment } = this.props;
-		if ( prevProps.showReplyEditorFlag != this.props.showReplyEditorFlag && 
-			currentReplyComment && currentReplyComment.id == item.id ) {
+		if (prevProps.showReplyEditorFlag != this.props.showReplyEditorFlag &&
+			currentReplyComment && currentReplyComment.id == item.id) {
 			this.showOrHideEditor(currentReplyComment)
 		}
 	}
@@ -28,45 +20,42 @@ class CommentItemKEEditor extends Component {
 		var id = comment.id
 		var reply_message_el = `#reply_message_${id}`
 		var reply_iconup_el = `#reply_iconup_${id}`
-		if($(reply_message_el).html() == "") {
-		    $(".reply_to_message").html("");
-		    $(reply_message_el).html(`<div className=\"orig_reply_box borderBottomNone reply_to_message\" id=\"reply_to_message_${id}\">\n      <div class=\"homepagePostReplyPortrait mr15 imageFuzzy fl\" id=\"reply_image_${id}\"><a href=\"${user.user_url}\" target=\"_blank\" alt=\"用户头像\"><img alt=\"0?1442652658\" height=\"33\" src=\"${_origin}/images/${user.image_url}\" width=\"33\" /><\/a><\/div>\n      <div class=\"orig_textarea fl\" style=\"margin-bottom: 0px\">\n        <div nhname=\'new_message_${id}\'>\n              <form accept-charset=\"UTF-8\" action=\"/discusses?challenge_id=118&amp;dis_id=61&amp;dis_type=Shixun\" data-remote=\"true\" id=\"new_comment_form\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input name=\"authenticity_token\" type=\"hidden\" value=\"HJTbMpfI8LKUpwghfkvgB2SaMmcIVyVdAezyKmzJ7FU=\" /><\/div>\n                  <input type=\"hidden\" id=\"dis_reply_id\" name=\"reply_id\" value=\"${id}\">\n                  <div nhname=\'toolbar_container_${id}\'><\/div>\n                  <textarea placeholder=\"有问题或有建议，请直接给我留言吧！\" id=\"comment_news_${id}\" style=\"display: none\" nhname=\'new_message_textarea_${id}\' name=\"content\"><\/textarea>\n                  <a id=\"new_message_submit_btn_${id}\" href=\"javascript:void(0)\" onclick=\"this.style.display=\'none\'\" class=\"mt10 task-btn task-btn-orange fr\">发送<\/a>\n                  <div class=\"cl\"><\/div>\n                  <p nhname=\'contentmsg_${id}\'><\/p>\n<\/form>        <\/div>\n        <div class=\"cl\"><\/div>\n      <\/div>\n  <div class=\"cl\"><\/div>\n<\/div>\n`);	//" ide语法识别
-		    $(reply_iconup_el).show();
-		    $(function(){
-		        window.sd_create_editor_from_data(id ,null,"100%", "Discuss");
-		    });
-			
-		}else {
+		if ($(reply_message_el).html() == "") {
+			$(".reply_to_message").html("");
+			$(reply_message_el).html(`<div className=\"orig_reply_box borderBottomNone reply_to_message\" id=\"reply_to_message_${id}\">\n      <div class=\"homepagePostReplyPortrait mr15 imageFuzzy fl\" id=\"reply_image_${id}\"><a href=\"${user.user_url}\" target=\"_blank\" alt=\"用户头像\"><img alt=\"0?1442652658\" height=\"33\" src=\"${_origin}/images/${user.image_url}\" width=\"33\" /><\/a><\/div>\n      <div class=\"orig_textarea fl\" style=\"margin-bottom: 0px\">\n        <div nhname=\'new_message_${id}\'>\n              <form accept-charset=\"UTF-8\" action=\"/discusses?challenge_id=118&amp;dis_id=61&amp;dis_type=Shixun\" data-remote=\"true\" id=\"new_comment_form\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input name=\"authenticity_token\" type=\"hidden\" value=\"HJTbMpfI8LKUpwghfkvgB2SaMmcIVyVdAezyKmzJ7FU=\" /><\/div>\n                  <input type=\"hidden\" id=\"dis_reply_id\" name=\"reply_id\" value=\"${id}\">\n                  <div nhname=\'toolbar_container_${id}\'><\/div>\n                  <textarea placeholder=\"有问题或有建议，请直接给我留言吧！\" id=\"comment_news_${id}\" style=\"display: none\" nhname=\'new_message_textarea_${id}\' name=\"content\"><\/textarea>\n                  <a id=\"new_message_submit_btn_${id}\" href=\"javascript:void(0)\" onclick=\"this.style.display=\'none\'\" class=\"mt10 task-btn task-btn-orange fr\">发送<\/a>\n                  <div class=\"cl\"><\/div>\n                  <p nhname=\'contentmsg_${id}\'><\/p>\n<\/form>        <\/div>\n        <div class=\"cl\"><\/div>\n      <\/div>\n  <div class=\"cl\"><\/div>\n<\/div>\n`);	//" ide语法识别
+			$(reply_iconup_el).show();
+			$(function () {
+				window.sd_create_editor_from_data(id, null, "100%", "Discuss");
+			});
+
+		} else {
 			if ($(reply_message_el).is(':visible')) {
 				$(reply_message_el).hide();
 			} else {
 				$(reply_message_el).show();
 			}
-		    // $(reply_message_el).html("");
-		    
-		    // $(reply_iconup_el).hide();
 		}
 		// 自动focus
-		setTimeout(()=>{
-			var iframe =$(`#reply_to_message_${id}`).find('iframe')[0]
+		setTimeout(() => {
+			var iframe = $(`#reply_to_message_${id}`).find('iframe')[0]
 			iframe && iframe.contentDocument.body.focus()
 		}, 200)
-		
+
 	}
 
-  	render() {
-  		const { match, history, item, user } = this.props
-  		if (!item) {
-  			return <div></div>
-  		}
+	render() {
+		const { match, history, item, user } = this.props
+		if (!item) {
+			return <div></div>
+		}
 
-      	return (
-      		<div>
-              	<div className="cl"></div>
-              	<div id={`reply_message_${item.id}`} className="reply_to_message"></div>
-            </div>
-      	);
-  	}
+		return (
+			<div>
+				<div className="cl"></div>
+				<div id={`reply_message_${item.id}`} className="reply_to_message"></div>
+			</div>
+		);
+	}
 }
 
-export default ( CommentItemKEEditor );
+export default (CommentItemKEEditor);
diff --git a/public/react/src/modules/home/index.jsx b/public/react/src/modules/home/index.jsx
index 7c34c0ba1..611265b18 100644
--- a/public/react/src/modules/home/index.jsx
+++ b/public/react/src/modules/home/index.jsx
@@ -5,7 +5,7 @@ import Loading from '../../components/loading'
 import ShixunCardList from '../../components/shixun-card-list'
 import TPMIndexHOC from '../tpm/TPMIndexHOC'
 import ListContainer from './list-container'
-import { SnackbarHOC, getImageUrl, configShareForIndex } from 'educoder'
+import { SnackbarHOC } from 'educoder'
 import ShixunPathCard from '../paths/ShixunPathCard'
 import { Carousel } from 'antd'
 import { getUrl } from 'educoder'
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index a92a2d687..3f1f698b4 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -492,8 +492,6 @@ class NewHeader extends Component {
         return
       }
     }
-    // console.log("点击了503")
-    // console.log(url);
     let { user } = this.state;
 
     if (user === undefined) {
@@ -525,16 +523,9 @@ class NewHeader extends Component {
       }
     }
 
-
-
-
-
-
     if (url !== undefined || url !== "") {
       window.location.href = url;
     }
-
-
   }
 
   //修改登录方法
@@ -586,7 +577,6 @@ class NewHeader extends Component {
     document.head.appendChild(link);
   }
 
-
   handleVisibleChanges = (boll) => {
     this.setState({
       visiblemyss: boll,
@@ -594,15 +584,10 @@ class NewHeader extends Component {
 
   }
 
-
   getAppdata = () => {
     try {
       var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
       var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
-      // console.log("NewHeaderNewHeaderNewHeader");
-      // console.log(chromesettingArray);
-      // console.log(chromesettingresponseArray);
-
       this.setState({
         mygetHelmetapi2: chromesettingArray
       });
@@ -620,8 +605,6 @@ class NewHeader extends Component {
   geturlsdata = () => {
     let url = "/setting.json";
     axios.get(url).then((response) => {
-      // console.log("app.js开始请求/setting.json");
-      // console.log("获取当前定制信息");
       if (response) {
         if (response.data) {
           this.setState({
@@ -689,7 +672,6 @@ class NewHeader extends Component {
     })
   }
   render() {
-    const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
     const { match } = this.props;
 
     let { Addcoursestypes,
@@ -740,14 +722,9 @@ class NewHeader extends Component {
 
     let headtypes = '/';
 
-    // console.log("mygetHelmetapi2");
-    // console.log(mygetHelmetapi2);
     if (mygetHelmetapi2) {
       if (mygetHelmetapi2.navbar) {
         if (mygetHelmetapi2.navbar.length > 0) {
-          // console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
-          //
-          // console.log(match.path);
           if (match.path === '/') {
             if (headtypesonClickbool === false) {
               headtypes = undefined;
@@ -767,9 +744,6 @@ class NewHeader extends Component {
       }
     }
 
-    // console.log(mygetHelmetapi2);
-    // console.log("NewHeadermygetHelmetapi123123123123");
-
     let shixuntype = false;
     let pathstype = false;
     let coursestypes = false;
@@ -860,7 +834,7 @@ class NewHeader extends Component {
             ""
         }
 
-        <a href={"/"} onClick={() => this.headtypesonClick("/", false)} className={"fl mr30 ml25 mt10"}>
+        <Link to={"/"} className={"fl mr30 ml25 mt10"}>
           {
             mygetHelmetapi2 === null ?
               ""
@@ -870,19 +844,8 @@ class NewHeader extends Component {
                 :
                 <img alt="高校智能化教学与实训平台" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
           }
-        </a>
-
-        <style>
-          {
-            `
-						.educontents{
-							margin: 0px auto;
-							box-sizing: border-box;
+        </Link>
 
-						}
-						`
-          }
-        </style>
         {
           mygetHelmetapi2 === null ?
             "" :