From 8e20a561c30b8ce471f612aaadca58f6882606ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 21:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/message/js/Leftdialogue.js   | 2 +-
 public/react/src/modules/message/js/MessagChat.js     | 4 ++--
 public/react/src/modules/message/js/MessagSub.js      | 6 +++---
 public/react/src/modules/message/js/MessagePrivate.js | 4 ++--
 public/react/src/modules/message/js/Rightdialogue.js  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js
index b16746c70..c809bc9c9 100644
--- a/public/react/src/modules/message/js/Leftdialogue.js
+++ b/public/react/src/modules/message/js/Leftdialogue.js
@@ -53,7 +53,7 @@ class Leftdialogue extends Component{
 				<span className="trangle"></span>
 				<ImageLayerHook parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}>
 				</ImageLayerHook>
-				<div className="sms break_word" id={`Leftdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
+				<div className="sms break_word markdown-body" id={`Leftdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
 				<div className="edu-txt-right mt5">
 					<a  className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除</a>
 				</div>
diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js
index 76057f38a..52c8d9870 100644
--- a/public/react/src/modules/message/js/MessagChat.js
+++ b/public/react/src/modules/message/js/MessagChat.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import "../css/messagemy.css"
-import {getImageUrl} from 'educoder';
+import {getImageUrl,markdownToHTML} from 'educoder';
 import { Modal,Input,Icon,Tooltip,Spin} from 'antd';
 import axios from 'axios';
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
@@ -656,7 +656,7 @@ class MessagChat extends Component{
 												 </p>
 
 
-												     <p className="color-grey-6 lineh-20 justify  break_word task-hide-2 markdown-body" style={{wordBreak:"break-word"}}	id="MakedownHTML" dangerouslySetInnerHTML={{__html:item.content}}>
+												     <p className="color-grey-6 lineh-20 justify  break_word task-hide-2 markdown-body" style={{wordBreak:"break-word"}}	id="MakedownHTML"   dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} >
 														 </p>
 											 </div>
 
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index ea280af75..72a7e373e 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -4,7 +4,7 @@ import {
 	Pagination,
 } from "antd";
 import axios from 'axios';
-import {getImageUrl} from 'educoder';
+import {getImageUrl,markdownToHTML} from 'educoder';
 import "../css/messagemy.css"
 //消息页面
 class MessagSub extends Component{
@@ -471,7 +471,7 @@ class MessagSub extends Component{
 
 			 <li className={typeysl&&typeysl==="apply"?"active":""}><a onClick={(s,i)=>this.getdata("apply",1)}>审核</a></li>
 
-			 <li className={typeysl&&typeysl==="system"?"active":""}><a onClick={(s,i)=>this.getdata("system",1)}>通知</a></li>
+			 <li className={typeysl&&typeysl==="notice"?"active":""}><a onClick={(s,i)=>this.getdata("notice",1)}>通知</a></li>
 
 
 
@@ -537,7 +537,7 @@ class MessagSub extends Component{
 													 	`
 													 }
 												 </style>
-												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html:item.content}}></p>
+												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
 											 </div>
 
 											 <span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index b41ba41a5..036ae99aa 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -5,7 +5,7 @@ import {
 } from "antd";
 import axios from 'axios';
 import moment from 'moment';
-import {getImageUrl} from 'educoder';
+import {getImageUrl,markdownToHTML} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
 //私信页面
@@ -179,7 +179,7 @@ class MessagePrivate extends Component{
 													<span className="color-grey-c mr20">[{item.message_count}{"条"}]</span>
 													<span className="color-grey-c">{moment(item.send_time).fromNow()}</span>
 												</p>
-												<span className="color-grey-6 break_word_firefox  markdown-body" 		dangerouslySetInnerHTML={{__html:item.content}}></span>
+												<span className="color-grey-6 break_word_firefox  markdown-body" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></span>
 
 											</div>
 											{item.unread === true ?<span className="new-point fr mt22"></span>:""}
diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js
index 04c5f966d..a414f5d52 100644
--- a/public/react/src/modules/message/js/Rightdialogue.js
+++ b/public/react/src/modules/message/js/Rightdialogue.js
@@ -53,7 +53,7 @@ class Rightdialogue extends Component{
 				<span className="trangle"></span>
 				<ImageLayerHook parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}>
 				</ImageLayerHook>
-				<div className="sms break_word" id={`Rightdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
+				<div className="sms break_word markdown-body" id={`Rightdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
 				<div className="edu-txt-left mt5">
 					<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)}
 					>删除</a>