diff --git a/Gemfile.lock b/Gemfile.lock
index 8aa2daa6a..6a4a7e08f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -378,7 +378,6 @@ DEPENDENCIES
   kaminari (~> 1.1, >= 1.1.1)
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
-  newrelic_rpm
   oauth2
   pdfkit
   puma (~> 3.11)
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 46b3964c2..ef30dac83 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -127,21 +127,21 @@ class AccountsController < ApplicationController
     # UserDayCertification.create(user_id: user.id, status: 1)
   end
 
-  def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, "autologin")
-    cookie_options = {
-                      :value => token.value,
-                      :expires => 1.month.from_now,
-                      :path => '/',
-                      :secure => false,
-                      :httponly => true
-                     }
-    if edu_setting('cookie_domain').present?
-      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
-    end
-    cookies[autologin_cookie_name] = cookie_options
-    logger.info("cookies is #{cookies}")
-  end
+  # def set_autologin_cookie(user)
+  #   token = Token.get_or_create_permanent_login_token(user, "autologin")
+  #   cookie_options = {
+  #                     :value => token.value,
+  #                     :expires => 1.month.from_now,
+  #                     :path => '/',
+  #                     :secure => false,
+  #                     :httponly => true
+  #                    }
+  #   if edu_setting('cookie_domain').present?
+  #     cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+  #   end
+  #   cookies[autologin_cookie_name] = cookie_options
+  #   logger.info("cookies is #{cookies}")
+  # end
 
   def logout
     UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 508d005a4..459ba5384 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -253,7 +253,10 @@ class ApplicationController < ActionController::Base
 
 			if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
 				user = open_class_user
-				start_user_session(user) if user
+				if user
+					start_user_session(user)
+					set_autologin_cookie(user)
+				end
 				User.current = user
 			end
 		end
@@ -617,6 +620,22 @@ class ApplicationController < ActionController::Base
 		cookies[:fileDownload] = true
 	end
 
+	def set_autologin_cookie(user)
+		token = Token.get_or_create_permanent_login_token(user, "autologin")
+		cookie_options = {
+			:value => token.value,
+			:expires => 1.month.from_now,
+			:path => '/',
+			:secure => false,
+			:httponly => true
+		}
+		if edu_setting('cookie_domain').present?
+			cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+		end
+		cookies[autologin_cookie_name] = cookie_options
+		logger.info("cookies is #{cookies}")
+	end
+
 	# 149课程的评审用户数据创建（包含创建课堂学生）
 	def open_class_user
 		user = User.find_by(login: "OpenClassUser")
diff --git a/app/controllers/commons_controller.rb b/app/controllers/commons_controller.rb
index 43ea31c97..bcb0fa45a 100644
--- a/app/controllers/commons_controller.rb
+++ b/app/controllers/commons_controller.rb
@@ -51,7 +51,7 @@ class CommonsController < ApplicationController
           200
         end
       when 'journals_for_message'
-        course = @object.jour&.course || @object.jour&.student_work&.homework_common&.course
+        course = @object&.jour_type.to_s == "StudentWorksScore" ? @object.jour&.student_work&.homework_common&.course : @object.jour&.course
         if current_user.course_identity(course)  >= Course::STUDENT && @object.user != current_user
           403
         else
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0dc8829da..d2c9f88d2 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -128,8 +128,8 @@ class CoursesController < ApplicationController
   # POST /courses
   # POST /courses.json
   def create
-    ActiveRecord::Base.transaction do
-      begin
+    begin
+      ActiveRecord::Base.transaction do
         @course = Course.new(name: params[:name], class_period: params[:class_period], credit: params[:credit],
                              end_date: params[:end_date], is_public: params[:is_public], school_id: @school.id,
                              authentication: params[:authentication], professional_certification: params[:professional_certification])
@@ -174,11 +174,12 @@ class CoursesController < ApplicationController
           course_module_types = params[:course_module_types]
           @course.create_course_modules(course_module_types)
         end
-      rescue => e
-        uid_logger_error(e.message)
-        tip_exception(e.message)
-        raise ActiveRecord::Rollback
       end
+      CreateSubjectCourseStudentJob.perform_later(@course.id) if @course.subject && @course.subject.subject_appointments.count > 0
+    rescue => e
+      uid_logger_error(e.message)
+      tip_exception(e.message)
+      raise ActiveRecord::Rollback
     end
   end
 
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 4a087ae7a..be8173b2f 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -476,10 +476,13 @@ class GamesController < ApplicationController
         if @myshixun.shixun.try(:status) < 2
           tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")
         else
-          # 报错继续retry
           tip_exception(-3, "#{e.message}")
         end
       end
+      # 如果报错了，并且retry 为1的时候，则fork一个新的仓库
+      if params[:retry].to_i == 1
+        project_fork(@myshixun, @shixun.repo_path, current_user.login)
+      end
       tip_exception(0, e.message)
     end
   end
diff --git a/app/controllers/gits_controller.rb b/app/controllers/gits_controller.rb
index 910864812..b52e75353 100644
--- a/app/controllers/gits_controller.rb
+++ b/app/controllers/gits_controller.rb
@@ -19,43 +19,48 @@ class GitsController < ApplicationController
     result = false
     if request.env["HTTP_AUTHORIZATION"] && request.env["HTTP_AUTHORIZATION"].split(" ").length == 2
       username_password = Base64.decode64(request.env["HTTP_AUTHORIZATION"].split(" ")[1])
-      input_username = username_password.split(":")[0].strip()
-      input_password = username_password.split(":")[1].strip()
-      uid_logger("git start auth: input_username is #{input_username}")
 
-
-      # Git 超级权限用户
-      if input_username.strip == gituser.strip && input_password.strip == gitpassword.strip
-        result = true
+      if username_password.split(":")[0].nil? || username_password.split(":")[1].nil?
+        result = false
       else
-        # 用户是否对对象拥有权限
-        system_user = User.find_by_login(input_username) || User.find_by_mail(input_username) || User.find_by_phone(input_username)
+        input_username = username_password.split(":")[0].strip()
+        input_password = username_password.split(":")[1].strip()
+        uid_logger("git start auth: input_username is #{input_username}")
+
 
-        # 如果用户名密码错误
-        if system_user && !system_user.check_password?(input_password)
-          uid_logger_error("git start: password is wrong")
-          result = false
+        # Git 超级权限用户
+        if input_username.strip == gituser.strip && input_password.strip == gitpassword.strip
+          result = true
         else
-          git_url = params["url"]
-          username = git_url.split("/")[0]
-          shixunname = git_url.split("/")[1].split(".")[0]
-          repo_name = username + "/" + shixunname
-          uid_logger("git start: repo_name is #{repo_name}")
-          shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).where(repo_name: repo_name).first
-          uid_logger("git start auth: shixun identifier is #{shixun.try(:identifier)}")
-          uid_logger("git start auth: systemuser is #{system_user.try(:login)}")
+          # 用户是否对对象拥有权限
+          system_user = User.find_by_login(input_username) || User.find_by_mail(input_username) || User.find_by_phone(input_username)
 
-          if shixun.present?
-            if system_user.present? && system_user.manager_of_shixun?(shixun)
-              result = true
+          # 如果用户名密码错误
+          if system_user && !system_user.check_password?(input_password)
+            uid_logger_error("git start: password is wrong")
+            result = false
+          else
+            git_url = params["url"]
+            username = git_url.split("/")[0]
+            shixunname = git_url.split("/")[1].split(".")[0]
+            repo_name = username + "/" + shixunname
+            uid_logger("git start: repo_name is #{repo_name}")
+            shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).where(repo_name: repo_name).first
+            uid_logger("git start auth: shixun identifier is #{shixun.try(:identifier)}")
+            uid_logger("git start auth: systemuser is #{system_user.try(:login)}")
+
+            if shixun.present?
+              if system_user.present? && system_user.manager_of_shixun?(shixun)
+                result = true
+              else
+                uid_logger_error("gituser is not shixun manager")
+                result = false
+              end
             else
-              uid_logger_error("gituser is not shixun manager")
-              result = false
+              uid_logger_error("shixun is not exist")
+              # result = false
+              result = true # 为了测试跳出
             end
-          else
-            uid_logger_error("shixun is not exist")
-            # result = false
-            result = true # 为了测试跳出
           end
         end
       end
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 7cb7ee800..6ffe277a3 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -692,7 +692,7 @@ class PollsController < ApplicationController
         else
           unified_setting = @poll.unified_setting
         end
-        show_result = params[:show_result] ? 1 : 0
+        show_result = params[:show_result].to_i
         un_anonymous = params[:un_anonymous] ? true : false
         # 统一设置或者分班为0，则更新问卷，并删除问卷分组
         if unified_setting || (course_group_ids.size == 0)
diff --git a/app/jobs/create_subject_course_student_job.rb b/app/jobs/create_subject_course_student_job.rb
new file mode 100644
index 000000000..a7b8cb8af
--- /dev/null
+++ b/app/jobs/create_subject_course_student_job.rb
@@ -0,0 +1,22 @@
+class CreateSubjectCourseStudentJob < ApplicationJob
+  queue_as :default
+
+  def perform(course_id)
+    course = Course.find_by(id: course_id)
+    return if course.blank? || course.subject.blank?
+
+    attrs = %i[course_id user_id role created_at updated_at]
+    same_attrs = {course_id: course.id, role: 4}
+
+    Rails.logger.info("1:course.students.count:##{course.students.count}")
+    CourseMember.bulk_insert(*attrs) do |worker|
+      course.subject.subject_appointments.each do |app|
+        Rails.logger.info("##{course.students.where(user_id: app.user_id)}")
+        next if course.students.where(user_id: app.user_id).any?
+        worker.add same_attrs.merge(user_id: app.user_id)
+      end
+    end
+    Rails.logger.info("2:course.students.count:##{course.students.count}")
+    course.subject.subject_appointments.destroy_all
+  end
+end
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 4c8f94a42..40de5a87c 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -134,6 +134,11 @@ class HomeworkCommon < ApplicationRecord
     self.homework_type == 'practice' && self.publish_time.present? && self.publish_time < Time.now && self.homework_group_reviews.count == 0
   end
 
+  # 作业查看最新成绩
+  def update_score identity
+    identity < Course::NORMAL && publish_time.present? && publish_time < Time.now && !course.is_end
+  end
+
   # 作业能否立即发布
   def publish_immediately user
     homework_detail_manual.try(:comment_status) == 0 || homework_group_settings.where(course_group_id: course.charge_group_ids(user)).
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 7f0d2fd94..9cb860f61 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -104,7 +104,7 @@ class Poll < ApplicationRecord
       status = 4
     else
       if user.present? && user.student_of_course?(course)
-        ex_time = get_poll_times(user_id,false)
+        ex_time = get_poll_times(user.id,false)
         pb_time = ex_time[:publish_time]
         ed_time = ex_time[:end_time]
         if pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now
diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder
index 08c269670..e567ea79a 100644
--- a/app/views/homework_commons/works_list.json.jbuilder
+++ b/app/views/homework_commons/works_list.json.jbuilder
@@ -4,6 +4,7 @@ json.partial! "homework_btn_check", locals: {identity: @user_course_identity, ho
 
 json.partial! "student_btn_check", locals: {identity: @user_course_identity, homework: @homework, work: @work}
 
+json.update_score @homework.update_score(@user_course_identity) if @homework.homework_type == "practice"
 json.work_count @work_count
 json.all_member_count @all_member_count
 json.course_group_count @course.course_groups_count
diff --git a/app/views/searchs/index.json.jbuilder b/app/views/searchs/index.json.jbuilder
index 164e90b53..65c4d248c 100644
--- a/app/views/searchs/index.json.jbuilder
+++ b/app/views/searchs/index.json.jbuilder
@@ -10,9 +10,11 @@ json.results do
     # 去除开头标点符号
     reg = /^[，。？：；‘’！“”—……、]/
     # 附件的替换
-    atta_reg = /!\[\]\(\/api\/attachments\/\d+\)/
-    highlights[:description]&.first&.sub!(reg, '').sub!(atta_reg, '')
-    highlights[:content]&.first&.sub!(reg, '').sub!(atta_reg, '')
+    atta_reg = /!\[.*]\(\/api\/attachments\/\d+\)/
+    highlights[:description]&.first&.sub!(reg, '')
+    highlights[:description]&.map{|des| des.gsub!(atta_reg, '')}
+    highlights[:content]&.first&.sub!(reg, '')
+    highlights[:content]&.map{|des| des.gsub!(atta_reg, '')}
 
     json.content highlights
   end
diff --git a/app/views/shixun_lists/index.json.jbuilder b/app/views/shixun_lists/index.json.jbuilder
index c925d6876..79ce4b09c 100644
--- a/app/views/shixun_lists/index.json.jbuilder
+++ b/app/views/shixun_lists/index.json.jbuilder
@@ -8,9 +8,12 @@ json.shixun_list do
     # 去除开头标点符号
     reg = /^[，。？：；‘’！“”—……、]/
     # 附件的替换
-    atta_reg = /!\[\]\(\/api\/attachments\/\d+\)/
-    highlights[:description]&.first&.sub!(reg, '')&.sub!(atta_reg, '')
-    highlights[:content]&.first&.sub!(reg, '')&.sub!(atta_reg, '')
+    atta_reg = /!\[.*]\(\/api\/attachments\/\d+\)/
+
+    highlights[:description]&.first&.sub!(reg, '')
+    highlights[:description]&.map{|des| des.gsub!(atta_reg, '')}
+    highlights[:content]&.first&.sub!(reg, '')
+    highlights[:content]&.map{|des| des.gsub!(atta_reg, '')}
 
     json.title highlights.delete(:name)&.join('...') || obj.searchable_title
     json.description highlights[:description]&.join('...') || Util.extract_content(obj.description)[0..300]&.sub!(atta_reg, '')
diff --git a/app/views/users/courses/shared/_course.json.jbuilder b/app/views/users/courses/shared/_course.json.jbuilder
index e917033da..8da80f372 100644
--- a/app/views/users/courses/shared/_course.json.jbuilder
+++ b/app/views/users/courses/shared/_course.json.jbuilder
@@ -5,6 +5,7 @@ json.members_count course.course_members_count
 # json.homework_commons_count course.homework_commons_count
 json.homework_commons_count get_tasks_count course
 json.attachments_count course.attachments.count
+json.visits course.visits
 
 json.first_category_url module_url(course.course_modules.where(hidden: 0).order(position: :desc).first, course)
 
diff --git a/public/editormd/lib/marked.min.js b/public/editormd/lib/marked.min.js
index 1cd7c2bae..bfcb191af 100644
--- a/public/editormd/lib/marked.min.js
+++ b/public/editormd/lib/marked.min.js
@@ -13,6 +13,9 @@
 // 0.4.0  /^ *(#{1,6}) ——》/^ *(#{1,6})   去掉了一个空格 TODO 行内公式带_
 /*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/
 // b(i[1].replace(/^ *| *\| *$/g,"")) --> i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */)    table没识别的问题
