Merge branch 'develop' into dev_aliyun

app/controllers/admins/shixun_settings_controller.rb

@@ -18,7 +18,7 @@ class Admins::ShixunSettingsController < Admins::BaseController
       task_pass: params[:task_pass].present? ? params[:task_pass] : false,
       code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false,
       vip: params[:vip].present? ? params[:vip] : false,
-      is_wechat_support: params[:is_wechat_support].present? ? params[:is_wechat_support] : false
+      no_subject: params[:no_subject].present? ? params[:no_subject] : false
     }
 
     @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
@@ -135,6 +135,6 @@ class Admins::ShixunSettingsController < Admins::BaseController
 
   def setting_params
     params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,
-                  :code_hidden,:vip,:page_no,:id, :is_wechat_support)
+                  :code_hidden,:vip,:page_no,:id, :no_subject)
   end
 end

app/controllers/admins/subject_settings_controller.rb

@@ -8,12 +8,6 @@ class Admins::SubjectSettingsController < Admins::BaseController
   end
 
   def update
-    # 为了复用代码
-    if params["show_moblie"]
-      subject.find(params[:id]).update_attributes(:show_moblie => params[:show_moblie])
-      return
-    end
-
     sub_discipline_ids = params[:sub_disciplines] || []
     sub_ids = sub_discipline_ids.reject(&:blank?).map(&:to_i)
     old_sub_ids = current_subject.sub_discipline_containers.pluck(:sub_discipline_id)

app/controllers/bind_users_controller.rb

@@ -4,19 +4,32 @@ class BindUsersController < ApplicationController
   def create
     # user = CreateBindUserService.call(create_params)
     #
-
+    if params[:type] == "qq"
-    raise Error, '系统错误' if session_unionid.blank?
+      begin
-
+        user = CreateBindUserService.call(current_user, create_params)
-    bind_user = User.try_to_login(params[:username], params[:password])
+        successful_authentication(user) if user.id != current_user.id
-    raise Error, '用户名或者密码错误' if bind_user.blank?
+
-    raise Error, '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
+        render_ok
-
+      rescue ApplicationService::Error => ex
-    OpenUsers::Wechat.create!(user: bind_user, uid: session_unionid)
+        render_error(ex.message)
-    successful_authentication(bind_user)
+      end
-
+    else
-    render_ok
+      begin
-  rescue ApplicationService::Error => ex
+        tip_exception '系统错误' if session[:unionid].blank?
-    render_error(ex.message)
+
+        bind_user = User.try_to_login(params[:username], params[:password])
+        tip_exception '用户名或者密码错误' if bind_user.blank?
+        tip_exception '用户名或者密码错误' unless bind_user.check_password?(params[:password].to_s)
+        tip_exception '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
+
+        OpenUsers::Wechat.create!(user: bind_user, uid: session[:unionid])
+        successful_authentication(bind_user)
+
+        render_ok
+      rescue Exception => e
+        render_error(e.message)
+      end
+    end
   end
 
   def new_user

app/controllers/oauth/wechat_controller.rb

@@ -1,11 +1,32 @@
 class Oauth::WechatController < Oauth::BaseController
   def create
-    user, new_user = Oauth::CreateOrFindWechatAccountService.call(current_user ,params)
+    # user, new_user = Oauth::CreateOrFindWechatAccountService.call(current_user ,params)
 
-    successful_authentication(user) if !new_user
+    begin
+      code = params['code'].to_s.strip
+      tip_exception("code不能为空") if code.blank?
+      new_user = false
 
-    render_ok(new_user: new_user)
+      result = WechatOauth::Service.access_token(code)
-  rescue Oauth::CreateOrFindWechatAccountService::Error => ex
+      result = WechatOauth::Service.user_info(result['access_token'], result['openid'])
-    render_error(ex.message)
+
+      # 存在该用户
+      open_user = OpenUsers::Wechat.find_by(uid: result['unionid'])
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+      else
+        if current_user.blank? || !current_user.logged?
+          new_user = true
+          set_session_openid(result['openid'])
+          set_session_unionid(result['unionid'])
+        else
+          OpenUsers::Wechat.create!(user: current_user, uid: result['unionid'])
+        end
+      end
+
+      render_ok(new_user: new_user)
+    rescue WechatOauth::Error => ex
+      render_error(ex.message)
+    end
   end
 end

