From 19bf3d635a08b619d67898ee667fcb61f209dc5f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 21 Jun 2019 11:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/graduation/tasks/index.js | 38 +++++++++----------
 .../graduation/topics/GraduateTopicDetail.js  |  2 +-
 .../topics/GraduateTopicDetailInfo.js         | 17 +--------
 .../react/src/modules/user/usersInfo/Infos.js | 21 ++++++++--
 4 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index fa86da93d..5553db968 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -744,24 +744,20 @@ class GraduationTasks extends Component{
             </Checkbox.Group>
         </Spin>
 
-          <div className="mb40 edu-txt-center padding20-30"
-               style={
-                 {
-                   display: all_count===undefined?1:all_count< 15 ? 'none' : 'block'
-                 }
-               }
-          >
-            <Pagination
-              showQuickJumper
-              defaultCurrent={1}
-              pageSize={15}
-              total={all_count}
-              current={page}
-
-              onChange={this.PaginationTask}
-            />
-          </div>
-
+          {
+            all_count > 15 && 
+            <div className="mb40 edu-txt-center padding20-30" >
+              <Pagination
+                showQuickJumper
+                defaultCurrent={1}
+                pageSize={15}
+                total={all_count}
+                current={page}
+
+                onChange={this.PaginationTask}
+              />
+            </div>
+          }
           <div className="alltask edu-back-white"
                style={
                  {
@@ -769,9 +765,9 @@ class GraduationTasks extends Component{
                  }
                }
           >
-            <div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
-                                                                          src="https://www.educoder.net/images/educoder/nodata.png" />
-              <p className="edu-nodata-p mb20">暂无数据哦~</p></div>
+          <div className="edu-tab-con-box clearfix edu-txt-center">
+            <img className="edu-nodata-img mb20" src="https://www.educoder.net/images/educoder/nodata.png" />
+            <p className="edu-nodata-p mb20">暂无数据哦~</p></div>
           </div>
 
         <div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index 27c27c64a..2f6a364a5 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -120,7 +120,7 @@ class GraduateTopicDetail extends Component{
               <div className="fl mt6 task_menu_ul ml30">
                 <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.onChangeStatus}>
                   <Menu.Item key="1">选题列表</Menu.Item>
-                  <Menu.Item key="2">课题详情</Menu.Item>
+                  <Menu.Item key="2">选题问答</Menu.Item>
                 </Menu>
               </div>
               {/* null: 未选题 0：待确认 1：已同意 2：已拒绝 */}
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
index f0694964c..b1cfe7c6e 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
@@ -6,7 +6,7 @@ import '../style.css'
 import axios from "axios";
 import GraduateTopicReply from './GraduateTopicReply'
 
-import { ConditionToolTip,markdownToHTML } from 'educoder'
+import { ConditionToolTip,MarkdownToHtml } from 'educoder'
 
 const $=window.$;
 const type={1: "设计",2: "论文", 3: "创作"}
@@ -21,18 +21,6 @@ class GraduateTopicDetailTable extends Component{
       topicInfo:undefined
     }
   }
-  updatamakedown=(id)=>{
-    setTimeout(()=>{
-        var shixunDescr = window.editormd.markdownToHTML(id, {
-            htmlDecode: "style,script,iframe",
-            taskList: true,
-            tex: true,
-            flowChart: true,
-            sequenceDiagram: true
-        });
-        $("#"+id+" p:first").addClass("ReactMarkdown");
-    }, 200)
-  }
   componentDidMount=()=>{
     let course_id=this.props.match.params.course_id;
     let graduation_topic_id=this.props.match.params.graduation_topic_id;
@@ -47,7 +35,6 @@ class GraduateTopicDetailTable extends Component{
     }).catch((error)=>{
       console.log(error);
     })
-    this.updatamakedown("gratuationTopic_Detail");
   }
   render(){
     let{topicInfo}=this.state
@@ -67,7 +54,7 @@ class GraduateTopicDetailTable extends Component{
             <div id="gratuationTopic_Detail" className="new_li markdown-body justify">
               {
                 topicInfo && topicInfo.description!="" &&
-                <span className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(topicInfo.description)}}></span>
+                <MarkdownToHtml  content={topicInfo.description} ></MarkdownToHtml>
               }
             </div>
             {
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 8d77a1b29..e5f1e99dd 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -15,6 +15,8 @@ import "../../courses/css/members.css"
 import "../../courses/css/Courses.css"
 import update from 'immutability-helper'
 
+import Trialapplication from '../../login/Trialapplication'
+
 
 const $ = window.$;
 class Infos extends Component{
@@ -26,7 +28,8 @@ class Infos extends Component{
       is_edit:false,
       sign:undefined,
       type:0,
-      login:undefined
+      login:undefined,
+      isRenders:false
     }
   }
   componentDidMount =()=>{
@@ -44,6 +47,14 @@ class Infos extends Component{
       }
     }
   }
+
+  // 试用申请
+  trialapplications =()=>{
+    this.setState({
+      isRenders: true,
+    })
+  }
+
   //获取个人主页信息
   getInfo = (user_login) =>{
     let url =`/users/${user_login}/homepage_info.json`;
@@ -155,12 +166,16 @@ class Infos extends Component{
       type,
       followed,
       id,
-      login
+      login,
+      isRenders
      }=this.state;
      let {username}= this.props.match.params;
      let {isAdmin}=this.props.isAdmin();
     return(
       <div className="newMain">
+        {
+          isRenders && <Trialapplication {...this.state} />
+        }
         <div className="user-main-half">
           <div className="user-headImg"></div>
           <div className="user-headCon">
@@ -251,7 +266,7 @@ class Infos extends Component{
                         :
                         <a herf="javascript:void(0);" onClick={this.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
                       :
-                      <a herf="javascript:void(0);" onClick="user_apply_trail();" id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
+                      <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
                     }
                   </div> 
                   :