-// header.length===a.align.length --> header.length  table没识别的问题     a.header.length -> a.cells[p].split('|').length - 2 
-!function(e){"use strict";var t={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:d,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6})*([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:d,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:d,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function n(e){this.tokens=[],this.tokens.links={},this.options=e||m.defaults,this.rules=t.normal,this.options.pedantic?this.rules=t.pedantic:this.options.gfm&&(this.options.tables?this.rules=t.tables:this.rules=t.gfm)}t._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,t._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,t.def=p(t.def).replace("label",t._label).replace("title",t._title).getRegex(),t.bullet=/(?:[*+-]|\d+\.)/,t.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,t.item=p(t.item,"gm").replace(/bull/g,t.bullet).getRegex(),t.list=p(t.list).replace(/bull/g,t.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+t.def.source+")").getRegex(),t._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",t._comment=/<!--(?!-?>)[\s\S]*?-->/,t.html=p(t.html,"i").replace("comment",t._comment).replace("tag",t._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),t.paragraph=p(t.paragraph).replace("hr",t.hr).replace("heading",t.heading).replace("lheading",t.lheading).replace("tag",t._tag).getRegex(),t.blockquote=p(t.blockquote).replace("paragraph",t.paragraph).getRegex(),t.normal=f({},t),t.gfm=f({},t.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6})+([^\n]+?) *#* *(?:\n+|$)/}),t.gfm.paragraph=p(t.paragraph).replace("(?!","(?!"+t.gfm.fences.source.replace("\\1","\\2")+"|"+t.list.source.replace("\\1","\\3")+"|").getRegex(),t.tables=f({},t.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/}),t.pedantic=f({},t.normal,{html:p("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",t._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/}),n.rules=t,n.lex=function(e,t){return new n(t).lex(e)},n.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},n.prototype.token=function(e,n){var r,s,i,l,o,a,h,p,u,c,g,d,f;for(e=e.replace(/^ +$/gm,"");e;)if((i=this.rules.newline.exec(e))&&(e=e.substring(i[0].length),i[0].length>1&&this.tokens.push({type:"space"})),i=this.rules.code.exec(e))e=e.substring(i[0].length),i=i[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?i:i.replace(/\n+$/,"")});else if(i=this.rules.fences.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"code",lang:i[2],text:i[3]||""});else if(i=this.rules.heading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:i[1].length,text:i[2]});else if(n&&(i=this.rules.nptable.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/,"").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=b(a.cells[p],a.cells[p].split('|').length - 2 );this.tokens.push(a)}else if(i=this.rules.hr.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"hr"});else if(i=this.rules.blockquote.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"blockquote_start"}),i=i[0].replace(/^ *> ?/gm,""),this.token(i,n),this.tokens.push({type:"blockquote_end"});else if(i=this.rules.list.exec(e)){for(e=e.substring(i[0].length),g=(l=i[2]).length>1,this.tokens.push({type:"list_start",ordered:g,start:g?+l:""}),r=!1,c=(i=i[0].match(this.rules.item)).length,p=0;p<c;p++)h=(a=i[p]).length,~(a=a.replace(/^ *([*+-]|\d+\.) +/,"")).indexOf("\n ")&&(h-=a.length,a=this.options.pedantic?a.replace(/^ {1,4}/gm,""):a.replace(new RegExp("^ {1,"+h+"}","gm"),"")),this.options.smartLists&&p!==c-1&&(l===(o=t.bullet.exec(i[p+1])[0])||l.length>1&&o.length>1||(e=i.slice(p+1).join("\n")+e,p=c-1)),s=r||/\n\n(?!\s*$)/.test(a),p!==c-1&&(r="\n"===a.charAt(a.length-1),s||(s=r)),f=void 0,(d=/^\[[ xX]\] /.test(a))&&(f=" "!==a[1],a=a.replace(/^\[[ xX]\] +/,"")),this.tokens.push({type:s?"loose_item_start":"list_item_start",task:d,checked:f}),this.token(a,!1),this.tokens.push({type:"list_item_end"});this.tokens.push({type:"list_end"})}else if(i=this.rules.html.exec(e))e=e.substring(i[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===i[1]||"script"===i[1]||"style"===i[1]),text:i[0]});else if(n&&(i=this.rules.def.exec(e)))e=e.substring(i[0].length),i[3]&&(i[3]=i[3].substring(1,i[3].length-1)),u=i[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[u]||(this.tokens.links[u]={href:i[2],title:i[3]});else if(n&&(i=this.rules.table.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/(?: *\| *)?\n$/,"").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=b(a.cells[p].replace(/^ *\| *| *\| *$/g,""),a.cells[p].split('|').length - 2 );this.tokens.push(a)}else if(i=this.rules.lheading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:"="===i[2]?1:2,text:i[1]});else if(n&&(i=this.rules.paragraph.exec(e)))e=e.substring(i[0].length),this.tokens.push({type:"paragraph",text:"\n"===i[1].charAt(i[1].length-1)?i[1].slice(0,-1):i[1]});else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"text",text:i[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var r={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:d,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)|^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)/,em:/^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*][\s\S]*?[^\s])\*(?!\*)|^_([^\s_])_(?!_)|^\*([^\s*])\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:d,text:/^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/};function s(e,t){if(this.options=t||m.defaults,this.links=e,this.rules=r.normal,this.renderer=this.options.renderer||new i,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=r.pedantic:this.options.gfm&&(this.options.breaks?this.rules=r.breaks:this.rules=r.gfm)}function i(e){this.options=e||m.defaults}function l(){}function o(e){this.tokens=[],this.token=null,this.options=e||m.defaults,this.options.renderer=this.options.renderer||new i,this.renderer=this.options.renderer,this.renderer.options=this.options}function a(e,t){return e.replace(t?/&/g:/&(?!#?\w+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function h(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function p(e,t){return e=e.source||e,t=t||"",{replace:function(t,n){return n=(n=n.source||n).replace(/(^|[^\[])\^/g,"$1"),e=e.replace(t,n),this},getRegex:function(){return new RegExp(e,t)}}}function u(e,t){return c[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?c[" "+e]=e+"/":c[" "+e]=e.replace(/[^/]*$/,"")),e=c[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}r._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,r._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,r._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,r.autolink=p(r.autolink).replace("scheme",r._scheme).replace("email",r._email).getRegex(),r._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,r.tag=p(r.tag).replace("comment",t._comment).replace("attribute",r._attribute).getRegex(),r._label=/(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|[^\[\]\\])*?/,r._href=/\s*(<(?:\\[<>]?|[^\s<>\\])*>|(?:\\[()]?|\([^\s\x00-\x1f()\\]*\)|[^\s\x00-\x1f()\\])*?)/,r._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,r.link=p(r.link).replace("label",r._label).replace("href",r._href).replace("title",r._title).getRegex(),r.reflink=p(r.reflink).replace("label",r._label).getRegex(),r.normal=f({},r),r.pedantic=f({},r.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:p(/^!?\[(label)\]\((.*?)\)/).replace("label",r._label).getRegex(),reflink:p(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",r._label).getRegex()}),r.gfm=f({},r.normal,{escape:p(r.escape).replace("])","~|])").getRegex(),url:p(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/).replace("email",r._email).getRegex(),_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:p(r.text).replace("]|","~]|").replace("|","|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&'*+/=?^_`{\\|}~-]+@|").getRegex()}),r.breaks=f({},r.gfm,{br:p(r.br).replace("{2,}","*").getRegex(),text:p(r.gfm.text).replace("{2,}","*").getRegex()}),s.rules=r,s.output=function(e,t,n){return new s(t,n).output(e)},s.prototype.output=function(e){for(var t,n,r,i,l,o="";e;)if(l=this.rules.escape.exec(e))e=e.substring(l[0].length),o+=l[1];else if(l=this.rules.autolink.exec(e))e=e.substring(l[0].length),r="@"===l[2]?"mailto:"+(n=a(this.mangle(l[1]))):n=a(l[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(l=this.rules.url.exec(e))){if(l=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(l[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(l[0])&&(this.inLink=!1),e=e.substring(l[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(l[0]):a(l[0]):l[0];else if(l=this.rules.link.exec(e))e=e.substring(l[0].length),this.inLink=!0,r=l[2],this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],i=t[3]):i="":i=l[3]?l[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(l,{href:s.escapes(r),title:s.escapes(i)}),this.inLink=!1;else if((l=this.rules.reflink.exec(e))||(l=this.rules.nolink.exec(e))){if(e=e.substring(l[0].length),t=(l[2]||l[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=l[0].charAt(0),e=l[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(l,t),this.inLink=!1}else if(l=this.rules.strong.exec(e))e=e.substring(l[0].length),o+=this.renderer.strong(this.output(l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.em.exec(e))e=e.substring(l[0].length),o+=this.renderer.em(this.output(l[6]||l[5]||l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.code.exec(e))e=e.substring(l[0].length),o+=this.renderer.codespan(a(l[2].trim(),!0));else if(l=this.rules.br.exec(e))e=e.substring(l[0].length),o+=this.renderer.br();else if(l=this.rules.del.exec(e))e=e.substring(l[0].length),o+=this.renderer.del(this.output(l[1]));else if(l=this.rules.text.exec(e))e=e.substring(l[0].length),o+=this.renderer.text(a(this.smartypants(l[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else l[0]=this.rules._backpedal.exec(l[0])[0],e=e.substring(l[0].length),"@"===l[2]?r="mailto:"+(n=a(l[0])):(n=a(l[0]),r="www."===l[1]?"http://"+n:n),o+=this.renderer.link(r,null,n);return o},s.escapes=function(e){return e?e.replace(s.rules._escapes,"$1"):e},s.prototype.outputLink=function(e,t){var n=t.href,r=t.title?a(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,a(e[1]))},s.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},s.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),Math.random()>.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},i.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'<pre><code class="'+this.options.langPrefix+a(t,!0)+'">'+(n?e:a(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:a(e,!0))+"</code></pre>"},i.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},i.prototype.html=function(e){return e},i.prototype.heading=function(e,t,n){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+n.toLowerCase().replace(/[^\w]+/g,"-")+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},i.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},i.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},i.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},i.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},i.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},i.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},i.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},i.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},i.prototype.strong=function(e){return"<strong>"+e+"</strong>"},i.prototype.em=function(e){return"<em>"+e+"</em>"},i.prototype.codespan=function(e){return"<code>"+e+"</code>"},i.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},i.prototype.del=function(e){return"<del>"+e+"</del>"},i.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(h(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return n}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return n}this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));try{e=encodeURI(e).replace(/%25/g,"%")}catch(e){return n}var s='<a href="'+a(e)+'"';return t&&(s+=' title="'+t+'"'),s+=">"+n+"</a>"},i.prototype.image=function(e,t,n){this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},i.prototype.text=function(e){return e},l.prototype.strong=l.prototype.em=l.prototype.codespan=l.prototype.del=l.prototype.text=function(e){return e},l.prototype.link=l.prototype.image=function(e,t,n){return""+n},l.prototype.br=function(){return""},o.parse=function(e,t){return new o(t).parse(e)},o.prototype.parse=function(e){this.inline=new s(e.links,this.options),this.inlineText=new s(e.links,f({},this.options,{renderer:new l})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},o.prototype.next=function(){return this.token=this.tokens.pop()},o.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},o.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},o.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,h(this.inlineText.output(this.token.text)));case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":for(i="",this.token.task&&(i+=this.renderer.checkbox(this.token.checked));"list_item_end"!==this.next().type;)i+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(i);case"loose_item_start":for(i="";"list_item_end"!==this.next().type;)i+=this.tok();return this.renderer.listitem(i);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}};var c={},g=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function d(){}function f(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function b(e,t){var n=e.replace(/([^\\])\|/g,"$1 |").split(/ +\| */),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].replace(/\\\|/g,"|");return n}function m(e,t,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");/*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/if(r||"function"==typeof t){r||(r=t,t=null);var s,i,l=(t=f({},m.defaults,t||{})).highlight,h=0;try{s=n.lex(e,t)}catch(e){return r(e)}i=s.length;var p=function(e){if(e)return t.highlight=l,r(e);var n;try{n=o.parse(s,t)}catch(t){e=t}return t.highlight=l,e?r(e):r(null,n)};if(!l||l.length<3)return p();if(delete t.highlight,!i)return p();for(;h<s.length;h++)!function(e){"code"!==e.type?--i||p():l(e.text,e.lang,function(t,n){return t?p(t):null==n||n===e.text?--i||p():(e.text=n,e.escaped=!0,void(--i||p()))})}(s[h])}else try{return t&&(t=f({},m.defaults,t)),o.parse(n.lex(e,t),t)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(t||m.defaults).silent)return"<p>An error occurred:</p><pre>"+a(e.message+"",!0)+"</pre>";throw e}}d.exec=d,m.options=m.setOptions=function(e){return f(m.defaults,e),m},m.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new i,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},m.defaults=m.getDefaults(),m.Parser=o,m.parser=o.parse,m.Renderer=i,m.TextRenderer=l,m.Lexer=n,m.lexer=n.lex,m.InlineLexer=s,m.inlineLexer=s.output,m.parse=m,"undefined"!=typeof module&&"object"==typeof exports?module.exports=m:"function"==typeof define&&define.amd?define(function(){return m}):e.marked=m}(this||("undefined"!=typeof window?window:global));
+// header.length===a.align.length --> header.length  table没识别的问题    
+// 2个table： b(a.cells[p],a.header.length) -> a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */)
+// .replace(/(?: *\| *)?\n$/,"")   -->  .replace(/\n$/, "")
+// /^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/  --> /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
+!function(e){"use strict";var t={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:d,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6})*([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:d,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:d,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function n(e){this.tokens=[],this.tokens.links={},this.options=e||m.defaults,this.rules=t.normal,this.options.pedantic?this.rules=t.pedantic:this.options.gfm&&(this.options.tables?this.rules=t.tables:this.rules=t.gfm)}t._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,t._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,t.def=p(t.def).replace("label",t._label).replace("title",t._title).getRegex(),t.bullet=/(?:[*+-]|\d+\.)/,t.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,t.item=p(t.item,"gm").replace(/bull/g,t.bullet).getRegex(),t.list=p(t.list).replace(/bull/g,t.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+t.def.source+")").getRegex(),t._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",t._comment=/<!--(?!-?>)[\s\S]*?-->/,t.html=p(t.html,"i").replace("comment",t._comment).replace("tag",t._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),t.paragraph=p(t.paragraph).replace("hr",t.hr).replace("heading",t.heading).replace("lheading",t.lheading).replace("tag",t._tag).getRegex(),t.blockquote=p(t.blockquote).replace("paragraph",t.paragraph).getRegex(),t.normal=f({},t),t.gfm=f({},t.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6})+([^\n]+?) *#* *(?:\n+|$)/}),t.gfm.paragraph=p(t.paragraph).replace("(?!","(?!"+t.gfm.fences.source.replace("\\1","\\2")+"|"+t.list.source.replace("\\1","\\3")+"|").getRegex(),t.tables=f({},t.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/}),t.pedantic=f({},t.normal,{html:p("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",t._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/}),n.rules=t,n.lex=function(e,t){return new n(t).lex(e)},n.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},n.prototype.token=function(e,n){var r,s,i,l,o,a,h,p,u,c,g,d,f;for(e=e.replace(/^ +$/gm,"");e;)if((i=this.rules.newline.exec(e))&&(e=e.substring(i[0].length),i[0].length>1&&this.tokens.push({type:"space"})),i=this.rules.code.exec(e))e=e.substring(i[0].length),i=i[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?i:i.replace(/\n+$/,"")});else if(i=this.rules.fences.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"code",lang:i[2],text:i[3]||""});else if(i=this.rules.heading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:i[1].length,text:i[2]});else if(n&&(i=this.rules.nptable.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/,"").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */);this.tokens.push(a)}else if(i=this.rules.hr.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"hr"});else if(i=this.rules.blockquote.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"blockquote_start"}),i=i[0].replace(/^ *> ?/gm,""),this.token(i,n),this.tokens.push({type:"blockquote_end"});else if(i=this.rules.list.exec(e)){for(e=e.substring(i[0].length),g=(l=i[2]).length>1,this.tokens.push({type:"list_start",ordered:g,start:g?+l:""}),r=!1,c=(i=i[0].match(this.rules.item)).length,p=0;p<c;p++)h=(a=i[p]).length,~(a=a.replace(/^ *([*+-]|\d+\.) +/,"")).indexOf("\n ")&&(h-=a.length,a=this.options.pedantic?a.replace(/^ {1,4}/gm,""):a.replace(new RegExp("^ {1,"+h+"}","gm"),"")),this.options.smartLists&&p!==c-1&&(l===(o=t.bullet.exec(i[p+1])[0])||l.length>1&&o.length>1||(e=i.slice(p+1).join("\n")+e,p=c-1)),s=r||/\n\n(?!\s*$)/.test(a),p!==c-1&&(r="\n"===a.charAt(a.length-1),s||(s=r)),f=void 0,(d=/^\[[ xX]\] /.test(a))&&(f=" "!==a[1],a=a.replace(/^\[[ xX]\] +/,"")),this.tokens.push({type:s?"loose_item_start":"list_item_start",task:d,checked:f}),this.token(a,!1),this.tokens.push({type:"list_item_end"});this.tokens.push({type:"list_end"})}else if(i=this.rules.html.exec(e))e=e.substring(i[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===i[1]||"script"===i[1]||"style"===i[1]),text:i[0]});else if(n&&(i=this.rules.def.exec(e)))e=e.substring(i[0].length),i[3]&&(i[3]=i[3].substring(1,i[3].length-1)),u=i[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[u]||(this.tokens.links[u]={href:i[2],title:i[3]});else if(n&&(i=this.rules.table.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/, "").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */);this.tokens.push(a)}else if(i=this.rules.lheading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:"="===i[2]?1:2,text:i[1]});else if(n&&(i=this.rules.paragraph.exec(e)))e=e.substring(i[0].length),this.tokens.push({type:"paragraph",text:"\n"===i[1].charAt(i[1].length-1)?i[1].slice(0,-1):i[1]});else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"text",text:i[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var r={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:d,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)|^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)/,em:/^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*][\s\S]*?[^\s])\*(?!\*)|^_([^\s_])_(?!_)|^\*([^\s*])\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:d,text:/^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/};function s(e,t){if(this.options=t||m.defaults,this.links=e,this.rules=r.normal,this.renderer=this.options.renderer||new i,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=r.pedantic:this.options.gfm&&(this.options.breaks?this.rules=r.breaks:this.rules=r.gfm)}function i(e){this.options=e||m.defaults}function l(){}function o(e){this.tokens=[],this.token=null,this.options=e||m.defaults,this.options.renderer=this.options.renderer||new i,this.renderer=this.options.renderer,this.renderer.options=this.options}function a(e,t){return e.replace(t?/&/g:/&(?!#?\w+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function h(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function p(e,t){return e=e.source||e,t=t||"",{replace:function(t,n){return n=(n=n.source||n).replace(/(^|[^\[])\^/g,"$1"),e=e.replace(t,n),this},getRegex:function(){return new RegExp(e,t)}}}function u(e,t){return c[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?c[" "+e]=e+"/":c[" "+e]=e.replace(/[^/]*$/,"")),e=c[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}r._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,r._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,r._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,r.autolink=p(r.autolink).replace("scheme",r._scheme).replace("email",r._email).getRegex(),r._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,r.tag=p(r.tag).replace("comment",t._comment).replace("attribute",r._attribute).getRegex(),r._label=/(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|[^\[\]\\])*?/,r._href=/\s*(<(?:\\[<>]?|[^\s<>\\])*>|(?:\\[()]?|\([^\s\x00-\x1f()\\]*\)|[^\s\x00-\x1f()\\])*?)/,r._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,r.link=p(r.link).replace("label",r._label).replace("href",r._href).replace("title",r._title).getRegex(),r.reflink=p(r.reflink).replace("label",r._label).getRegex(),r.normal=f({},r),r.pedantic=f({},r.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:p(/^!?\[(label)\]\((.*?)\)/).replace("label",r._label).getRegex(),reflink:p(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",r._label).getRegex()}),r.gfm=f({},r.normal,{escape:p(r.escape).replace("])","~|])").getRegex(),url:p(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/).replace("email",r._email).getRegex(),_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:p(r.text).replace("]|","~]|").replace("|","|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&'*+/=?^_`{\\|}~-]+@|").getRegex()}),r.breaks=f({},r.gfm,{br:p(r.br).replace("{2,}","*").getRegex(),text:p(r.gfm.text).replace("{2,}","*").getRegex()}),s.rules=r,s.output=function(e,t,n){return new s(t,n).output(e)},s.prototype.output=function(e){for(var t,n,r,i,l,o="";e;)if(l=this.rules.escape.exec(e))e=e.substring(l[0].length),o+=l[1];else if(l=this.rules.autolink.exec(e))e=e.substring(l[0].length),r="@"===l[2]?"mailto:"+(n=a(this.mangle(l[1]))):n=a(l[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(l=this.rules.url.exec(e))){if(l=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(l[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(l[0])&&(this.inLink=!1),e=e.substring(l[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(l[0]):a(l[0]):l[0];else if(l=this.rules.link.exec(e))e=e.substring(l[0].length),this.inLink=!0,r=l[2],this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],i=t[3]):i="":i=l[3]?l[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(l,{href:s.escapes(r),title:s.escapes(i)}),this.inLink=!1;else if((l=this.rules.reflink.exec(e))||(l=this.rules.nolink.exec(e))){if(e=e.substring(l[0].length),t=(l[2]||l[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=l[0].charAt(0),e=l[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(l,t),this.inLink=!1}else if(l=this.rules.strong.exec(e))e=e.substring(l[0].length),o+=this.renderer.strong(this.output(l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.em.exec(e))e=e.substring(l[0].length),o+=this.renderer.em(this.output(l[6]||l[5]||l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.code.exec(e))e=e.substring(l[0].length),o+=this.renderer.codespan(a(l[2].trim(),!0));else if(l=this.rules.br.exec(e))e=e.substring(l[0].length),o+=this.renderer.br();else if(l=this.rules.del.exec(e))e=e.substring(l[0].length),o+=this.renderer.del(this.output(l[1]));else if(l=this.rules.text.exec(e))e=e.substring(l[0].length),o+=this.renderer.text(a(this.smartypants(l[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else l[0]=this.rules._backpedal.exec(l[0])[0],e=e.substring(l[0].length),"@"===l[2]?r="mailto:"+(n=a(l[0])):(n=a(l[0]),r="www."===l[1]?"http://"+n:n),o+=this.renderer.link(r,null,n);return o},s.escapes=function(e){return e?e.replace(s.rules._escapes,"$1"):e},s.prototype.outputLink=function(e,t){var n=t.href,r=t.title?a(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,a(e[1]))},s.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},s.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),Math.random()>.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},i.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'<pre><code class="'+this.options.langPrefix+a(t,!0)+'">'+(n?e:a(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:a(e,!0))+"</code></pre>"},i.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},i.prototype.html=function(e){return e},i.prototype.heading=function(e,t,n){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+n.toLowerCase().replace(/[^\w]+/g,"-")+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},i.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},i.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},i.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},i.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},i.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},i.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},i.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},i.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},i.prototype.strong=function(e){return"<strong>"+e+"</strong>"},i.prototype.em=function(e){return"<em>"+e+"</em>"},i.prototype.codespan=function(e){return"<code>"+e+"</code>"},i.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},i.prototype.del=function(e){return"<del>"+e+"</del>"},i.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(h(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return n}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return n}this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));try{e=encodeURI(e).replace(/%25/g,"%")}catch(e){return n}var s='<a href="'+a(e)+'"';return t&&(s+=' title="'+t+'"'),s+=">"+n+"</a>"},i.prototype.image=function(e,t,n){this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},i.prototype.text=function(e){return e},l.prototype.strong=l.prototype.em=l.prototype.codespan=l.prototype.del=l.prototype.text=function(e){return e},l.prototype.link=l.prototype.image=function(e,t,n){return""+n},l.prototype.br=function(){return""},o.parse=function(e,t){return new o(t).parse(e)},o.prototype.parse=function(e){this.inline=new s(e.links,this.options),this.inlineText=new s(e.links,f({},this.options,{renderer:new l})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},o.prototype.next=function(){return this.token=this.tokens.pop()},o.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},o.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},o.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,h(this.inlineText.output(this.token.text)));case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":for(i="",this.token.task&&(i+=this.renderer.checkbox(this.token.checked));"list_item_end"!==this.next().type;)i+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(i);case"loose_item_start":for(i="";"list_item_end"!==this.next().type;)i+=this.tok();return this.renderer.listitem(i);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}};var c={},g=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function d(){}function f(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function b(e,t){var n=e.replace(/([^\\])\|/g,"$1 |").split(/ +\| */),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].replace(/\\\|/g,"|");return n}function m(e,t,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");/*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/if(r||"function"==typeof t){r||(r=t,t=null);var s,i,l=(t=f({},m.defaults,t||{})).highlight,h=0;try{s=n.lex(e,t)}catch(e){return r(e)}i=s.length;var p=function(e){if(e)return t.highlight=l,r(e);var n;try{n=o.parse(s,t)}catch(t){e=t}return t.highlight=l,e?r(e):r(null,n)};if(!l||l.length<3)return p();if(delete t.highlight,!i)return p();for(;h<s.length;h++)!function(e){"code"!==e.type?--i||p():l(e.text,e.lang,function(t,n){return t?p(t):null==n||n===e.text?--i||p():(e.text=n,e.escaped=!0,void(--i||p()))})}(s[h])}else try{return t&&(t=f({},m.defaults,t)),o.parse(n.lex(e,t),t)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(t||m.defaults).silent)return"<p>An error occurred:</p><pre>"+a(e.message+"",!0)+"</pre>";throw e}}d.exec=d,m.options=m.setOptions=function(e){return f(m.defaults,e),m},m.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new i,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},m.defaults=m.getDefaults(),m.Parser=o,m.parser=o.parse,m.Renderer=i,m.TextRenderer=l,m.Lexer=n,m.lexer=n.lex,m.InlineLexer=s,m.inlineLexer=s.output,m.parse=m,"undefined"!=typeof module&&"object"==typeof exports?module.exports=m:"function"==typeof define&&define.amd?define(function(){return m}):e.marked=m}(this||("undefined"!=typeof window?window:global));
 
diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js
index 7f8f8ac4d..d11511c63 100644
--- a/public/javascripts/educoder/edu_application.js
+++ b/public/javascripts/educoder/edu_application.js
@@ -1,4 +1,4 @@
-document.write("<link href='//at.alicdn.com/t/font_653600_qa9lwwv74z.css' rel='stylesheet' type='text/css'/>");
+document.write("<link href='https://at.alicdn.com/t/font_653600_qa9lwwv74z.css' rel='stylesheet' type='text/css'/>");
 
 /*!
  * JavaScript Cookie v2.2.0
diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index a04ec614c..aabcd8fb7 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -32,7 +32,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-  // devtool: "eval",  // 开启调试
+  //   devtool: "eval-source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
diff --git a/public/react/src/modules/courses/busyWork/NewWorkForm.js b/public/react/src/modules/courses/busyWork/NewWorkForm.js
index 27413ba04..e97822df8 100644
--- a/public/react/src/modules/courses/busyWork/NewWorkForm.js
+++ b/public/react/src/modules/courses/busyWork/NewWorkForm.js
@@ -70,10 +70,23 @@ class NewWorkForm extends Component{
           contentFileList,
           answerFileList,
         }, () => {
-          setTimeout(() => {
-            this.contentMdRef.current.setValue(data.description || '')
-            this.answerMdRef.current.setValue(data.reference_answer || '')
-          }, 2000)
+          // setTimeout(() => {
+          //   this._scrollToTop()
+            // 阻止setValue的滚动
+            // $(window).scroll( function() { 
+            //   $("html").scrollTop(0)
+            //   $(window).unbind("scroll");
+            // });
+            /**
+              setValue会调用到 codemirror的 o.scrollIntoView(i),  会导致滚动条跳动
+             */
+            // $('.editormd').parent().css('position', 'fixed').css('left', '-1000px')
+            // this.contentMdRef.current.setValue(data.description || '')
+            // this.answerMdRef.current.setValue(data.reference_answer || '')
+            // setTimeout(() => {
+            //     $('.editormd').parent().css('position', '').css('left', 'auto')
+            // }, 100);
+          // }, 500)
           
           this.props.form.setFieldsValue({
             title: data.name,
@@ -85,12 +98,13 @@ class NewWorkForm extends Component{
       } else { // new
 
       }
-    this._scrollToTop()
+    // this._scrollToTop()
   }
   _scrollToTop = () => {
-    setTimeout(() => {
-      $("html").animate({ scrollTop: 0 })
-    }, 1500)
+    // setTimeout(() => {
+      $("html").scrollTop(0)
+      // $("html").animate({ scrollTop: 0 })
+    // }, 1000)
   }
 
   // 输入title
@@ -292,6 +306,8 @@ class NewWorkForm extends Component{
     this.setState({ base_on_project: !this.state.base_on_project })
   }
   componentDidMount() {
+    this.isEdit = this.props.match.url.indexOf('/edit')
+
     window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required')
     this._scrollToTop()
   }
@@ -303,15 +319,13 @@ class NewWorkForm extends Component{
     let{
       title_value, contentFileList, answerFileList, max_num, min_num, base_on_project,
       init_max_num, init_min_num, 
-      title_num, course_name, category, has_commit, has_project,
-
-      isEdit
+      title_num, course_name, category, has_commit, has_project
     }=this.state
     const { current_user } = this.props
 
     const courseId = this.state.course_id || this.props.match.params.coursesId ;    
     
-    if ((isEdit) && !this.state.workLoaded) {
+    if ((this.isEdit) && !this.state.description) {
       return ''
     } 
     const uploadProps = {
@@ -439,7 +453,8 @@ class NewWorkForm extends Component{
                   }],
                 })(
                   <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入作业内容和要求,最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} 
-                    className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
+                    initValue={this.state.description} noSetValue={true}
+                    className="courseMessageMD" ></TPMMDEditor>
                 )}
               </Form.Item> }
               <Upload {...uploadProps} className="upload_1 newWorkUpload">