app/models/salesman_channel.rb

@@ -6,23 +6,20 @@ class SalesmanChannel < ApplicationRecord
     school.name
   end
 
-  def teacher_count(start_time, end_time, keyword)
+  def teacher_count
-    UserExtension.joins(:school).where("schools.name like '%#{keyword}%' and user_extensions.identity=0
+    UserExtension.where(school_id: school_id).where.not(identity: 1).count
-                                        and user_extensions.created_at between '#{start_time}' and '#{end_time}'").count
-    # UserExtension.where(school_id: school_id).where(query).count
   end
 
-  def student_count(start_time, end_time, keyword)
+  def student_count
-    UserExtension.joins(:school).where("schools.name like '%#{keyword}%' and user_extensions.identity=1
+    UserExtension.where(school_id: school_id, identity: 1).count
-                                        and user_extensions.created_at between '#{start_time}' and '#{end_time}'").count
   end
 
-  def course_count(start_time, end_time, keyword)
+  def course_count
-    Course.joins(:school).where("schools.name like '%#{keyword}%' and courses.created_at between '#{start_time}' and '#{end_time}'").count
+    Course.where(school_id: school_id).count
   end
 
-  def shixuns_count(start_time, end_time, keyword)
+  def shixuns_count
-    ShixunMember.joins("join user_extensions on user_extensions.user_id = shixun_members.user_id and shixun_members.created_at between '#{start_time}' and '#{end_time}'")
+    ShixunMember.joins("join user_extensions on user_extensions.user_id = shixun_members.user_id")
         .where(user_extensions: {school_id: school_id}).pluck(:shixun_id).uniq.count
   end
 

app/queries/admins/shixun_settings_query.rb

@@ -51,7 +51,10 @@ class Admins::ShixunSettingsQuery < ApplicationQuery
     all_shixuns = all_shixuns.where(task_pass: params[:task_pass]) if params[:task_pass]
     all_shixuns = all_shixuns.where(code_hidden: params[:code_hidden]) if params[:code_hidden]
     all_shixuns = all_shixuns.where(vip: params[:vip]) if params[:vip]
-    all_shixuns = all_shixuns.where(is_wechat_support: params[:is_wechat_support]) if params[:is_wechat_support]
+    if params[:no_subject]
+      shixun_ids = StageShixun.pluck(:shixun_id).uniq
+      all_shixuns = all_shixuns.published.where.not(id: shixun_ids)
+    end
 
     custom_sort(all_shixuns, params[:sort_by], params[:sort_direction])
   end

app/services/create_bind_user_service.rb

@@ -17,6 +17,7 @@ class CreateBindUserService < ApplicationService
 
     bind_user = User.try_to_login(params[:username], params[:password])
     raise Error, '用户名或者密码错误' if bind_user.blank?
+    raise Error, '用户名或者密码错误' unless bind_user.check_password?(params[:password].to_s)
     raise Error, '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
 
     ActiveRecord::Base.transaction do

app/views/admins/salesman_channels/index.html.erb

@@ -2,32 +2,12 @@
   <% add_admin_breadcrumb("#{@salesman.name}的渠道", admins_salesmans_path) %>
 <% end %>
 
-<% define_admin_breadcrumbs do %>
+<div class="box search-form-container salesman-channel-list-form rig">
-  <% add_admin_breadcrumb('数据变化报表', admins_school_statistics_path) %>
+  <div class="flex-1">
-<% end %>
-
-<div class="box search-form-container saleman-channel-list-form">
-  <form class="form-inline search-form d-flex" data-search-form-url="<%= admins_salesman_channels_path %>">
-    <div class="time-select">
-      <div class="form-group grow-date-container">
-        <div class="input-group input-daterange grow-date-input-daterange">
-          <%= text_field_tag :start_date, params[:start_date], class: 'form-control start-date mx-0', placeholder: '开始时间' %>
-          <div class="input-group-prepend"><span class="input-group-text">到</span></div>
-          <%= text_field_tag :end_date, params[:start_date], class: 'form-control end-date mx-0', placeholder: '结束时间' %>
-        </div>
-      </div>
-
-    </div>
-    <%= text_field_tag :keyword, params[:keyword], placeholder: 'ID/单位名称检索', class: 'form-control mx-3 search-input' %>
-
-    <%= javascript_void_link '搜索', class: 'btn btn-primary search-btn', target: '' %>
-  </form>
-  <div class="flex-12">
     <%= javascript_void_link '新增渠道', class: 'btn btn-primary', data: {salesman_id: @salesman.id, toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %>
   </div>
 </div>
 
-
 <div class="box admin-list-container salesman-channel-list-container">
   <%= render(partial: 'admins/salesman_channels/shared/list') %>
 </div>

app/views/admins/salesman_channels/shared/_list.html.erb

@@ -19,16 +19,16 @@
           <span><%= channel.school_name %></span>
         </td>
         <td class="text-left">
-          <span><%= channel.teacher_count(@start_time, @end_time, @keyword)  %></span>
+          <span><%= channel.teacher_count %></span>
         </td>
         <td class="text-left">
-          <span><%= channel.student_count(@start_time, @end_time, @keyword)  %></span>
+          <span><%= channel.student_count %></span>
         </td>
         <td>
-          <%=  channel.course_count(@start_time, @end_time, @keyword)  %>
+          <%=  channel.course_count %>
         </td>
         <td>
-          <%= channel.shixuns_count(@start_time, @end_time, @keyword)   %>
+          <%= channel.shixuns_count  %>
         </td>
         <td>
           <%= delete_link '删除', admins_salesman_channel_path(channel, salesman_id: channel.salesman_id, element: ".salesman-channel-item-#{channel.id}"), class: 'delete-salesman-action' %>

app/views/admins/shixun_settings/index.html.erb

@@ -73,8 +73,8 @@
         </div>
         <div class="mr-5">
           <label for="is_wechat_support">
-            <%= check_box_tag :is_wechat_support, !@sort_json[:is_wechat_support],@sort_json[:is_wechat_support], class:"shixun-settings-select" %>
+            <%= check_box_tag :no_subject, !@sort_json[:no_subject],@sort_json[:no_subject], class:"shixun-settings-select" %>
-            <span class="only_view">只看小程序可用</span>
+            <span class="only_view">已发布没关联课程</span>
           </label>
         </div>
 

db/migrate/20200223021427_sync_subjectds_mobile.rb

@@ -0,0 +1,7 @@
+class SyncSubjectdsMobile < ActiveRecord::Migration[5.2]
+  def change
+    SubDisciplineContainer.find_each do |sc|
+      subject.find(sc.container_id).update_column(:show_mobile => true)
+    end
+  end
+end

public/react/package.json

@@ -93,6 +93,8 @@
     "rsuite": "^4.0.1",
     "sass-loader": "7.3.1",
     "scroll-into-view": "^1.12.3",
+    "showdown": "^1.9.1",
+    "showdown-katex": "^0.6.0",
     "store": "^2.0.12",
     "style-loader": "0.19.0",
     "styled-components": "^4.1.3",

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -1,29 +1,16 @@
+import '../katex.css';
+import '../css/Courses.css';
 import React,{Component} from "react";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
+import {markdownToHTML, ImageLayer2 } from 'educoder';
-import {Link} from 'react-router-dom';
-import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, MarkdownToHtml, markdownToHTML, ImageLayer2 } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
-import CoursesListType from '../coursesPublic/CoursesListType';
-import HomeworkModal from "../coursesPublic/HomeworkModal";
-import CheckAllGroup from '../common/button/CheckAllGroup'
 import moment from 'moment';
-import CheckCodeModal from '../coursesPublic/modal/CheckCodeModal'
-import '../css/Courses.css'
 import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import CommonWorkAppraiseReply from './reply/CommonWorkAppraiseReply'
-import Example from './TestHooks'
 import CommonWorkAppraiseReviseAttachments from './CommonWorkAppraiseReviseAttachments'
-import LeaderIcon from './common/LeaderIcon'
+import LeaderIcon from './common/LeaderIcon';
-const { Option} = Select;
+import showdown from 'showdown'
-const CheckboxGroup = Checkbox.Group;
+import showdownKatex from 'showdown-katex'
-const confirm = Modal.confirm;
-
-const $ = window.$;
-const Search = Input.Search;
-const RadioGroup = Radio.Group;
-
 class CommonWorkAppraise extends Component{
 
   constructor(props){
@@ -56,22 +43,28 @@ class CommonWorkAppraise extends Component{
        console.log(error)
      })
   }
-  getSupplyAttachments = () => {
+  exportMdtoHtml=(md)=> {
-    let workId =this.props.match.params.workId;
+    let newmd=md;
-    let studentWorkId =this.props.match.params.studentWorkId;
+    newmd=newmd.replace(/TOC/g, '');
-
+    newmd=newmd.replace(/\[|]/g,'');
-    const url = `/student_works/${studentWorkId}/supply_attachments.json`
+    newmd=newmd.replace(/`/g, '');
-
+    newmd=newmd.replace(/`/g, '');
-    axios.get(url).then((result)=> {
+    newmd=newmd.replace(/"/g, '');
-      if (result.data.course_id) {
+    newmd=newmd.replace(/"/g, '');
-
+    newmd=newmd.replace(/"/g, '');
-        this.setState({
+    const converter = new showdown.Converter({
-          ...result.data
+      extensions: [
-        })
+        showdownKatex({
-      }
+          // maybe you want katex to throwOnError
-     }).catch((error)=>{
+          throwOnError: true,
-       console.log(error)
+          // disable displayMode
-     })
+          displayMode: false,
+          // change errorColor to blue
+          errorColor: '#1500ff',
+        }),
+      ],
+    });
+    return converter.makeHtml(newmd);
   }
   getReviseAttachments = () => {
     let studentWorkId =this.props.match.params.studentWorkId;
@@ -99,22 +92,6 @@ class CommonWorkAppraise extends Component{
   componentDidMount() {
     this.getWork();
     this.getReviseAttachments()
-
-    let workId =this.props.match.params.workId;
-    let studentWorkId =this.props.match.params.studentWorkId;
-    // const url = `/student_works/${studentWorkId}/comment_list.json`
-
-    // axios.get(url).then((result)=> {
-    //   if (result.data.course_id) {
-
-    //     this.setState({
-    //       ...result.data
-    //     })
-    //   }
-
-    //  }).catch((error)=>{
-    //    console.log(error)
-    //  })
   }
 
   onAttachmentRemove = (id) => {
@@ -205,7 +182,7 @@ class CommonWorkAppraise extends Component{
             <div className={"color-grey-6 mb15 font-16"}>
               内容
             </div>
-            <div className="markdown-body ml20" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
+            <div className="markdown-body ml20" dangerouslySetInnerHTML={{__html: this.exportMdtoHtml(description)}}>
             </div>
 
             {attachments.map((item,key)=>{

public/react/src/modules/courses/common/comments/CCommentItem.js

@@ -1,9 +1,12 @@
+import '../../katex.css';
 import React,{ Component } from "react";
 import { getImageUrl, markdownToHTML, WordsBtn, getUrl } from 'educoder';
-import { Tooltip } from  'antd'
+import { Tooltip } from  'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor'
+import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
+import axios from 'axios';
-import moment from 'moment'
+import moment from 'moment';
+import showdown from 'showdown';
+import showdownKatex from 'showdown-katex';
 const _origin = ''
 /**
 	https://www.showdoc.cc/127895880302646?page_id=1962215317836957
@@ -14,7 +17,7 @@ const REFUSE = 4
 class CCommentItem extends Component{
   constructor(props){
     super(props);
-    
+
 	this.state = {
       show_reply: false,
       show_appeal: false,
@@ -46,7 +49,7 @@ class CCommentItem extends Component{
     		let { item, commentIndex }=this.props;
 
         const url = `/student_works/${studentWorkId}/cancel_appeal.json`
-        axios.post(url, { 
+        axios.post(url, {
             score_id: item.id
           })
         .then((response) => {
@@ -57,7 +60,7 @@ class CCommentItem extends Component{
         })
         .catch(function (error) {
           console.log(error);
-        });    
+        });
       }
     })
 	}
@@ -77,7 +80,7 @@ class CCommentItem extends Component{
 			comment: this.state.secondReplyContent
 		}).then((result)=>{
 			if(result.data.status == 0){
-				this.props.replySuccess()				
+				this.props.replySuccess()
 				this.cancelReply()
 			}
 		}).catch((error)=>{
@@ -92,7 +95,7 @@ class CCommentItem extends Component{
 			if(result.data.status == 0){
 				this.props.replySuccess()
 				this.cancelAppeal()
-				
+
 			}
 		}).catch((error)=>{
 			console.log(error)
@@ -118,14 +121,14 @@ class CCommentItem extends Component{
         })
         .catch(function (error) {
           console.log(error);
-        });    
+        });
       }
     })
   }
 	on_deal_appeal_score = (mode, item) => {
 	  this.props.confirm({
       // content: `确认要删除所选的${len}个帖子吗？`,
-      content: 
+      content:
 	  	<div>
 			<div>{mode == ACCEPT ? '此匿评成绩将被废弃，评阅人的作品将被违规扣分' : '此匿评成绩将被认为合理'}</div>
 			<div>是否确认{mode == ACCEPT ? '接受申诉' : '拒绝申诉'}</div>
@@ -146,13 +149,39 @@ class CCommentItem extends Component{
         })
         .catch(function (error) {
           console.log(error);
-        });    
+        });
       }
     })
   }
+
   parseCommentContent = (oldContent) => {
 		return markdownToHTML(oldContent);
   }
+
+  exportMdtoHtml=(md)=> {
+  	let newmd=md;
+		newmd=newmd.replace(/TOC/g, '');
+		newmd=newmd.replace(/\[|]/g,'');
+		newmd=newmd.replace(/`/g, '');
+		newmd=newmd.replace(/`/g, '');
+		newmd=newmd.replace(/"/g, '');
+		newmd=newmd.replace(/"/g, '');
+		newmd=newmd.replace(/"/g, '');
+		const converter = new showdown.Converter({
+			extensions: [
+				showdownKatex({
+					// maybe you want katex to throwOnError
+					throwOnError: true,
+					// disable displayMode
+					displayMode: false,
+					// change errorColor to blue
+					errorColor: '#1500ff',
+				}),
+			],
+		});
+		return converter.makeHtml(newmd);
+	}
+
   renderChildenComments = (parent) => {
     if (parent.journals.length == 0) {
 			return '';
@@ -172,19 +201,19 @@ class CCommentItem extends Component{
 		// is_appeal_info true 是匿评人匿评信息，需要统一使用头像去掉链接
 		return parent.journals.map(item => {
 			// <div>{item.content} {item.user_info.user_name}</div>
-								
+
 			// src={getImageUrl(`images/${item.image_url}`)}
 			const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `edu_user/anony.png` : item.user_info.user_image_url;
 			return (
 				<div className="comment_item_cont appraise df clearfix" key={item.id}>
 					<div className="J_Comment_Face fl">
-						{item.is_appeal_info == true ? 
+						{item.is_appeal_info == true ?
 							<a href={`javascript:void(0)`} target="_blank">
-								<img alt="用户头像" height="50" 
+								<img alt="用户头像" height="50"
 									src={`${getUrl()}/images/edu_user/anony.png`} width="50"/>
 							</a>
 						: <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank">
-							<img alt="用户头像" height="50" 
+							<img alt="用户头像" height="50"
 								src={`${getImageUrl(`images/`+imgSrc)}`}
 							width="50"/>
 						</a>}
@@ -204,21 +233,21 @@ class CCommentItem extends Component{
 											</a>}
 
 										<span className="t_area fl">{moment(item.time).format('YYYY-MM-DD HH:mm')}</span>
-										{item.is_appeal_info && (item.appeal_status == 1 ? 
+										{item.is_appeal_info && (item.appeal_status == 1 ?
-										<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉中</span> : 
+										<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉中</span> :
-										  item.appeal_status == 2 ? 
+										  item.appeal_status == 2 ?
 										<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉已撤销</span> :
-										  item.appeal_status == 3 ? 
+										  item.appeal_status == 3 ?
 										<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉成功</span> :
-										  item.appeal_status == 4 ? 
+										  item.appeal_status == 4 ?
 										<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉被拒绝</span> :
-										  item.appeal_status == 5 ? 
+										  item.appeal_status == 5 ?
 										<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉失败</span> : '')
-										} 
+										}
-										
+
-										
+
 										{/* fr */}
-										{/* { item.is_invalid ? <span className="validate_area fr">失效</span> : 
+										{/* { item.is_invalid ? <span className="validate_area fr">失效</span> :
 										<React.Fragment> */}
 										{!item.is_appeal_info && item.can_delete == true && <Tooltip title="删除">
 											<i className="iconfont icon-shanchu mr5 fr font-14" onClick={() => this.onDeleteSecondReply(item)}
@@ -233,19 +262,19 @@ class CCommentItem extends Component{
 										</React.Fragment>}
 										{item.appeal_status == 1 &&	this.props.is_author == true && this.props.isStudent()===true &&
 											<WordsBtn style="blue" className="fr mr5" onClick={() => this.cancelMyAppeal()}>撤销申诉</WordsBtn>}
-										
+
 									</div>
 								</div>
 
 								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										<div  className={"break_word_comments markdown-body"} 
+										<div  className={"markdown-body"}
-												dangerouslySetInnerHTML={{__html: this.parseCommentContent(item.content)}}></div>
+												dangerouslySetInnerHTML={{__html:this.exportMdtoHtml(item.content)}}></div>
 										<div className="cl"></div>
 									</div>
 								</div>
 
-								
+
 							</div>
 						</div>
 					</div>
@@ -256,7 +285,7 @@ class CCommentItem extends Component{
   render(){
     let { item, commentIndex, homework_status, is_author }=this.props;
     let { show_reply, show_appeal }=this.state;
-    const _content = item.content ? this.parseCommentContent(item.content) : ''
+    const _content = item.content ? this.exportMdtoHtml(item.content) : ''
 	const isAnonymous = homework_status && homework_status.indexOf('匿评中') != -1
 	const isAppealing = homework_status && homework_status.indexOf('申诉中') != -1
 	const attachments = item.attachments;
@@ -266,13 +295,13 @@ class CCommentItem extends Component{
       <div className="ccomment comment_item_cont df clearfix" key={item.id}>
  					<div className="J_Comment_Face fl">
 
-						{item.image_url == '--' ? 
+						{item.image_url == '--' ?
 						<a href={`javascript:void(0)`} >
-							<img alt="用户头像" height="50" 
+							<img alt="用户头像" height="50"
 								src={`${getUrl()}/images/edu_user/anony.png`} width="50"/>
 							</a>
 						: <a href={`${_origin}/users/${item.user_login}`} target="_blank">
-							<img alt="用户头像" height="50" 
+							<img alt="用户头像" height="50"
 								src={`${getUrl()}/images/${item.image_url}`}
 							width="50"/>
 						</a>}
@@ -285,7 +314,7 @@ class CCommentItem extends Component{
 					<div className="t_content fl">
 						<div className="J_Comment_Reply">
 							<div className="comment_orig_content" style={{ margin:"0px" }}>
-								
+
 
 								<div className="J_Comment_Info clearfix mt3">
 									<div className="t_info fl">
@@ -303,8 +332,8 @@ class CCommentItem extends Component{
 										<span className="t_area fl">{item.time}</span>
 										{/* 分数 */}
 										{item.score !== null && <span className="score_area fl">{item.score}分</span>}
-										
+
-										
+
 										{/* item.is_invalid && */}
 										{/* {  item.delete && isAdmin && <Tooltip title={ "删除" } >
 											<i className="iconfont icon-shanchu mr5 fr" style={{marginLeft: '6px'}}
@@ -312,29 +341,29 @@ class CCommentItem extends Component{
 											</i>
 										</Tooltip>} */}
 
-										
+
 
 										{/* fr */}
 										{/* <WordsBtn style="blue" className="fr">回复</WordsBtn> */}
-										{ item.is_invalid ? <span className="validate_area fr">失效</span> : 
+										{ item.is_invalid ? <span className="validate_area fr">失效</span> :
 										<React.Fragment>
 											<WordsBtn style="blue" className="fr" onClick={this.state.show_reply ? this.cancelReply : this.showReply}>回复</WordsBtn>
-											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && 
+											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 &&
 												<WordsBtn style="blue" className="fr mr20" onClick={this.state.show_appeal ? this.cancelAppeal : this.showAppeal}>申诉</WordsBtn>}
-											
+
 										</React.Fragment>
 
 											}
-										{item.delete && isAdmin 
+										{item.delete && isAdmin
-											&& <WordsBtn style="blue" className="fr mr12" 
+											&& <WordsBtn style="blue" className="fr mr12"
 												onClick={() => this.props.onDelete(item)}>删除</WordsBtn>}
-										
+
 									</div>
 								</div>
 
 								{!!_content && _content !== 'null' && <div className="comment_content  clearfix mt8" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										<div  className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
+										<div  className={"markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
 										<div className="cl"></div>
 									</div>
 								</div>}
@@ -367,7 +396,7 @@ class CCommentItem extends Component{
 								<div className="childrenCommentsView" style={{background: '#fff'}}>
 									{/* {(item && item.journals && item.journals.length) ? <div className="trangle"></div>: ''} */}
 									{this.renderChildenComments(item)}
-									{/* { item.isAllChildrenLoaded != true && item.journals && this.props.isChildCommentPagination == true && item.journals.length >= 5? 
+									{/* { item.isAllChildrenLoaded != true && item.journals && this.props.isChildCommentPagination == true && item.journals.length >= 5?
 										<Tooltip title={ "点击查看更多回复" } disableFocusListener={true}>
 											<div className="loadMoreChildComments" onClick={() => {this.props.loadMoreChildComments && this.props.loadMoreChildComments(item)}}>
 												<i className="iconfont icon-xiajiantou"></i>
@@ -379,9 +408,9 @@ class CCommentItem extends Component{
 								<p className="" >
                     				{/* 第二排右侧按钮区域 */}
 									{/* ${this.state.show_reply ? '回复' : '申诉'} */}
-									{(show_reply || show_appeal) && 
+									{(show_reply || show_appeal) &&
 									<React.Fragment>
-										<TPMMDEditor mdID={`${commentIndex}`} watch={false} 
+										<TPMMDEditor mdID={`${commentIndex}`} watch={false}
 											height={130} onChange={(val) => this.setState({ secondReplyContent: val})}
 											placeholder={`请输入内容`} noStorage={true}
 										></TPMMDEditor>
@@ -389,15 +418,15 @@ class CCommentItem extends Component{
 											<a  className="task-btn task-btn-orange fr" style={{height: '26px', lineHeight: '26px', width: '60px'}}
 												onClick={this.onSubmit}
 											>{this.state.show_reply ? '回复' : '申诉'}</a>
-											<a onClick={this.onCancel} className="defalutCancelbtn fr" 
+											<a onClick={this.onCancel} className="defalutCancelbtn fr"
 												style={{height: '26px', width: '60px', fontSize: '14px', lineHeight: '26px', marginRight: '10px'}}>取消</a>
-											
+
 										</div>
 									</React.Fragment>
 									}
 								</p>
-                
+
-		                        
+
 							</div>
 						</div>
 					</div>

public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js

@@ -141,10 +141,24 @@ class OneSelfOrderModal extends Component{
 
 	//勾选实训
 	shixunhomeworkedit=(list)=>{
+   if(this.state.course_groups){
+		 if(this.state.course_groups.length===list.length){
+			 this.setState({
+				 Checkboxtype:true,
+				 group_ids:list
+			 })
+		 }else{
+			 this.setState({
+				 Checkboxtype:false,
+				 group_ids:list
+			 })
+		 }
+	 }else{
+		 this.setState({
+			 group_ids:list
+		 })
+	 }
 
-		this.setState({
-			group_ids:list
-		})
 		this.props.getcourse_groupslist && this.props.getcourse_groupslist(list)
 	}