@@ -479,7 +494,7 @@ class NewWorkForm extends Component{
                           <InputNumber className="winput-240-40" placeholder="请填写每组最大人数" value={max_num} max={10}
                               onChange={this.max_num_change} style={{width:'180px'}} />
                         </ConditionToolTip>
-                        <label className="color-grey-9 ml20 font-14">（项目管理员角色的成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享）</label>
+                        <label className="color-grey-9 ml20 font-14">（学生提交作品时需要关联同组成员，组内成员作品共享）</label>
                       </p>
                       <p className="mt20">
                         <ConditionToolTip condition={has_commit || has_project} title={'已有关联项目或作品，不能修改'}>
@@ -488,7 +503,7 @@ class NewWorkForm extends Component{
                           >基于项目实施</Checkbox>
                         </ConditionToolTip>
                         
-                        <label className="color-grey-9 ml12 font-14">（勾选后各小组必须在educoder平台创建项目，教师可随时观察平台对各小组最新进展的实时统计）</label>
+                        <label className="color-grey-9 ml12 font-14">（选中，则必须在本平台创建项目，项目管理员可以提交作品；不选中，无需在平台创建项目，任意小组成员均可以提交作品）</label>
                       </p>
                     </div>
                   )}
@@ -507,7 +522,8 @@ class NewWorkForm extends Component{
                     }],
                   })(
                     <TPMMDEditor ref={this.answerMdRef} placeholder="请在此输入作业的参考答案,最大限制5000个字符" mdID={'workAnswerMD'} 
-                        className="courseMessageMD" refreshTimeout={1500} initValue={this.state.reference_answer || ''}></TPMMDEditor>
+                        initValue={this.state.reference_answer || ''} noSetValue={true}
+                        className="courseMessageMD" refreshTimeout={1500} ></TPMMDEditor>
                   )}
                 </Form.Item>
                 <Upload {...answerUploadProps} className="upload_1 newWorkUpload resetNewWorkUpload">
diff --git a/public/react/src/modules/courses/coursesPublic/CoursesListType.js b/public/react/src/modules/courses/coursesPublic/CoursesListType.js
index d5805c0d5..039f96914 100644
--- a/public/react/src/modules/courses/coursesPublic/CoursesListType.js
+++ b/public/react/src/modules/courses/coursesPublic/CoursesListType.js
@@ -30,7 +30,7 @@ class CoursesListType extends Component {
     return(
       <span style={{display:'inline-block'}}>
         {
-          typelist===undefined?"":typelist.map((item,key)=>{
+          typelist===undefined || typelist=== 403 || typelist === 401 || typelist=== 407 || typelist=== 408|| typelist=== 409 || typelist === 500?"":typelist.map((item,key)=>{
             return(
               <Tooltip placement="bottom" title={tipval} getPopupContainer={()=>document.querySelector('.TabsWarp')} key={key}>
                 <span key={key}>
diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
index 496423f73..db4f89bfc 100644
--- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
+++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -233,7 +233,7 @@ class Bullsubdirectory extends Component{
 											{
 												whethertoeditysl === false?
 													<div>
-														<div>
+														<div className="fudonyingxiangysls">
 															<div className="fudonyingxiangysl">
 																<div style={{marginRight:"60px"}}>
 																	<span className="ysltitbt">{myname}</span>
diff --git a/public/react/src/modules/courses/gradinforms/myysleduinforms.css b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
index 8376c63c8..a05dc9a63 100644
--- a/public/react/src/modules/courses/gradinforms/myysleduinforms.css
+++ b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
@@ -70,6 +70,10 @@
 .fudonyingxiangysl{
     width: 100%;
 }
+.fudonyingxiangysls{
+    display: flex;
+    flex-direction:column;
+}
 .yslbianji{
     padding-top: 31px;
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 41768333a..7c697e31b 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -285,7 +285,7 @@ class GraduationTasksSubmitedit extends Component{
 
       let{ search,page,limit,workslist}=this.state;
 
-      let newpage=page+2
+      let newpage=page+1
 
       this.searchList(search,newpage,limit,workslist.task_id,1)
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index be29d45a4..7438b36a4 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -271,20 +271,27 @@ class GraduationTasksSubmitnew extends Component{
 
 
   contentViewScroll=(e)=>{
-    //滑动到底判断
+
+
+		//滑动到底判断
+		const {memberslist} = this.state;
 		let newscrollTop=parseInt(e.currentTarget.scrollTop);
 		let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
-
 		if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
-      // console.log("到达底部");
 
-     let{ search,page,limit }=this.state;
+			if(memberslist.length===0){
+				return;
+			}else{
+				let{ search,page,limit }=this.state;
 
-       let newpage=page+2
+				let newpage=page+1
+
+				this.searchList(search,newpage,limit,1)
+
+			}
+		}
 
-      this.searchList(search,newpage,limit,1)
 
-    }
 
   }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index 55dfd9855..f0bead58f 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -32,8 +32,10 @@ class GraduationTasksappraise extends Component{
     axios.get(zrl).then((result)=>{
 
       if(result.status===200){
+      	let status=result.data.status;
+				if(status===undefined || status=== 403 || status === 401 || status=== 407 || status=== 408|| status=== 409 || status === 500||status===-1){
 
-        if(result.data.status!=-1){
+				}else{
           this.setState({
             firelistdata:result.data,
           })
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 874a69ca5..a7f886d78 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -80,6 +80,8 @@ class GraduationTaskssettingapp extends Component{
 			starttime:undefined,
 			DownloadType:false,
 			DownloadMessageval:undefined,
+			commentstatustype:undefined,
+			commenttimeone:undefined
     }
   }
 
@@ -102,10 +104,10 @@ class GraduationTaskssettingapp extends Component{
        }
       let starttype=false;
       let endtype=false;
-        if(moment(result.data.publish_time)<moment()){
+        if(moment(result.data.publish_time)<=moment()){
           starttype=true
         }
-       if(moment(result.data.end_time)<moment()){
+       if(moment(result.data.end_time)<=moment()){
          endtype=true
        }
 
@@ -130,6 +132,7 @@ class GraduationTaskssettingapp extends Component{
          taskname: result.data.task_name,
          coursename: result.data.course_name,
          commentstatus: result.data.comment_status,
+				 commentstatustype:result.data.status,
          commentnum: result.data.comment_num,
          operworks: result.data.open_work,
          opergrade: result.data.open_score,
@@ -343,28 +346,33 @@ class GraduationTaskssettingapp extends Component{
 		let {endtimetype}=this.state;
 		if(types===1){
 				this.setState({
-					latetime:newlatetime,
+					// latetime:newlatetime,
 					crosscomment:true,
-					commenttime:newcommenttime
+					commenttime:newlatetime,
+					commenttimeone:newlatetime,
 				})
 		}else{
 			if(endtimetype===true){
 				this.setState({
 					crosscomment:true,
-					commenttime:newcommenttime
+					commenttime:newlatetime,
+					commenttimeone:newlatetime,
 				})
 			}else{
 				this.setState({
-					end_time:newlatetime,
+					// end_time:newlatetime,
 					crosscomment:true,
-					commenttime:newcommenttime
+					commenttime:newlatetime,
+					commenttimeone:newlatetime,
 				})
 			}
 		}
 
 	}
   funcrosscomment=(e)=>{
-		let {latetime,end_time,allowlate}=this.state;
+		let {latetime,end_time,allowlate,commenttime,commenttimeone}=this.state;
+		let commenttimetype=commenttime===null||commenttime==="";
+
 		let newlatetimea=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
 		let newcommenttimea=moment(new Date()).format("YYYY-MM-DD HH:mm");
 
@@ -377,26 +385,33 @@ class GraduationTaskssettingapp extends Component{
 		let newend_timed=moment(end_time).add(7, 'days').format("YYYY-MM-DD HH:mm");
 		let newcommenttimed=moment(end_time).add(8, 'days').format("YYYY-MM-DD HH:mm");
 
-    let newtime;
 		if(e.target.checked===true){
-
-      if(allowlate===1||allowlate===true){
-       if(latetime===null||latetime===""){
-				 this.updatesfuncrosscomment(1,newlatetimea,newcommenttimea)
-			 }else{
-				 this.updatesfuncrosscomment(1,newlatetimes,newcommenttimes)
-			 }
-			}else{
-				if(end_time===null||end_time===""){
-					this.updatesfuncrosscomment(2,newend_timeb,newcommenttimeb)
+       if(commenttimetype===true){
+
+					if(allowlate===1||allowlate===true){
+						if(latetime===null||latetime===""){
+							this.updatesfuncrosscomment(1,newlatetimea,newcommenttimea)
+						}else{
+							this.updatesfuncrosscomment(1,newlatetimes,newcommenttimes)
+						}
+					}else{
+						if(end_time===null||end_time===""){
+							this.updatesfuncrosscomment(2,newend_timeb,newcommenttimeb)
+						}else{
+							this.updatesfuncrosscomment(2,newend_timed,newcommenttimed)
+						}
+					}
 				}else{
-					this.updatesfuncrosscomment(2,newend_timed,newcommenttimed)
-				}
-			}
+				 this.setState({
+					 crosscomment:e.target.checked,
+					 commenttime:commenttimeone,
+				 })
+			 }
+
 		}else{
 			this.setState({
 				crosscomment:e.target.checked,
-				commenttime:undefined
+		    commenttime:undefined
 			})
 		}
   }
@@ -519,10 +534,10 @@ class GraduationTaskssettingapp extends Component{
 		}
 
 
-    if(moment(end_time)<moment(publish_time)){
+    if(moment(end_time)<=moment(publish_time)){
       this.setState({
         endTimetypes:true,
-        endTimetypesval:"截止时间不能早于发布时间"
+        endTimetypesval:"截止时间必须晚于发布时间"
       })
       return
     }else{
@@ -531,16 +546,16 @@ class GraduationTaskssettingapp extends Component{
       })
     }
 
-    if(moment(latetime)<moment(publish_time)){
+    if(moment(latetime)<=moment(publish_time)){
       this.setState({
         latetimetype:true,
-        latetimetypeval:"结束时间不能早于发布时间"
+        latetimetypeval:"结束时间必须晚于发布时间"
       })
       return
-    }else if(moment(latetime)<moment(end_time)){
+    }else if(moment(latetime)<=moment(end_time)){
       this.setState({
         latetimetype:true,
-        latetimetypeval:"结束时间不能早于截止时间"
+        latetimetypeval:"结束时间必须晚于截止时间"
       })
       return
     }else{
@@ -562,7 +577,7 @@ class GraduationTaskssettingapp extends Component{
           commenttimetype:false
         })
       }
-      if(moment(this.state.commenttime)<moment(publish_time)){
+      if(moment(this.state.commenttime)<=moment(publish_time)){
         this.setState({
           commenttimetype:true,
           commenttimevalue:"开始时间不能小于发布时间",
@@ -574,7 +589,7 @@ class GraduationTaskssettingapp extends Component{
         })
       }
 
-      if(moment(this.state.commenttime)<moment(end_time)){
+      if(moment(this.state.commenttime)<=moment(end_time)){
         this.setState({
           commenttimetype:true,
           commenttimevalue:"开始时间不能小于截止时间",
@@ -918,7 +933,8 @@ class GraduationTaskssettingapp extends Component{
       endtimetype,
       commenttimetype,
       commenttimevalue,
-      flagPageEdit
+      flagPageEdit,
+			commentstatustype
     } =this.state;
 
     let courseId=this.props.match.params.coursesId;
@@ -992,7 +1008,7 @@ class GraduationTaskssettingapp extends Component{
                 }
                 {/*内容*/}
                 {task_type===2?<div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl30" >
-                    <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}>（提交作品时需要关联同组成员，组内成员作品共享）</span></div>
+                    <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}></span></div>
                     <div className={"mb30 h20 ml40"}>
                       <Input className={numtype===true?"noticeTip mr20":"mr20"} style={{ width:"100px" }} value={minnum}  onInput={this.setminnum}  disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
                       <span className="mr20">~</span>
@@ -1154,7 +1170,7 @@ class GraduationTaskssettingapp extends Component{
                   <div className={" font-16 color-dark h20 mb20"}>评分设置 </div>
                   <div className={"font-16 h20 mb20"}>最终成绩组成 <span className={"font-14 color-grey-c"}>（取各教师最终评分的平均分）</span></div>
                   <Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}
-														disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
+														disabled={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?true:false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
                   </Checkbox>
                   {crosscomment===true?<div>
                   <div className={"h20 mb30 ml30 mt20 ml87"}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 20a34ab89..0469d5d9c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -850,47 +850,47 @@ class GraduationTaskssettinglist extends Component{
 			 </span>
 			),
 		}, {
-			title: '操作',
-			key: 'operation',
-		  width:'100px',
-			dataIndex: 'operation',
-			className:'edu-txt-center',
-			render: operation => (
-				<div>
-					{this.props.isAdmin()?operation.map((tag,key) => {
-						return(
-							<React.Fragment>
-								{
-									tag.name && 
-									<Tooltip key={key} placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>其它历史评分将全部失效</pre>:""}>
-										{tag.name==="评阅"?<a style={{color:'#4CACFF',padding:"0px 5px"}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-												{tag.name}
-											</a>
-											:
-											<a style={{color:tag.name==="调分"?"#000":'#4CACFF',padding:"0px 5px"}}
-												onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}>
-												{tag.name}
-											</a>
-										}
-									</Tooltip>
-								}
-							</React.Fragment>
-						)
-					}):""}
-					{
-						this.props.isStudent()?
-							operation.map((tag,key) => {
-								return(
-									<div key={key}>
-										{tag.view_work===false?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
-									</div>
-								)}
-							):""
-					}
-				</div>
+				title: '操作',
+				key: 'operation',
+				width:'100px',
+				dataIndex: 'operation',
+				className:'edu-txt-center',
+				render: operation => (
+					<div>
+						{this.props.isAdmin()?operation.map((tag,key) => {
+							return(
+								<React.Fragment>
+									{
+										tag.name &&
+										<Tooltip key={key} placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>其它历史评分将全部失效</pre>:""}>
+											{tag.name==="评阅"?<a style={{color:'#4CACFF',padding:"0px 5px"}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+													{tag.name}
+												</a>
+												:
+												<a style={{color:tag.name==="调分"?"#000":'#4CACFF',padding:"0px 5px"}}
+													 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}>
+													{tag.name}
+												</a>
+											}
+										</Tooltip>
+									}
+								</React.Fragment>
+							)
+						}):""}
+						{
+							this.props.isStudent()?
+								operation.map((tag,key) => {
+									return(
+										<div key={key}>
+											{tag.view_work===false?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
+										</div>
+									)}
+								):""
+						}
+					</div>
 
-			),
-		}];
+				),
+			}];
 
 		let courseId=this.props.match.params.coursesId;
 		let position=this.props.match.params.position;
@@ -972,7 +972,7 @@ class GraduationTaskssettinglist extends Component{
 						text-overflow: ellipsis;
 						white-space: nowrap;
 						 }
-						 .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
+					 .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
 						     padding: 16px 10px
 						 }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index ed52d5cbc..ae764cc95 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -88,7 +88,7 @@ class GraduationTasks extends Component{
 
   savedelete=()=>{
     this.setState({
-      Modalstype:false,
+			Modalstype:false,
     })
     let {checkAllValue,checkBoxValues,search,page,order} = this.state;
     // let all_check;
@@ -107,9 +107,10 @@ class GraduationTasks extends Component{
         if (response.data.status == 0) {
           // {"status":1,"message":"删除成功"}
           this.fetchAll(search,page,order)
+					this.props.showNotification(response.data.message);
           this.setState({
-            Modalstype:true,
-            Modalstopval:response.data.message,
+            // Modalstype:true,
+            // Modalstopval:response.data.message,
             ModalsBottomval:"",
             ModalSave:this.cancelmodel,
             Loadtype:true,
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js
index b53e4528b..38e68ad32 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js
@@ -382,7 +382,7 @@ class GraduateTopicPostWorksNew extends Component{
                   )}
                 </Form.Item>
 
-                <span className="tag color-grey9 ">(项目管理员角色的成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享)</span>
+                <span className="tag color-grey9 ">(学生提交作品时需要关联同组成员，组内成员作品共享)</span>
                 <Form.Item
                   label=""
                   className="  "
@@ -394,7 +394,7 @@ class GraduateTopicPostWorksNew extends Component{
                     <Checkbox >基于项目实施</Checkbox>
                   )}
                 </Form.Item>
-                <span className="tag color-grey9 ">(勾选后各小组必须在educoder平台创建项目，教师可随时观察平台对各小组最小进展的实时统计)</span>
+                <span className="tag color-grey9 ">(选中，则必须在本平台创建项目，项目管理员可以提交作品；不选中，无需在平台创建项目，任意小组成员均可以提交作品)</span>
               </div>
 
               <div className="formBlock">
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 9d34b7036..5aa7f8f72 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2863,7 +2863,7 @@ class PollNew extends Component {
 										}
 									</style>
 									<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
-												 style={{"margin-top": "15px", "text-align": "left"}}
+												 style={{"margin-top": "15px", textAlign: "left"}}
 												 onInput={this.changeTopicName}
 												 readOnly={readOnlys}
 												 autoComplete="off"
@@ -2887,7 +2887,7 @@ class PollNew extends Component {
 									<div style={{"color": "#212121", "font-size": "16px"}}>问卷须知</div>
 
 									<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"
-														style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}
+														style={{"height": "120px", "margin-top": "15px", textAlign: "left"}}
 														maxLength="100"
 														readOnly={readOnlys}
 														onInput={this.changeTopicNametwo}
@@ -3012,8 +3012,8 @@ class PollNew extends Component {
 										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 											return (
 												<div className="h20 pt20" style={{"clear": "both"}}>
-													<Radio value={i} className={"fl"} style={{"text-align": "left",marginTop:"3px"}}></Radio>
-													<span className={" flex1 "} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}} >{items.answer_text}</span>
+													<Radio value={i} className={"fl"} style={{textAlign: "left",marginTop:"3px"}}></Radio>
+													<span className={" flex1 "} style={{textAlign: "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}} >{items.answer_text}</span>
 
 												</div>
 											)
@@ -3029,8 +3029,8 @@ class PollNew extends Component {
 											{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 												return (
 													<div className="mt10 pt20 " style={{"clear": "both"}}>
-														<Checkbox value={i} key={i} className={"fl"} style={{"text-align": "left"}}></Checkbox>
-														<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}}>{items.answer_text}</span>
+														<Checkbox value={i} key={i} className={"fl"} style={{textAlign: "left",marginRight:"8px"}}></Checkbox>
+														<span className={" flex1"} style={{textAlign: "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}}>{items.answer_text}</span>
 													</div>
 												)
 											})}
@@ -3086,7 +3086,7 @@ class PollNew extends Component {
 																			<p className="df mb20">
 															<span
 																className="color-grey-6 mr3 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>其它</span>
+																style={{textAlign: "center"}}>其它</span>
 
 																				<input
 																					className="mr20 input-flex-40 TextAreainput" disabled
@@ -3100,7 +3100,7 @@ class PollNew extends Component {
 																					: ""}
 																			</p>) : (<p className="df mb20">
 													<span className="color-grey-6 mr10 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>选项</span>
+																style={{textAlign: "center"}}>选项</span>
 
 																			<TextArea
 																				autosize={{minRows: 1, maxRows: 5}}
@@ -3172,7 +3172,7 @@ class PollNew extends Component {
                                   "height": "80%";
 																	"margin-top": "5px";
 																 "margin-left": "5px";
-																 "text-align": "center";
+																 textAlign: "center";
 																 "display": "block";
 																 "opacity": "1";
 																			}
@@ -3328,7 +3328,7 @@ class PollNew extends Component {
 																				<p className="df mb20">
 															<span
 																className="color-grey-6 mr3 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>其它</span>
+																style={{textAlign: "center"}}>其它</span>
 
 																					<input
 																						className="mr20 input-flex-40 TextAreainput" disabled
@@ -3342,7 +3342,7 @@ class PollNew extends Component {
 																						: ""}
 																				</p>) : (<p className="df mb20">
 													<span className="color-grey-6 mr10 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>选项</span>
+																style={{textAlign: "center"}}>选项</span>
 
 																				<TextArea
 																					autosize={{minRows: 1, maxRows: 5}}
@@ -3414,7 +3414,7 @@ class PollNew extends Component {
                                   "height": "80%";
 																	"margin-top": "5px";
 																 "margin-left": "5px";
-																 "text-align": "center";
+																 textAlign: "center";
 																 "display": "block";
 																 "opacity": "1";
 																			}
@@ -3579,7 +3579,7 @@ class PollNew extends Component {
 																	<p className="df mb20">
 															<span
 																className="color-grey-6 mr3 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>其它</span>
+																style={{textAlign: "center"}}>其它</span>
 
 																		<input
 																			className="mr20 input-flex-40 TextAreainput" disabled
@@ -3593,7 +3593,7 @@ class PollNew extends Component {
 																			: ""}
 																	</p>) : (<p className="df mb20">
 													<span className="color-grey-6 mr10 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>选项</span>
+																style={{textAlign: "center"}}>选项</span>
 
 																	<TextArea
 																		autosize={{minRows: 1, maxRows: 5}}
@@ -3665,7 +3665,7 @@ class PollNew extends Component {
                                   "height": "80%";
 																	"margin-top": "5px";
 																 "margin-left": "5px";
-																 "text-align": "center";
+																 textAlign: "center";
 																 "display": "block";
 																 "opacity": "1";
 																			}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a5423b6e9..93ed7ff7d 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -3059,20 +3059,20 @@ class Listofworksstudentone extends Component {
 		// console.log(this.props.isAdmin());
 
 	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
-	 try {
-		 if(this.props.isAdmin() === false){
-			 if(teacherdata&&teacherdata.student_works){
-				 if(teacherdata&&teacherdata.student_works.length>0){
-					 console.log("这是双层页面。。。。");
-
-				 }
-			 }
-
-		 }
-	 }catch (e) {
-	 	console.log("Listofworksstudentone123");
-    console.log(e);
-	 }
+	 // try {
+		//  if(this.props.isAdmin() === false){
+		// 	 if(teacherdata&&teacherdata.student_works){
+		// 		 if(teacherdata&&teacherdata.student_works.length>0){
+		// 			 console.log("这是双层页面。。。。");
+	 //
+		// 		 }
+		// 	 }
+	 //
+		//  }
+	 // }catch (e) {
+	 // 	console.log("Listofworksstudentone123");
+   //  console.log(e);
+	 // }
 
 		return (
 
@@ -3151,12 +3151,12 @@ class Listofworksstudentone extends Component {
 									 typs={this.state.typs}
 								 />
 								 {
-								 homework_status.length===0?
+									 homework_status&&homework_status.length===0?
 									 <div className="edu-back-white">
 								 <NoneData></NoneData>
 									 </div>
 								 :
-								 homework_status.length>0 && homework_status[0]==="未发布"?
+									homework_status&&homework_status.length>0 && homework_status[0]==="未发布"?
 									 <div className="edu-back-white">
 								 <NoneData></NoneData>
 									 </div>
@@ -3231,7 +3231,7 @@ class Listofworksstudentone extends Component {
 
 												 <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 													 {course_is_end===true?"":<span>
-										{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
+										{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?
 											(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>
 												查看最新成绩
 											</div>:""):
@@ -3491,12 +3491,12 @@ class Listofworksstudentone extends Component {
 												}
 
 												{
-													homework_status.length===0?
+													homework_status&&homework_status.length&&homework_status.length===0?
 														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
 															<NoneData></NoneData>
 														</div>
 														:
-														homework_status.length>0 && homework_status[0]==="未发布"?
+														homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
 															<div className=" clearfix edu-back-white "  style={{margin:  "auto" , minWidth:"1200px"}}>
 																<NoneData></NoneData>
 															</div>
@@ -3555,9 +3555,13 @@ class Listofworksstudentone extends Component {
 																			{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?
-															<div className={"computeTime font-16"} onClick={this.setComputeTime}>
-																查看最新成绩
-															</div>
+															(
+																teacherdata&&teacherdata.update_score===true?
+																	<div className={"computeTime font-16"} onClick={this.setComputeTime}>
+																		查看最新成绩
+																	</div>
+																	:""
+															)
 															:"")
 														:
 														(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
@@ -3651,12 +3655,12 @@ class Listofworksstudentone extends Component {
 												}
 
 												{
-													homework_status.length===0?
+													homework_status&&homework_status.length===0?
 														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
 															<NoneData></NoneData>
 														</div>
 														:
-														homework_status.length>0 && homework_status[0]==="未发布"?
+														homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
 															<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
 																<NoneData></NoneData>
 															</div>
@@ -3783,9 +3787,15 @@ class Listofworksstudentone extends Component {
 																			<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 																			{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 																{computeTimetype===true?
-																	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTime}>
-																		查看最新成绩
-																	</div>:""):
+
+																	(this.props.isNotMember()===false?
+																		(
+																			teacherdata&&teacherdata.update_score===true?
+																				<div className={"computeTime font-16"} onClick={this.setComputeTime}>
+																					查看最新成绩
+																				</div>:""
+																		)
+																		:""):
 																	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
 																		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>
 																			查看最新成绩
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 3534ad4ce..fbd7ab3b4 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -92,7 +92,7 @@ class Trainingjobsetting extends Component {
             level: undefined,
             ealuation: false,
             latededuction: undefined,
-            latedeductiontwo: "20",
+            latedeductiontwo: "0",
             database: false,
             datasheet: false,
             databasetwo: undefined,
@@ -120,8 +120,10 @@ class Trainingjobsetting extends Component {
             showmodel:false,
 					  code_review:false,
             testscripttiptype:false,
+
             end_timebool:false,
             late_timesbool:false,
+            work_efficiencys:false,
         }
         // console.log("获取到的值")
         // console.log("Trainingjobsetting")
@@ -283,7 +285,7 @@ class Trainingjobsetting extends Component {
                     allowreplenishment: result.data.allow_late,
                     latededuction: result.data.late_penalty,
                     level: result.data.answer_open_evaluation === true ? "满分" : "扣分",
-                    completionefficiencyscore: result.data.work_efficiency,
+                    work_efficiencys: result.data.work_efficiency,
                     latedeductiontwo: result.data.eff_score,
                     proportion: result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ? "自定义分值" : "",
                     publicwork: result.data.work_public,
@@ -291,6 +293,12 @@ class Trainingjobsetting extends Component {
                     code_review:result.data.code_review
                 })
                 this.props.Getdataback(result,result.data);
+                if(this.props.isAdmin()!== undefined){
+                    if(this.props.isAdmin()===true){
+                        this.editSettings(result);
+                    }
+                }
+
             }
         })
 
@@ -634,7 +642,7 @@ class Trainingjobsetting extends Component {
                 late_penalty: parseInt(this.state.latededuction), //迟交扣分
                 late_time: moment(this.state.late_time).format('YYYY-MM-DD HH:mm'), //结束时间
                 answer_open_evaluation: this.state.level === "满分" ? true : false, //扣分项
-                work_efficiency: this.state.completionefficiencyscore, //完成效率评分占比
+                work_efficiency: this.state.work_efficiencys, //完成效率评分占比
                 eff_score: this.state.completionefficiencyscore === true ? this.state.latedeductiontwo : undefined,//占比分
                 shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
                 challenge_settings: array,
@@ -659,6 +667,7 @@ class Trainingjobsetting extends Component {
                         flagPageEditsthrees:false,
                         flagPageEditsfor:false,
                         whethertopay:false,
+                        completionefficiencyscore:false,
                     })
                     this.refs.targetElementTrainingjobsetting.scrollIntoView()
 
@@ -1003,6 +1012,7 @@ class Trainingjobsetting extends Component {
             this.state.latedeductiontwo=20;
             this.setState({
                 completionefficiencyscore: e.target.checked,
+                work_efficiencys:e.target.checked,
                 latedeductiontwo: 20,
             })
             //均分比例
@@ -1019,6 +1029,7 @@ class Trainingjobsetting extends Component {
             this.state.latedeductiontwo=0;
             this.setState({
                 completionefficiencyscore: e.target.checked,
+                work_efficiencys:e.target.checked,
                 latedeductiontwo: 0,
             })
             //均分比例
@@ -1067,7 +1078,7 @@ class Trainingjobsetting extends Component {
 
     // //占比分
     changeTopicNametwo = (value) => {
-        // console.log("2e.target.value", value)
+        // console.log("TrainingjobsettingTrainingjobsetting", value)
         if (value === "" || value === undefined) {
             return
         }
@@ -1694,17 +1705,78 @@ class Trainingjobsetting extends Component {
                 if(this.state.allowreplenishment === false){
                     whethertopays=false;
                 }
-                this.setState({
-                    flagPageEditsbox:true,
-                    flagPageEdit: true,
-                    completionefficiencyscore:true,
-                    whethertopay:whethertopays,
-                    flagPageEditstwo:releasetime,
-                    flagPageEditsthrees:deadline,
-                    flagPageEditsfor:endtime,
-                    unifiedsetting:this.state.unifiedsetting,
-                    latedeductiontwo:20,
-                })
+                if(this.state.jobsettingsdata!==undefined){
+                    
+                }
+
+                try {
+                    if(this.state.jobsettingsdata&& this.state.jobsettingsdata.data.homework_status[0]==="未发布"){
+                        this.setState({
+                            flagPageEditsbox:true,
+                            flagPageEdit: true,
+                            whethertopay:whethertopays,
+                            flagPageEditstwo:releasetime,
+                            flagPageEditsthrees:deadline,
+                            flagPageEditsfor:endtime,
+                            completionefficiencyscore:true,
+                            work_efficiencys:true,
+                            unifiedsetting:this.state.unifiedsetting,
+                            latedeductiontwo:20,
+                        });
+                        //均分比例
+                        try {
+                            if(this.state.proportion==="均分比例"){
+                                this.Equalproportion(20);
+
+                            }else if(this.state.proportion==="经验值比例"){
+                                this.Empiricalvalueratio(20);
+
+                            }
+                        }catch (e) {
+
+                        }
+
+                    }else {
+                        this.setState({
+                            flagPageEditsbox:true,
+                            flagPageEdit: true,
+                            whethertopay:whethertopays,
+                            flagPageEditstwo:releasetime,
+                            flagPageEditsthrees:deadline,
+                            flagPageEditsfor:endtime,
+                            unifiedsetting:this.state.unifiedsetting,
+                        });
+                        if(this.state.work_efficiencys===true){
+                            this.setState({
+                                completionefficiencyscore:true,
+                            })
+                        }else{
+                            this.setState({
+                                completionefficiencyscore:false,
+                            })
+                        }
+                    }
+                }catch (e) {
+                    this.setState({
+                        flagPageEditsbox:true,
+                        flagPageEdit: true,
+                        whethertopay:whethertopays,
+                        flagPageEditstwo:releasetime,
+                        flagPageEditsthrees:deadline,
+                        flagPageEditsfor:endtime,
+                        unifiedsetting:this.state.unifiedsetting,
+                    });
+                    if(this.state.work_efficiencys===true){
+                        this.setState({
+                            completionefficiencyscore:true,
+                        })
+                    }else{
+                        this.setState({
+                            completionefficiencyscore:false,
+                        })
+                    }
+                }
+
                if(this.state.proportion === "自定义分值"){
                    this.setState({
                        boolUnitetwoname:"自定义分值",
@@ -1717,7 +1789,121 @@ class Trainingjobsetting extends Component {
         } catch (e) {
 
         }
+    };
+     //一进来就是老师要用的编辑页面
+    editSettings=(datas)=>{
+        console.log("编辑页面");
+        console.log(datas);
+        try {
+            if (datas.data.is_end === true) {
+                this.setState({
+                    modalsType: true,
+                    modalsTopval: "课堂已结束不能再修改!",
+                    loadtype: true,
+                    modalSave: this.cancelBox
+                })
+            } else {
+                var releasetime =true;
+                var deadline = true;
+                var  endtime =true;
+                var whethertopays =true;
+                //发布时间
+
+                if(moment(datas.data.publish_time,"YYYY-MM-DD HH:mm")<=moment()){
+                    releasetime=false;
+                }
+                //截止时间
+                if(moment(datas.data.end_time,"YYYY-MM-DD HH:mm")<=moment()){
+                    deadline=false;
+                }
+                //结束时间
+                if(moment(datas.data.late_time,"YYYY-MM-DD HH:mm")<=moment()){
+                    endtime=false;
+                }
+                if(datas.data.allowreplenishment === false){
+                    whethertopays=false;
+                }
 
+                try {
+                    if(datas.data&& datas.data.homework_status[0]==="未发布"){
+                        this.setState({
+                            flagPageEditsbox:true,
+                            flagPageEdit: true,
+                            whethertopay:whethertopays,
+                            flagPageEditstwo:releasetime,
+                            flagPageEditsthrees:deadline,
+                            flagPageEditsfor:endtime,
+                            completionefficiencyscore:true,
+                            work_efficiencys:true,
+                            unifiedsetting:datas.data.unifiedsetting,
+                            latedeductiontwo:20,
+                        });
+                        //均分比例
+                        try {
+                            if(datas.data.proportion==="均分比例"){
+                                this.Equalproportion(20);
+
+                            }else if(datas.data.proportion==="经验值比例"){
+                                this.Empiricalvalueratio(20);
+
+                            }
+                        }catch (e) {
+
+                        }
+
+                    }else {
+                        this.setState({
+                            flagPageEditsbox:true,
+                            flagPageEdit: true,
+                            whethertopay:whethertopays,
+                            flagPageEditstwo:releasetime,
+                            flagPageEditsthrees:deadline,
+                            flagPageEditsfor:endtime,
+                            unifiedsetting:datas.data.unifiedsetting,
+                        });
+                        if(datas.data.work_efficiencys===true){
+                            this.setState({
+                                completionefficiencyscore:true,
+                            })
+                        }else{
+                            this.setState({
+                                completionefficiencyscore:false,
+                            })
+                        }
+                    }
+                }catch (e) {
+                    this.setState({
+                        flagPageEditsbox:true,
+                        flagPageEdit: true,
+                        whethertopay:whethertopays,
+                        flagPageEditstwo:releasetime,
+                        flagPageEditsthrees:deadline,
+                        flagPageEditsfor:endtime,
+                        unifiedsetting:datas.data.unifiedsetting,
+                    });
+                    if(datas.data.work_efficiencys===true){
+                        this.setState({
+                            completionefficiencyscore:true,
+                        })
+                    }else{
+                        this.setState({
+                            completionefficiencyscore:false,
+                        })
+                    }
+                }
+
+                if(datas.data.proportion === "自定义分值"){
+                    this.setState({
+                        boolUnitetwoname:"自定义分值",
+                        boolUnitetwo: false,
+                        flagPageEdits:true,
+                    })
+                }
+
+            }
+        } catch (e) {
+
+        }
     }
     //取消编辑
     cancelEdit = () => {
@@ -1735,6 +1921,8 @@ class Trainingjobsetting extends Component {
             hand__e_tip: "",
             hand_flags: false,
             handclass: undefined,
+            completionefficiencyscore:false,
+            latedeductiontwo:0,
             unit_e_tip: "",
         })
         this.refs.targetElementTrainingjobsetting.scrollIntoView();
@@ -1849,9 +2037,9 @@ class Trainingjobsetting extends Component {
 
 
         const dataformat = 'YYYY-MM-DD HH:mm';
-        let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state;
-        console.log(publish_timebool);
-        console.log(!flagPageEditstwo);
+        let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,work_efficiencys,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state;
+        // console.log(publish_timebool);
+        // console.log(!flagPageEditstwo);
         const radioStyle = {
             display: 'block',
             height: '30px',
@@ -1877,6 +2065,8 @@ class Trainingjobsetting extends Component {
         // }
         // console.log(this.props.isAdmin())
         // console.log(this.state.code_review===false)
+        // console.log("引入的分值");
+        // console.log(this.state.work_efficiencys);
         return (
             <div className=" clearfix "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
                 {this.state.showmodel===true?<ShixunWorkModal
@@ -2131,7 +2321,7 @@ class Trainingjobsetting extends Component {
                             <div className=" clearfix edu-back-white poll_list mt10" style={{marginLeft:" 40px"}}>
                                     <Checkbox disabled={!flagPageEdit} className=" font-13 mt10"
                                               onChange={this.onChangeeffectiveness}
-                                              checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span
+                                              checked={this.state.work_efficiencys} style={{"color":"#666666"}}>效率分<span
                                       className={"font-14 color-grey-c font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span>
                                     </Checkbox>
                                 <div>
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index fccfbb0b2..73b791ece 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -1,88 +1,94 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
 import {
 	Spin,
 	Pagination,
 } from "antd";
 import axios from 'axios';
-import {getImageUrl,markdownToHTML} from 'educoder';
+import {getImageUrl, markdownToHTML} from 'educoder';
 import "../css/messagemy.css"
+
 //消息页面
-class MessagSub extends Component{
+class MessagSub extends Component {
 	constructor(props) {
 		super(props);
-		this.state={
-			page:1,
-			limit:10,
-			typeysl:"",
-			count:0,
-			isSpin:false,
-			data:undefined,
+		this.state = {
+			page: 1,
+			limit: 10,
+			typeysl: "",
+			count: 0,
+			isSpin: false,
+			data: undefined,
 		}
 	}
-   // 初始化数据
-	componentDidMount(){
+
+	// 初始化数据
+	componentDidMount() {
 		// console.log("初始化数据了MessagSub");
 		// console.log(this.props);
-		this.getdata("",this.state.page);
+		this.getdata("", this.state.page);
 		// this.Messageprivatemessageunreadmessage();
 		try {
 			this.props.Mtab(1);
-		}catch (e) {
+		} catch (e) {
 
 		}
 		this.props.triggerRef(this)
 	}
 
 	//塞选页数
-	paginationonChanges=(pageNumber)=>{
+	paginationonChanges = (pageNumber) => {
 		this.setState({
 			page: pageNumber,
 		})
-		this.getdata(this.state.typeysl,pageNumber);
+		this.getdata(this.state.typeysl, pageNumber);
 
 	}
 	//获取数据源
-	getdata=(types,page)=>{
+	getdata = (types, page) => {
 		this.setState({
-			isSpin:true,
+			isSpin: true,
 		})
-		let{limit}=this.state;
+		let {limit} = this.state;
 		let url = `/users/tidings.json`;
-		axios.get((url),{params:{
-				type:types,
-				page:page,
-				per_page:limit,
-			}}).then((result) => {
+		axios.get((url), {
+			params: {
+				type: types,
+				page: page,
+				per_page: limit,
+			}
+		}).then((result) => {
 			if (result) {
 				// if (result.data.status === 0) {
 
-					this.setState({
-						page: page,
-						count: result.data.count,
-						typeysl: types,
-						isSpin: false,
-						data: result.data.tidings === null ? undefined : result.data.tidings === undefined ? undefined : result.data.tidings === [] ? undefined : result.data.tidings === "[]" ? undefined : result.data.tidings.length === 0 ? undefined : result.data.tidings,
-					})
+				this.setState({
+					page: page,
+					count: result.data.count,
+					typeysl: types,
+					isSpin: false,
+					data: result.data.tidings === null ? undefined : result.data.tidings === undefined ? undefined : result.data.tidings === [] ? undefined : result.data.tidings === "[]" ? undefined : result.data.tidings.length === 0 ? undefined : result.data.tidings,
+				})
 				// }
 			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				isSpin:false,
+				isSpin: false,
 			})
 		})
 	};
-	getdatas=()=>{
+	getdatas = () => {
 		this.setState({
-			isSpin:true,
+			isSpin: true,
 		})
-		let{typeysl,page,limit}=this.state;
+		let {typeysl, page, limit} = this.state;
 		let url = `/users/tidings.json`;
-		axios.get((url),{params:{
-				type:typeysl,
-				page:page,
-				per_page:limit,
-			}}).then((result) => {
+		axios.get((url), {
+			params: {
+				type: typeysl,
+				page: page,
+				per_page: limit,
+			}
+		}).then((result) => {
 			if (result) {
 				// if (result.data.status === 0) {
 
@@ -98,172 +104,172 @@ class MessagSub extends Component{
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				isSpin:false,
+				isSpin: false,
 			})
 		})
 	}
 
-	componentWillUnmount(){
+	componentWillUnmount() {
 		// 卸载异步操作设置状态
 		this.setState = (state, callback) => {
 			return;
 		}
 	}
 
-	gettourl=(item)=>{
+	gettourl = (item) => {
 		switch (item.container_type) {
 			case "ApplyUserAuthentication" :
-			 if(item.tiding_type==="Apply"){
-          if(item.auth_type===1){
-          	//系统管理页面
+				if (item.tiding_type === "Apply") {
+					if (item.auth_type === 1) {
+						//系统管理页面
 						return window.open("/managements/identity_authentication");
 					}
-          if(item.auth_type===2){
+					if (item.auth_type === 2) {
 						//系统管理页面
 						return window.open("/managements/professional_authentication")
 					}
-			 }
-			 if(item.tiding_type ==="System"){
-				 // 账号管理页-认证信息
-				 return   window.open("/account/certification")
-			 }
-			 return ;
+				}
+				if (item.tiding_type === "System") {
+					// 账号管理页-认证信息
+					return window.open("/account/certification")
+				}
+				return;
 			case "CancelUserAuthentication" :
 				// 账号管理页-认证信息
-				return  window.open("/account/certification")
+				return window.open("/account/certification")
 			case "CancelUserProCertification" :
 				// 账号管理页-认证信息
-				return  window.open("/account/certification")
+				return window.open("/account/certification")
 			case "ApplyAddDepartment" :
-				if(item.tiding_type==="Apply"){
+				if (item.tiding_type === "Apply") {
 					//部门审批
-					return   window.open("/managements/depart")
+					return window.open("/managements/depart")
 				}
-				if(item.tiding_type==="System"){
+				if (item.tiding_type === "System") {
 					// 账号管理页/account/profile
-					return    window.open("/account/profile")
+					return window.open("/account/profile")
 				}
-				return ;
+				return;
 			case "ApplyAddSchools" :
-				if(item.tiding_type==="Apply"){
+				if (item.tiding_type === "Apply") {
 					// 单位审批
-					return    window.open(" /managements/unit")
+					return window.open(" /managements/unit")
 				}
-				if(item.tiding_type==="System"){
+				if (item.tiding_type === "System") {
 					//  账号管理页
-					return   window.open("/account/profile")
+					return window.open("/account/profile")
 				}
-				return ;
+				return;
 			case "ApplyAction" :
-				 switch (item.parent_container_type) {
-					 case "ApplyShixun" :
-						 if(item.tiding_type==="Apply"){
-							 return   window.open("/managements/shixun_authorization")
-						 }
-						 if(item.tiding_type==="System"){
-							 // 实训详情页 :identifier = identifier
-							 return   window.open(`/shixuns/${item.identifier}/challenges`)
-						 }
-					 case "ApplySubject" :
-						 if(item.tiding_type==="Apply"){
-							 // 实训课程发布
-							 return    window.open("/managements/subject_authorization")
-						 }
-						 if(item.tiding_type==="System"){
-							 //  实践课程详情页 :parent_container_id = parent_container_id
+				switch (item.parent_container_type) {
+					case "ApplyShixun" :
+						if (item.tiding_type === "Apply") {
+							return window.open("/managements/shixun_authorization")
+						}
+						if (item.tiding_type === "System") {
+							// 实训详情页 :identifier = identifier
+							return window.open(`/shixuns/${item.identifier}/challenges`)
+						}
+					case "ApplySubject" :
+						if (item.tiding_type === "Apply") {
+							// 实训课程发布
+							return window.open("/managements/subject_authorization")
+						}
+						if (item.tiding_type === "System") {
+							//  实践课程详情页 :parent_container_id = parent_container_id
 
-							 return  window.open(`/paths/${item.parent_container_id}`)
-						 }
-					 case "TrialAuthorization" :
-						 if(item.tiding_type==="Apply"){
-							 // 试用授权页面
-							 return   window.open("/managements/trial_authorization")
-						 }
-						 if(item.tiding_type==="System"){
-							 // 账号管理页
-							 return    window.open("/account/profile")
-						 }
-				 }
-				 return ;
+							return window.open(`/paths/${item.parent_container_id}`)
+						}
+					case "TrialAuthorization" :
+						if (item.tiding_type === "Apply") {
+							// 试用授权页面
+							return window.open("/managements/trial_authorization")
+						}
+						if (item.tiding_type === "System") {
+							// 账号管理页
+							return window.open("/account/profile")
+						}
+				}
+				return;
 			case 'JoinCourse' :
 				// 课堂详情页 :id =
-				return    window.open(`/courses/${item.belong_container_id}/teachers`)
+				return window.open(`/courses/${item.belong_container_id}/teachers`)
 			case 'StudentJoinCourse':
 				// 课堂详情页 :id = container_id
-				if(item.tiding_type === 'Apply') {
-					return   window.open(`/courses/${item.belong_container_id}/teachers`);
+				if (item.tiding_type === 'Apply') {
+					return window.open(`/courses/${item.belong_container_id}/teachers`);
 				}
-				if(item.tiding_type === 'System'){
+				if (item.tiding_type === 'System') {
 					//教学案例详情 :id = container_id
-					return   window.open(`/courses/${item.belong_container_id}/students`);
+					return window.open(`/courses/${item.belong_container_id}/students`);
 				}
 			case  'DealCourse':
 				// 课堂详情页 :id = container_id
-				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case 'TeacherJoinCourse':
 				// 课堂详情页 :id = container_id
-				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case  'Course' :
 				// 课堂详情页 :id = container_id
-				if(item.tiding_type==="Delete"){
+				if (item.tiding_type === "Delete") {
 
-        return;
+					return;
 				}
-				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case 'ArchiveCourse' :
 				// 课堂详情页 :id = container_id
-				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case "Shixun" :
-				return   window.open(`/shixuns/${item.identifier}/challenges`)
+				return window.open(`/shixuns/${item.identifier}/challenges`)
 			case "Subject" :
 				// 实践课程详情页 :id = container_id
-				return  window.open(`/paths/${item.container_id}`)
+				return window.open(`/paths/${item.container_id}`)
 			case "JournalsForMessage" :
-				 switch (item.parent_container_type) {
-					 case "Principal" :
-						 // 反馈页 :id = parent_container_id
-						 // 不用跳了
-						 return '';
-					 case "HomeworkCommon" :
-					 	//学生作业页 homework = parent_container_id
-						 if(item.homework_type==="normal"){
-							 //普通作业
-							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
-						 }
-						 if(item.homework_type==="group"){
-							 //分组作业
-							 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
-						 }
-						 if(item.homework_type==="practice"){
-							 //实训作业
-							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
-						 }
-						 return "";
-					 case "GraduationTopic" :
-					 	// 毕业目标页 parent_container_id
-						 return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
-					 case "StudentWorksScore" :
-					 	//学生作业页
-						 if(item.homework_type==="normal"){
-							 //普通作业
-							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
-						 }
-						 if(item.homework_type==="group"){
-							 //分组作业
-							 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
-						 }
-						 if(item.homework_type==="practice"){
-							 //实训作业
-							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
-						 }
-						 return "";
-				 }
+				switch (item.parent_container_type) {
+					case "Principal" :
+						// 反馈页 :id = parent_container_id
+						// 不用跳了
+						return '';
+					case "HomeworkCommon" :
+						//学生作业页 homework = parent_container_id
+						if (item.homework_type === "normal") {
+							//普通作业
+							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
+						}
+						if (item.homework_type === "group") {
+							//分组作业
+							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
+						}
+						if (item.homework_type === "practice") {
+							//实训作业
+							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
+						}
+						return "";
+					case "GraduationTopic" :
+						// 毕业目标页 parent_container_id
+						return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
+					case "StudentWorksScore" :
+						//学生作业页
+						if (item.homework_type === "normal") {
+							//普通作业
+							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
+						}
+						if (item.homework_type === "group") {
+							//分组作业
+							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
+						}
+						if (item.homework_type === "practice") {
+							//实训作业
+							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
+						}
+						return "";
+				}
 			case "Memo" :
 				// 交流问答页 :id = parent_container_id
-				return   window.open(`/forums/${item.parent_container_id}`);
+				return window.open(`/forums/${item.parent_container_id}`);
 			case "Message" :
 				// 交流问答页 :id = parent_container_id
-				return   window.open(`/forums/`);
+				return window.open(`/forums/`);
 			case "Watcher" :
 				// 用户个人中心页 :id = item.trigger_user.login
 				return window.open(`/users/${item.trigger_user.login}/courses`)
@@ -271,7 +277,7 @@ class MessagSub extends Component{
 				// 这块太复杂 不好处理
 				return '';
 			case "Grade" :
-		    //个人中心页 :id = item.trigger_user.login
+				//个人中心页 :id = item.trigger_user.login
 				// return window.open(`/users/${item.trigger_user.login}/courses`;
 				return "";
 			case "JoinProject" :
@@ -282,7 +288,7 @@ class MessagSub extends Component{
 				return window.open(`/projects/${item.container_id}`)
 			case  'DealProject':
 				//项目详情页 :id = container_id
-				return  window.open(`/projects/${item.container_id}`)
+				return window.open(`/projects/${item.container_id}`)
 			case  'ManagerJoinProject':
 				//项目详情页 :id = container_id
 				return window.open(`/projects/${item.container_id}`)
@@ -305,22 +311,22 @@ class MessagSub extends Component{
 					case "ExerciseScore":
 						// 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id
 						return window.open(`	/courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`);
-						//记得跳评阅页面
+					//记得跳评阅页面
 					default :
 						// 课堂-试卷列表详情 :id = container_id
 						return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`);
 				}
 			case 'StudentGraduationTopic' :
-			  //课堂-毕业选题详情 :id = parent_container_id
+				//课堂-毕业选题详情 :id = parent_container_id
 				return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
 			case  'DealStudentTopicSelect'  :
-			 //课堂-毕业选题详情 :id = parent_container_id
+				//课堂-毕业选题详情 :id = parent_container_id
 				return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
 			case 'GraduationTask' :
 				//课堂-毕业任务页 :id = container_id
 				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`)
 			case "GraduationWork" :
-		   //课堂-毕业xx页 :id = container_id
+				//课堂-毕业xx页 :id = container_id
 				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`)
 			case "GraduationWorkScore" :
 				// 课堂-毕业xx页 :id = parent_container_id
@@ -329,70 +335,70 @@ class MessagSub extends Component{
 				switch (item.parent_container_type) {
 					case "AnonymousCommentFail" :
 						// 课堂-作业列表 homework = container_id
-						if(item.homework_type==="normal"){
+						if (item.homework_type === "normal") {
 							//普通作业
 							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="group"){
+						if (item.homework_type === "group") {
 							//分组作业
 							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="practice"){
+						if (item.homework_type === "practice") {
 							//实训作业
 							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 					case "HomeworkPublish" :
-						if(item.homework_type==="normal"){
+						if (item.homework_type === "normal") {
 							//普通作业
 							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="group"){
+						if (item.homework_type === "group") {
 							//分组作业
 							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="practice"){
+						if (item.homework_type === "practice") {
 							//实训作业
 							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 					case "AnonymousAppeal" :
-						if(item.homework_type==="normal"){
+						if (item.homework_type === "normal") {
 							//普通作业
 							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="group"){
+						if (item.homework_type === "group") {
 							//分组作业
 							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="practice"){
+						if (item.homework_type === "practice") {
 							//实训作业
 							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 					default :
 						// 课堂-作业列表 homework = container_id
-						if(item.homework_type==="normal"){
+						if (item.homework_type === "normal") {
 							//普通作业
 							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="group"){
+						if (item.homework_type === "group") {
 							//分组作业
 							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
-						if(item.homework_type==="practice"){
+						if (item.homework_type === "practice") {
 							//实训作业
 							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 				}
 			case "StudentWork" :
 				//课堂-作业 :id = container_id
-				if(item.homework_type==="normal"){
+				if (item.homework_type === "normal") {
 					//普通作业
 					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`)
 				}
-				if(item.homework_type==="group"){
+				if (item.homework_type === "group") {
 					//分组作业/courses/1208/group_homeworks/22373/1219130/appraise
 					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`)
 				}
-				if(item.homework_type==="practice"){
+				if (item.homework_type === "practice") {
 					//实训作业
 					return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 				}
@@ -425,7 +431,7 @@ class MessagSub extends Component{
 				// 	//实训作业
 				// 	return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 				// }
-					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`);
+				return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`);
 			case "ChallengeWorkScore" :
 				return '';
 			case "SendMessage" :
@@ -448,172 +454,191 @@ class MessagSub extends Component{
 					// /managements/library_applies
 					return window.open(`/managements/library_applies`)
 				}
-				if(item.tiding_type === 'System'){
+				if (item.tiding_type === 'System') {
 					//教学案例详情 :id = container_id
 					return window.open(`/moop_cases/${item.container_id}`)
 				}
 			case "ProjectPackage" :
-				if(item.tiding_type==="Destroyed"){
-					return ;
-				}
-				if(item.tiding_type==="Destroyed_end"){
-					return ;
-				}else {
-				if (item.tiding_type === 'Apply') {
-					///managements/project_package_applies
-					return window.open(`/managements/project_package_applies`)
+				if (item.tiding_type === "Destroyed") {
+					return;
 				}
-				// if(item.tiding_type === 'System'){
+				if (item.tiding_type === "Destroyed_end") {
+					return;
+				} else {
+					if (item.tiding_type === 'Apply') {
+						///managements/project_package_applies
+						return window.open(`/managements/project_package_applies`)
+					}
+					// if(item.tiding_type === 'System'){
 					//众包详情 :id = container_id
 					return window.open(`/crowdsourcing/${item.container_id}`)
-				// }
+					// }
 				}
-				case "Discuss":
-					return window.open(`/shixuns/${item.identifier}/shixun_discuss`);
+			case "Discuss":
+				return window.open(`/shixuns/${item.identifier}/shixun_discuss`);
 			case "Video":
-				if(item.tiding_type==="Apply"){
+				if (item.tiding_type === "Apply") {
 					return window.open(`/managements/video_applies`);
-				}else if(item.tiding_type==="System"){
+				} else if (item.tiding_type === "System") {
 					return window.open(`/users/${this.props.current_user.login}/videos`);
 				}
 				return '';
-				case "PublicCourseStart":
-					return window.open(`/courses/${item.container_id}/informs`);
+			case "PublicCourseStart":
+				return window.open(`/courses/${item.container_id}/informs`);
+			case "SubjectStartCourse":
+				return window.open(`/paths/${item.container_id}`);
+			case "ResubmitStudentWork":
+				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}/appraise`);
+			case "AdjustScore":
+				//belong_container_id course的id
+				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`);
 			default :
-				return 	window.open("/")
+				return window.open("/")
 		}
 
 	}
+
 	render() {
-		let{page,limit,typeysl,count,isSpin,data}=this.state;
+		let {page, limit, typeysl, count, isSpin, data} = this.state;
 		// console.log("6868686868");
 		//  console.log(data);
 		return (
-     <div className="clearfix ml20">
-			 {/*头部筛选数据*/}
-     <ul className="pl10 ridingNav clearfix edu-back-white">
-			 <li className={typeysl===""?"active":""}><a onClick={(s,i)=>this.getdata("",1)}>全部</a></li>
+			<div className="clearfix ml20">
+				{/*头部筛选数据*/}
+				<ul className="pl10 ridingNav clearfix edu-back-white">
+					<li className={typeysl === "" ? "active" : ""}><a onClick={(s, i) => this.getdata("", 1)}>全部</a></li>
 
-			 <li className={typeysl&&typeysl==="course"?"active":""} ><a onClick={(s,i)=>this.getdata("course",1)}>课堂提醒</a></li>
+					<li className={typeysl && typeysl === "course" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("course", 1)}>课堂提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="project"?"active":""} ><a onClick={(s,i)=>this.getdata("project",1)}>项目提醒</a></li>
+					<li className={typeysl && typeysl === "project" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("project", 1)}>项目提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="project_package"?"active":""}><a onClick={(s,i)=>this.getdata("project_package",1)}>众包提醒</a></li>
+					<li className={typeysl && typeysl === "project_package" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("project_package", 1)}>众包提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="interaction"?"active":""}><a onClick={(s,i)=>this.getdata("interaction",1)}>互动提醒</a></li>
+					<li className={typeysl && typeysl === "interaction" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("interaction", 1)}>互动提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="apply"?"active":""}><a onClick={(s,i)=>this.getdata("apply",1)}>审核</a></li>
+					<li className={typeysl && typeysl === "apply" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("apply", 1)}>审核</a></li>
 
-			 <li className={typeysl&&typeysl==="notice"?"active":""}><a onClick={(s,i)=>this.getdata("notice",1)}>通知</a></li>
+					<li className={typeysl && typeysl === "notice" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("notice", 1)}>通知</a></li>
 
 
+				</ul>
+				{/*下面内容页面*/}
+				<div className="bor-top-greyE mycenter">
+					{/*这里可以进行数据处理*/}
+					<div className="myw100baifenbi">
+						<Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
 
-
-		 </ul>
-			  {/*下面内容页面*/}
-			 <div className="bor-top-greyE mycenter">
-				 {/*这里可以进行数据处理*/}
-				 <div className="myw100baifenbi">
-				 <Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
-
-					 {
-						 data===undefined?"":data.length===0?
-							 <div className="edu-tab-con-box clearfix edu-txt-center">
-								 <img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
-								 <p className="edu-nodata-p mb20">暂无数据哦~</p>
-							 </div>
-							 :data.map((item,key)=>{
-							 	// console.log(data)
-								 // ridinglist-subs
-							   var boolps=true;
-							   if(item.container_type==="PraiseTread"||item.container_type==="Grade"||item.container_type==="ChallengeWorkScore"){
-									 boolps=false;
-								 }
-							   if(item.container_type==="JournalsForMessage"){
-							   	   if(item.parent_container_type==="Principal"){
-											 boolps=false;
-										 }
-							   	   if(item.parent_container_type==="HomeworkCommon"){
-							   	   if(item.homework_type===null||item.homework_type===undefined){
-											 boolps=false;
-										 }
-										 }
-								 }
-							   // if(item.container_type==="HomeworkCommon"){
-							   // 	  if(item.parent_container_type==="AnonymousAppeal"){
-									// 		boolps=false;
-									// 	}
-								 // }
-							   if(item.container_type==="ProjectPackage"){
-                    if(item.tiding_type==="Destroyed_end"){
-											boolps=false;
+							{
+								data === undefined ? "" : data.length === 0 ?
+									<div className="edu-tab-con-box clearfix edu-txt-center">
+										<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+										<p className="edu-nodata-p mb20">暂无数据哦~</p>
+									</div>
+									: data.map((item, key) => {
+										// console.log(data)
+										// ridinglist-subs
+										var boolps = true;
+										if (item.container_type === "PraiseTread" || item.container_type === "Grade" || item.container_type === "ChallengeWorkScore") {
+											boolps = false;
+										}
+										if (item.container_type === "JournalsForMessage") {
+											if (item.parent_container_type === "Principal") {
+												boolps = false;
+											}
+											if (item.parent_container_type === "HomeworkCommon") {
+												if (item.homework_type === null || item.homework_type === undefined) {
+													boolps = false;
+												}
+											}
 										}
-                    if(item.tiding_type==="Destroyed"){
-											boolps=false;
+										// if(item.container_type==="HomeworkCommon"){
+										// 	  if(item.parent_container_type==="AnonymousAppeal"){
+										// 		boolps=false;
+										// 	}
+										// }
+										if (item.container_type === "ProjectPackage") {
+											if (item.tiding_type === "Destroyed_end") {
+												boolps = false;
+											}
+											if (item.tiding_type === "Destroyed") {
+												boolps = false;
+											}
+										}
+										if (item.container_type === "Course") {
+											if (item.tiding_type === "Delete") {
+												boolps = false;
+											}
 										}
-								 }
-								 if(item.container_type==="Course"){
-									 if(item.tiding_type==="Delete"){
-										 boolps=false;
-									 }
-								 }
 
-								 return(
-									 <div className="pl25 ridinglist edu-back-white" key={key}>
-										 <div className={boolps===true?"ridinglist-sub clearfix df tiding_item":"ridinglist-subs clearfix df tiding_item"} onClick={()=>this.gettourl(item)}>
-											 <img   onMouseDown={()=>this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>
-											 <div className="fl flex1">
-												 <p>
-													 <a className="mr20 private_message_a" onMouseDown={()=>this.myCome(item)}>{item.trigger_user.name}</a>
-													 <span className="color-grey-c">{item.time}</span>
-													 {item.tiding_type==="Apply"?(
-														 item.status===0?
-														 <span className="edu-filter-btn ml20 edu-filter-btn-red">待处理</span>:""
-													 ):""}
-													 {item.tiding_type==="Apply"?(
-														 item.status===1?
-														 <span className="edu-filter-btn ml20 edu-filter-btn-green">已处理</span>:""
-													 ):""}
+										return (
+											<div className="pl25 ridinglist edu-back-white" key={key}>
+												<div
+													className={boolps === true ? "ridinglist-sub clearfix df tiding_item" : "ridinglist-subs clearfix df tiding_item"}
+													onClick={() => this.gettourl(item)}>
+													<img onMouseDown={() => this.myCome(item)}
+															 src={getImageUrl("images/" + item.trigger_user.image_url)}
+															 className="radius mr10 fl myimgw48 myimgh48"/>
+													<div className="fl flex1">
+														<p>
+															<a className="mr20 private_message_a"
+																 onMouseDown={() => this.myCome(item)}>{item.trigger_user.name}</a>
+															<span className="color-grey-c">{item.time}</span>
+															{item.tiding_type === "Apply" ? (
+																item.status === 0 ?
+																	<span className="edu-filter-btn ml20 edu-filter-btn-red">待处理</span> : ""
+															) : ""}
+															{item.tiding_type === "Apply" ? (
+																item.status === 1 ?
+																	<span className="edu-filter-btn ml20 edu-filter-btn-green">已处理</span> : ""
+															) : ""}
 
-												 </p>
-												 <style>
-													 {
-														 `.yslspansk span{
+														</p>
+														<style>
+															{
+																`.yslspansk span{
 													 	 color: #FF9966!important;
 													 	}
 													 	`
-													 }
-												 </style>
-												 <p className="color-grey-6 yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
-											 </div>
+															}
+														</style>
+														<p className="color-grey-6 yslspansk markdown-body mt10" 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>
-										 </div>
+													<span className={item.new_tiding === true ? "new-point fr mr40 mt22" : ""}></span>
+												</div>
 
-									 </div>
-								 )
-						 })}
-				 </Spin>
+											</div>
+										)
+									})}
+						</Spin>
 
-				 {/*页数*/}
-				 { data===undefined?""
-					 :
-					 (count>10?
-						 <div style={{textAlign: "center"}} className="new_expand mt10">
-							 <div className="edu-txt-center mt30">
-								 <Pagination showQuickJumper current={page}
-														 onChange={this.paginationonChanges} pageSize={limit}
-														 total={count}></Pagination>
-							 </div>
-						 </div>:""
-					 )
+						{/*页数*/}
+						{data === undefined ? ""
+							:
+							(count > 10 ?
+									<div style={{textAlign: "center"}} className="new_expand mt10">
+										<div className="edu-txt-center mt30">
+											<Pagination showQuickJumper current={page}
+																	onChange={this.paginationonChanges} pageSize={limit}
+																	total={count}></Pagination>
+										</div>
+									</div> : ""
+							)
 
-				 }
-				 </div>
+						}
+					</div>
 
-			 </div>
-		 </div>
+				</div>
+			</div>
 		)
 	}
 }
+
 export default MessagSub;
\ No newline at end of file
diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js
index 596da84af..a1b7566d0 100644
--- a/public/react/src/modules/page/MainContent.js
+++ b/public/react/src/modules/page/MainContent.js
@@ -144,11 +144,7 @@ class MainContent extends Component {
 															{/* readRepoTimeout 如果读取代码超时，显示重新加载按钮，重新拉取代码 */}
 					              		 	{
 						              		 	st === 0
-																?
-																readRepoTimeout === true ? <div className="readRepoFailed">
-																	代码加载失败，<a className="retry" 
-																		onClick={() => this.props.fetchRepositoryCode(this.props, null, null, true, true)}>重试</a>
-																</div> :
+													?
 						              			<React.Fragment>
 												  	<div style={{display: (codeLoading ? 'block' : 'none'), textAlign: 'center'}}>
 														<CircularProgress size={40} thickness={3}
diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index ea029e744..96bf095f0 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -319,7 +319,8 @@ class MainContentContainer extends Component {
 					readingRepoTimes = readingRepoTimes + 1;
 					if(readingRepoTimes > 9) {
 						this.setState({
-							readRepoTimeout: true
+							readRepoTimeout: true,
+							codeLoading: false
 						})
 						readingRepoTimes = 0;
 						showSnackbar(`网络异常，请稍后重试。`);
diff --git a/public/react/src/modules/page/main/CodeRepositoryView.js b/public/react/src/modules/page/main/CodeRepositoryView.js
index ee2017ab3..bae058dcd 100644
--- a/public/react/src/modules/page/main/CodeRepositoryView.js
+++ b/public/react/src/modules/page/main/CodeRepositoryView.js
@@ -474,7 +474,9 @@ class CodeRepositoryView extends Component {
                         <span id="return_last_code">
                         </span> 
 
-                        { challenge.pathIndex !== -1 && game.status === 2 && tabIndex === 0 && <a href="javascript:void(0);" className="iconButton" id="reset_success_game_code" onClick={showResetPassedCodeDialog}>
+                        { challenge.pathIndex !== -1 && game.status === 2 && tabIndex === 0 && 
+                                this.props.readRepoTimeout !== true && 
+                            <a href="javascript:void(0);" className="iconButton" id="reset_success_game_code" onClick={showResetPassedCodeDialog}>
                                 <Tooltip title={ "加载上次通过的代码"} disableFocusListener={true}>
                                     <i className="iconfont icon-fanhuishangcidaima font-20 "></i>
                                 </Tooltip>
@@ -482,7 +484,7 @@ class CodeRepositoryView extends Component {
                         }
 
                         {
-                            challenge.pathIndex !== -1 && tabIndex === 0 && 
+                            challenge.pathIndex !== -1 && tabIndex === 0 && this.props.readRepoTimeout !== true && 
                             <a href="javascript:void(0);" className="iconButton" id="reset_game_code" onClick={showResetCodeDialog}>
                                 <Tooltip title={ "恢复初始代码"} disableFocusListener={true}>
                                     <i className="iconfont icon-zhongzhi font-20 "></i>
@@ -491,7 +493,7 @@ class CodeRepositoryView extends Component {
                          }
 
                         {
-                            tabIndex === 0 && 
+                            tabIndex === 0 && this.props.readRepoTimeout !== true && 
                             <a href="javascript:void(0);" className="iconButton" id="setting" onClick={() => showSettingDrawer(true)}>
                                 <Tooltip title={ "设置"} disableFocusListener={true}>
                                     <i className="iconfont icon-shezhi " style={{fontSize: '19px'}}></i>
@@ -510,6 +512,7 @@ class CodeRepositoryView extends Component {
                     <div className="cl"></div>
                 </ul>
                 <div className="cl"></div>
+                
                 <div id="codetab_con_1" style={{display: 'block', flex: 'auto'}} style={ tabIndex === 0 ? {display: 'block'} : {display: 'none'}  }>
                     {/* 没必要显示这个，注释掉了 */}
                     {/* { !isEditablePath && 
@@ -519,13 +522,20 @@ class CodeRepositoryView extends Component {
                             </div> 
                         </Tooltip>
                     } */}
-                    <div className="codemirrorBackground" 
-                        style={{ backgroundImage: `url('${notEditablePathImg}')`
-                            , display: (isEditablePath || this.props.shixun && this.props.shixun.code_edit_permission ? 'none' : 'block') }}></div>
-                    {/*<textarea className = "" id="extend-challenge-file-edit" name="content">{repositoryCode}</textarea>*/}
-                    {/* cm monaco 切换 */}
-                    {/* <TPICodeMirror {...this.props} ></TPICodeMirror> */}
-                    <TPIMonaco {...this.props}></TPIMonaco>
+                    {this.props.readRepoTimeout === true ? <div className="readRepoFailed">
+                        代码加载失败，<a className="retry" 
+                            onClick={() => this.props.fetchRepositoryCode(this.props, null, null, true, true)}>重试</a>
+                    </div> :
+                    <React.Fragment>
+                        <div className="codemirrorBackground" 
+                            style={{ backgroundImage: `url('${notEditablePathImg}')`
+                                , display: (isEditablePath || this.props.shixun && this.props.shixun.code_edit_permission ? 'none' : 'block') }}></div>
+                        {/*<textarea className = "" id="extend-challenge-file-edit" name="content">{repositoryCode}</textarea>*/}
+                        {/* cm monaco 切换 */}
+                        {/* <TPICodeMirror {...this.props} ></TPICodeMirror> */}
+                        <TPIMonaco {...this.props}></TPIMonaco>
+                    </React.Fragment>
+                    }
                 </div>
                 <div id="codetab_con_81" className="undis -relative" 
                     style={ { color: '#fff', display: tabIndex === STABLE_SSH_TAB_ID ? 'block' : 'none', 'marginLeft': '2px'} }>
diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index 2a0ad15ea..d77b35888 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -336,7 +336,7 @@ class DetailCards extends Component{
       showparagraphindex
     }=this.state;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-
+   // console.log("zzz"+this.props.MenuItemsindextype)
     return(
       <div>
 				{AccountProfiletype===true?<AccountProfile
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.css b/public/react/src/modules/paths/PathDetail/DetailTop.css
index 70291c7da..7656bb77d 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.css
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.css
@@ -17,7 +17,7 @@
     box-sizing: border-box;
 }
 .userNavs{
-    line-height: 96px;
+    line-height: 75px;
     background: #fff;
     height:96px;
     background:rgba(255,255,255,1);
@@ -66,4 +66,23 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 40px;
+}
+
+.mb100{
+    margin-bottom: 100px !important;
+}
+.task-btn-28BE6C{
+    background: #28BE6C !important;
+    color: #fff!important;
+}
+.mt43{
+    margin-top: 43px;
+}
+
+.mb120{
+    margin-bottom: 120px !important;
+}
+
+.mb80{
+    margin-bottom: 80px !important;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js
index eddf7f62a..9b85f6498 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.js
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.js
@@ -5,10 +5,12 @@ import SendPanel from "./sendPanel.js";
 import { getImageUrl } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
+import AccountProfile from"../../user/AccountProfile";
 import OpenCourse from './OpenCourse';
-import Jointheclass from '../../modals/Jointheclass'
+import Jointheclass from '../../modals/Jointheclass';
 import './DetailTop.css';
 
+
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 class DetailTop extends Component{
@@ -50,33 +52,41 @@ class DetailTop extends Component{
 				})
 
 			}else{
-						this.props.courses.map((item,key)=>{
-							if(listtype===false){
-								keys=key+1
-								if(item.course_status.status===0) {
-									listtype=true
-									return (
-										courseslist.push(item)
-									)
-								}
-						  }
-						})
+				let type=undefined;
+
 
 
 					this.props.courses.map((item,key)=>{
-						if(listtype===false){
+						let arr=[]
 							keys=key+1
 							if(item.course_status.status===2) {
+								type=key+1
+									arr.push(item)
+							}
+						courseslist=arr;
+					})
+
+					this.props.courses.map((item,key)=>{
+						let arr=[]
+						if(listtype===false){
+							keys=key+1
+							if(item.course_status.status===0) {
 								listtype=true
-								return (
-									courseslist.push(item)
-								)
+									// courseslist.push(item)
+								arr.push(item)
+								courseslist=arr
 							}
 						}
 					})
 
+				console.log(courseslist)
+
+
+			}
+			if(courseslist.length!=0){
+				this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
 			}
-			this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
+
 		}
 
 		this.setState({
@@ -254,6 +264,18 @@ class DetailTop extends Component{
 	}
 
 	putappointment=()=>{
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.current_user&&this.props.current_user.profile_completed===false){
+			this.setState({
+				AccountProfiletype:true
+			})
+			return
+		}
+
 		this.setState({
 			Modalstype:true,
 			Modalstopval:"是否确认立即预约？",
@@ -313,9 +335,15 @@ class DetailTop extends Component{
 			this.cardsModalcancel()
 		})
 	}
+
+	hideAccountProfile=()=>{
+		this.setState({
+			AccountProfiletype:false
+		})
+	}
 	render(){
     let{detailInfoList}=this.props;
-    let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype}=this.state;
+    let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,AccountProfiletype}=this.state;
     const radioStyle = {
       display: 'block',
       height: '30px',
@@ -339,11 +367,18 @@ class DetailTop extends Component{
 
 
 		let applypath=this.props.detailInfoList&&this.props.detailInfoList.participant_count!=undefined&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===false;
+    let coursestypes=this.props.courses!=undefined&&this.props.courses.length===0;
+    let isadminallow_statistics=this.props.courses&&this.props.courses.length===0&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===true;
 
-		// console.log(this.props.courses)
 		return(
 
-			<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":"subhead mb70"}>
+			<div className={this.props.courses===undefined?"subhead":this.props.courses.length===0?applypath===true?"subhead mb100":"subhead":applypath===false?detailInfoList.name.length>40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}>
+				{AccountProfiletype===true?<AccountProfile
+					hideAccountProfile={()=>this.hideAccountProfile()}
+					{...this.props}
+					{...this.state}
+				/>:""}
+
         <Modals
           modalsType={Modalstype}
           modalsTopval={Modalstopval}
@@ -355,10 +390,24 @@ class DetailTop extends Component{
         </Modals>
 			{this.state.yslJointhe===true?<Jointheclass   {...this.props} {...this.state} ysljoinmodalCancel={()=>this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo(this.state.MenuItemskey)}></Jointheclass>:""}
 			{this.state.OpenCourseTypes===true?<OpenCourse  {...this.props} {...this.state} OpenCourseCancel={()=>this.OpenCourseCancel()}/>:""}
+				<style>
+					{
+
+						`
+						.subhead_content{
+						    position: relative;
+						}
 
+						.userNavs{
+								position: absolute;
+								width: 1200px;
+						}
+						`
+					}
+				</style>
         {
           detailInfoList &&
-					<div  className={this.props.courses===undefined||this.props.courses.length===0?"subhead_content":"subhead_content pt100"}>
+					<div  className={this.props.courses===undefined?"subhead_content":this.props.courses.length===0?"subhead_content pt40":"subhead_content "}>
             <div className="font-28 color-white clearfix">
 							{/*<Tooltip placement="bottom" title={detailInfoList.name.length>27?detailInfoList.name:""}>*/}
 
@@ -477,12 +526,10 @@ class DetailTop extends Component{
 
             </div>
 
-							{this.props.courses===undefined||this.props.courses.length===0?"":<div className="userNavs mt20" style={applypath===false?{}:this.state.MenuItemskey===this.props.courses.length?{height:'158px'}:{}}>
-
-									<li className={"fl pd4020"}>
-										<style>
-											{
-												`
+							{this.props.courses===undefined||isadminallow_statistics===true?"":<div className="userNavs mt20" style={applypath===false?{}:this.state.MenuItemskey===this.props.courses.length?{height:'135px'}:{}}>
+								<style>
+									{
+										`
 										.anticon-down{
 											font-size:14px !important;
 											transform:none !important;
@@ -500,11 +547,11 @@ class DetailTop extends Component{
 										  color:#CDCDCD;
 										}
 										`
-											}
-										</style>
-
+									}
+								</style>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fl pd4020 mt10"}>
 
-										{this.props.courses===undefined?"":this.state.courseslist.map((item,key)=>{
+										{this.state.courseslist.map((item,key)=>{
 											if(item.course_identity<4){
 												return(
 													<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
@@ -524,7 +571,7 @@ class DetailTop extends Component{
 												第<span className={"color-orange"}>  {this.state.MenuItemskey}  </span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype?"down":"up"} />
 											</a>
 										</Dropdown>
-									</li>
+									</li>}
 									<style>
 										{
 											`
@@ -545,7 +592,7 @@ class DetailTop extends Component{
 										`
 										}
 									</style>
-									<li className={"ml20"}>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"ml20"}>
 										{this.state.courseslist.map((item,key)=>{
 											return(
 												<div className={"ant-breadcrumb pdt28"} key={key}>
@@ -588,12 +635,10 @@ class DetailTop extends Component{
 										})
 										}
 
-									</li>
-
-									<li className={"fr mr25"}>
-										<style>
-											{
-												`
+									</li>}
+								<style>
+									{
+										`
 											.user-colorgrey-9b{color:#9B9B9B}
 											.user-colorgrey-green{color:#7ED321}
 											.background191{
@@ -615,35 +660,46 @@ class DetailTop extends Component{
 											  color:#fff !important;
 											}
 											.pathbtensbox{
-											width: 188px !important;
+											width: 215px !important;
 											height: 46px !important;
 											background: rgba(76,172,255,1);
 											border-radius: 4px;
 											line-height: 46px !important;
 											}
-											.lineHeight0{
-											line-height: 0px;
+											.lineHeight1{
+											line-height: 1px;
 											}
 											.font153{
 											    font-size: 14px;
 													font-weight: 400;
 													color: rgba(153,153,153,1);
-													line-height: 14px;
 													margin-left: 30px;
 											}
 
 											.absolutewidth{
 											    position: absolute;
-													top: -21px;
+													top: 19px;
 													right: 71px;
 											}
 											.relativewidth{
 											    position: relative;
     											width: 100%;
 											}
-											`
+											.padding040{
+    											padding: 0 43px;
+											}
+											.mt26{
+											  margin-top:26px;
+											}
+											.mt10block{
+											  margin-top: 10px;
+                        display: inline-block;
 											}
-										</style>
+											`
+									}
+								</style>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fr padding040"}>
+
 
 										{/*
 										height: 158px;
@@ -652,42 +708,60 @@ class DetailTop extends Component{
 
 											return(
 												<div key={key}>
-													{/*{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}*/}
-													{item.course_status.status===1?<div className="mr51 shixun_detail pointer fl color-orange pathdefault">{item.course_status.time}</div>:""}
-													{item.course_status.status===2&&item.course_identity<6?<div className="mr51 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
+													{applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?
+														this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
+															getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox  mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox mt26"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
+															<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:""}
 
+													{/*{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}*/}
+													{item.course_status.status===1?<div className="mr51 shixun_detail pointer fl color-orange pathdefault mt10">{item.course_status.time}</div>:""}
+													{item.course_status.status===2&&item.course_identity<6?<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault mt10">已结束</div>:""}
+													{/*<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>*/}
 													{item.course_status.status===0?
-														item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa" href={item.first_category_url} target="_blank">
+														item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-														</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">报名成功</div>
-															:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
+														</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault mr20">报名成功</div>
+															:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
 
 													{item.course_status.status===1?
-														item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+														item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-														</a>:item.course_identity<6?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+														</a>:item.course_identity<6?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
 															立即学习
-														</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens"  onClick={()=>this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入</a>:""}
+														</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入</a>:""}
 
 													{item.course_status.status===2?
-														item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa" href={item.first_category_url} target="_blank">
+														item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-														</a>:<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>:""}
+														</a>:<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault mt10">已结束</div>:""}
 
 												</div>
 											)})}
 
 
-									</li>
+									</li>}
+
+
 
 								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<div className={"clear"}></div>:""}
-								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<span className={"fl ml20 lineHeight0 relativewidth"}>
-									<span>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
-									<span className={"font153"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
+
+								{applypath===false?"":this.props.courses.length===0?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fr lineHeight1 relativewidth mt43":"fl lineHeight1 relativewidth"}>
+									<span className={"fr mr30"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
+										<span className={"font153 fr mr12"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
+										{/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/}
+										{/*getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:*/}
+										{/*<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}*/}
+								</span>
+									:""}
+
+								{applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fl ml20 lineHeight0 relativewidth":"fl ml20 lineHeight0 relativewidth"}>
+									<span className={"mt10block"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
+									<span className={"font153 mt10block"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
 									{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
-										getappointmenttype===true?<a className="fr user_default_btn background191 font-18 pathbtensbox absolutewidth">预约报名成功</a>:<a className="fr user_default_btn task-btn-orange font-18 pathbtensbox absolutewidth"  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
-										<a className="fr user_default_btn background191 font-18 pathbtensbox absolutewidth">预约报名成功</a>}
-								</span>:""}
+										getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
+										<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}
+									</span>:"":""}
+
 
 						</div>}
 
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 7129b820f..b0f64abde 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -86,7 +86,7 @@ class PathDetailIndex extends Component{
 			pathtopskey:1,
 			dataquerys:{},
 			MenuItemsindex:1,
-			MenuItemsindextype:2
+			MenuItemsindextype:0
 		}
 		this.onDragEnd = this.onDragEnd.bind(this);
 
@@ -621,7 +621,10 @@ class PathDetailIndex extends Component{
 																{/*}*/}
 															</p>
 															<div className="clearfix">
-																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																<p className="color-grey-9 font-12 fl">
+																	<span className="mr10">{item.school}</span>
+																	{/*<span>{item.identity}</span>*/}
+																</p>
 															</div>
 														</div>
 													</div>
@@ -645,7 +648,9 @@ class PathDetailIndex extends Component{
 																	}
 																</p>
 																<div className="clearfix">
-																	<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																	<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span>
+																		{/*<span>{item.identity}</span>*/}
+																	</p>
 																</div>
 																{
 																	detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
@@ -674,7 +679,9 @@ class PathDetailIndex extends Component{
 																{/*}*/}
 															</p>
 															<div className="clearfix">
-																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span>
+																	{/*<span>{item.identity}</span>*/}
+																</p>
 															</div>
 														</div>
 													</div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 064a482c9..992c77fac 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -865,7 +865,7 @@ submittojoinclass=(value)=>{
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
 								<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>
-								<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>
+								{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
 								<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
 									<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>
 								</li>
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index 91cb34954..1d2d12ea6 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -236,19 +236,24 @@ export default class TPMMDEditor extends Component {
 
             setTimeout(() => {
                 if (that.props.needRecreate == true) {
-                    __editorName.recreate()
+                    __editorName.recreate() // 注意 必须在setValue之前触发，不然会清空
                 } else {
                     __editorName.resize()
                 }
                 console.log('timeout', __editorName.id)
                 __editorName.cm && __editorName.cm.refresh()
             }, that.props.refreshTimeout || 500)
-            if (that.props.initValue != undefined && that.props.initValue != '') {
-                __editorName.setValue(that.props.initValue)
-            }
-            if (that.state.initValue) {
-                __editorName.setValue(that.state.initValue)
+            if (this.props.noSetValue) {
+
+            } else {
+                if (that.props.initValue != undefined && that.props.initValue != '') {
+                    __editorName.setValue(that.props.initValue)
+                }
+                if (that.state.initValue) {
+                    __editorName.setValue(that.state.initValue)
+                }
             }
+            
             __editorName.cm.on("change", (_cm, changeObj) => {
                 that.contentChanged = true;
                 if (that.state.showError) {
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 5e79a9b2b..a3b834493 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -39,21 +39,21 @@ class InfosBanner extends Component{
       <div className="bannerPanel mb60">
         <div className="educontent">
           <div className="clearfix color-white mb25">
-            <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/></p>
+            <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/'+data.avatar_url)}?t=${new Date().getTime()}`}/></p>
             <div className="fl">
               <p className="clearfix mt20">
                 <span className="username task-hide" style={{"maxWidth":'370px'}}>{data && data.name}</span>
-                {
-                  data && is_current == false && data.identity =="学生" ? "" : 
-                  <span className="userpost"><label>{data && data.identity}</label></span>
-                }
+                {/*{*/}
+                  {/*data && is_current == false && data.identity =="学生" ? "" : */}
+                  {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
+                {/*}*/}
               </p>
               <p className="mt15">
                 <Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>
-                  <i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-green mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>
+                  <i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>
                 </Tooltip>
                 <Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
-                  <i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-green":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>
+                  <i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>
                 </Tooltip>
               </p>
             </div>
@@ -111,11 +111,11 @@ class InfosBanner extends Component{
                 onClick={() => this.setState({moduleName: 'projects'})}
                 to={`/users/${username}/projects`}>开发项目</Link>
             </li>
-            <li className={`${moduleName == 'package' ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'package'})}
-                to={`/users/${username}/package`}>众包</Link>
-            </li>
+            {/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
+            {/*  <Link*/}
+            {/*    onClick={() => this.setState({moduleName: 'package'})}*/}
+            {/*    to={`/users/${username}/package`}>众包</Link>*/}
+            {/*</li>*/}
             {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) 
             && <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
               <Link
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 69b4bcd00..6d8857acc 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -168,6 +168,7 @@
 }
 .user-colorgrey-B8{color:#B8B8B8}
 .user-colorgrey-green{color:#7ED321}
+.user-colorgrey-blue{color:#98EBFF}
 .user_yellow_btn {
   color: #fff!important;
   background-color: #FF8E02;
diff --git a/spec/jobs/create_subject_course_student_job_spec.rb b/spec/jobs/create_subject_course_student_job_spec.rb
new file mode 100644
index 000000000..1b506fe68
--- /dev/null
+++ b/spec/jobs/create_subject_course_student_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CreateSubjectCourseStudentJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end