diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index 27844be53..72a2ff118 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -11,6 +11,7 @@
 //= require select2
 //= require jquery.cxselect
 //= require bootstrap-datepicker
+//= require bootstrap.viewer
 
 //= require_tree ./i18n
 //= require_tree ./admins
@@ -25,6 +26,9 @@ $(document).on('turbolinks:load', function(){
   $('[data-toggle="tooltip"]').tooltip();
   $('[data-toggle="popover"]').popover();
 
+  // 图片查看大图
+  $('img.preview-image').bootstrapViewer();
+
   // flash alert提示框自动关闭
   if($('.admin-alert-container .alert').length > 0){
     setTimeout(function(){
@@ -33,10 +37,25 @@ $(document).on('turbolinks:load', function(){
   }
 });
 
-$(document).on("turbolinks:before-cache", function () {
-  $('[data-toggle="tooltip"]').tooltip('hide');
-  $('[data-toggle="popover"]').popover('hide');
-});
+// var progressBar = new Turbolinks.ProgressBar();
+
+// $(document).on('ajax:send', function(event){
+//   console.log('ajax send', event);
+//   progressBar.setValue(0)
+//   progressBar.show()
+// });
+//
+// $(document).on('ajax:complete', function(event){
+//   console.log('ajax complete', event);
+//   progressBar.setValue(1)
+//   progressBar.hide() // 分页时不触发，奇怪
+// });
+// $(document).on('ajax:success', function(event){
+//   console.log('ajax success', event);
+// });
+// $(document).on('ajax:error', function(event){
+//   console.log('ajax error', event);
+// });
 
 $(function () {
 });
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/common-refuse-modal.js b/app/assets/javascripts/admins/common-refuse-modal.js
new file mode 100644
index 000000000..5eb2f3f46
--- /dev/null
+++ b/app/assets/javascripts/admins/common-refuse-modal.js
@@ -0,0 +1,54 @@
+$(document).on('turbolinks:load', function() {
+  var $refuseModal = $('.admin-common-refuse-modal');
+  if ($refuseModal.length > 0) {
+    var $form = $refuseModal.find('form.admin-common-refuse-form');
+    var $applyIdInput = $refuseModal.find('.modal-body input[name="apply_id"]');
+
+    $form.validate({
+      errorElement: 'span',
+      errorClass: 'danger text-danger',
+      rules: {
+        reason: {
+          required: true,
+          maxlength: 200
+        },
+      }
+    });
+
+    // modal ready fire
+    $refuseModal.on('show.bs.modal', function (event) {
+      var $link = $(event.relatedTarget);
+
+      var applyId = $link.data('id');
+      var url = $link.data('url');
+
+      $applyIdInput.val(applyId);
+      $form.data('url', url);
+    });
+    // modal visited fire
+    $refuseModal.on('shown.bs.modal', function(){
+      $refuseModal.find('.modal-body input[name="reason"]').focus();
+    });
+    $refuseModal.on('hide.bs.modal', function () {
+      $applyIdInput.val('');
+      $form.data('url', '');
+    })
+
+    $refuseModal.on('click', '.submit-btn', function(){
+      $form.find('.error').html('');
+
+      if ($form.valid()) {
+        var url = $form.data('url');
+
+        $.ajax({
+          method: 'POST',
+          dataType: 'script',
+          url: url,
+          data: $form.serialize(),
+        }).done(function(){
+          $refuseModal.modal('hide');
+        });
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/identity_authentications/index.js b/app/assets/javascripts/admins/identity_authentications/index.js
new file mode 100644
index 000000000..2da644ec2
--- /dev/null
+++ b/app/assets/javascripts/admins/identity_authentications/index.js
@@ -0,0 +1,18 @@
+$(document).on('turbolinks:load', function() {
+  if ($('body.admins-identity-authentications-index-page').length > 0) {
+    var $searchFrom = $('.identity-authentication-list-form');
+
+    $searchFrom.on('click', '.search-form-tab', function(){
+      var $link = $(this);
+
+      $searchFrom.find('input[name="keyword"]').val('');
+      $searchFrom.find('select[name="status"]').val('processed');
+
+      if($link.data('value') === 'processed'){
+        $searchFrom.find('.status-filter').show();
+      } else {
+        $searchFrom.find('.status-filter').hide();
+      }
+    });
+  }
+})
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/professional_authentications/index.js b/app/assets/javascripts/admins/professional_authentications/index.js
new file mode 100644
index 000000000..769a6b2fc
--- /dev/null
+++ b/app/assets/javascripts/admins/professional_authentications/index.js
@@ -0,0 +1,18 @@
+$(document).on('turbolinks:load', function() {
+  if ($('body.admins-professional-authentications-index-page').length > 0) {
+    var $searchFrom = $('.professional-authentication-list-form');
+
+    $searchFrom.on('click', '.search-form-tab', function(){
+      var $link = $(this);
+
+      $searchFrom.find('input[name="keyword"]').val('');
+      $searchFrom.find('select[name="status"]').val('processed');
+
+      if($link.data('value') === 'processed'){
+        $searchFrom.find('.status-filter').show();
+      } else {
+        $searchFrom.find('.status-filter').hide();
+      }
+    });
+  }
+})
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/search-form-tab.js b/app/assets/javascripts/admins/search-form-tab.js
new file mode 100644
index 000000000..6009412d5
--- /dev/null
+++ b/app/assets/javascripts/admins/search-form-tab.js
@@ -0,0 +1,10 @@
+$(document).on('turbolinks:load', function() {
+  var $tabs = $('.search-form-container .search-form-tabs');
+  if ($tabs.length > 0) {
+    $tabs.on('click', '.search-form-tab', function(){
+      var $activeTab = $(this);
+      $tabs.find('.search-form-tab').removeClass('active');
+      $activeTab.addClass('active');
+    });
+  }
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/bootstrap-notify.js b/app/assets/javascripts/bootstrap-notify.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/bootstrap-notify.min.js b/app/assets/javascripts/bootstrap-notify.min.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/bootstrap.viewer.js b/app/assets/javascripts/bootstrap.viewer.js
new file mode 100755
index 000000000..4c6aa549a
--- /dev/null
+++ b/app/assets/javascripts/bootstrap.viewer.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * WebSite: http://bootstrap-viewer.leftso.com
+ */
+$.fn.bootstrapViewer = function (options) {
+    $(this).on('click', function () {
+        var opts = $.extend({}, $.fn.bootstrapViewer.defaults, options);
+        var viewer = $('<div class="modal fade bs-example-modal-lg text-center" id="bootstrapViewer" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" >\n' +
+            '          <div class="modal-dialog modal-lg" style="display: inline-block; width: auto;">\n' +
+            '            <div class="modal-content">\n' +
+            '             <img' +
+            '\t\t\t class="carousel-inner img-responsive img-rounded img-viewer" \n' +
+            '\t\t\t onclick="$(\'#bootstrapViewer\').modal(\'hide\');setTimeout(function(){$(\'#bootstrapViewer\').remove();},200);"\n' +
+            '\t\t\t onmouseover="this.style.cursor=\'zoom-out\';" \n' +
+            '\t\t\t onmouseout="this.style.cursor=\'default\'"  \n' +
+            '\t\t\t />\n' +
+            '            </div>\n' +
+            '          </div>\n' +
+            '        </div>');
+        $('body').append(viewer);
+        if ($(this).attr(opts.src)) {
+            $("#bootstrapViewer").find(".img-viewer").attr("src", $(this).attr(opts.src));
+            $("#bootstrapViewer").modal();
+        } else {
+            throw "图片不存在"
+        }
+
+    })
+
+    $(this).on('mouseover', function () {
+        $(this).css('cursor', 'zoom-in');
+    })
+
+}
+$.fn.bootstrapViewer.defaults = {
+    src: 'src'
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/i18n/select2-i18n.zh-CN.js b/app/assets/javascripts/i18n/select2-i18n.zh-CN.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/jquery.cxselect.js b/app/assets/javascripts/jquery.cxselect.js
old mode 100755
new mode 100644
index 9bd674664..aeb3c17dd
--- a/app/assets/javascripts/jquery.cxselect.js
+++ b/app/assets/javascripts/jquery.cxselect.js
@@ -1,403 +1,403 @@
-/*!
- * jQuery cxSelect
- * @name jquery.cxselect.js
- * @version 1.4.1
- * @date 2016-11-02
- * @author ciaoca
- * @email ciaoca@gmail.com
- * @site https://github.com/ciaoca/cxSelect
- * @license Released under the MIT license
- */
-(function(factory) {
-  if (typeof define === 'function' && define.amd) {
-    define(['jquery'], factory);
-  } else {
-    factory(window.jQuery || window.Zepto || window.$);
-  };
-}(function($) {
-  var cxSelect = function() {
-    var self = this;
-    var dom, settings, callback;
-
-    // 分配参数
-    for (var i = 0, l = arguments.length; i < l; i++) {
-      if (cxSelect.isJquery(arguments[i]) || cxSelect.isZepto(arguments[i])) {
-        dom = arguments[i];
-      } else if (cxSelect.isElement(arguments[i])) {
-        dom = $(arguments[i]);
-      } else if (typeof arguments[i] === 'function') {
-        callback = arguments[i];
-      } else if (typeof arguments[i] === 'object') {
-        settings = arguments[i];
-      };
-    };
-
-    var api = new cxSelect.init(dom, settings);
-
-    if (typeof callback === 'function') {
-      callback(api);
-    };
-
-    return api;
-  };
-
-  cxSelect.isElement = function(o){
-    if (o && (typeof HTMLElement === 'function' || typeof HTMLElement === 'object') && o instanceof HTMLElement) {
-      return true;
-    } else {
-      return (o && o.nodeType && o.nodeType === 1) ? true : false;
-    };
-  };
-
-  cxSelect.isJquery = function(o){
-    return (o && o.length && (typeof jQuery === 'function' || typeof jQuery === 'object') && o instanceof jQuery) ? true : false;
-  };
-
-  cxSelect.isZepto = function(o){
-    return (o && o.length && (typeof Zepto === 'function' || typeof Zepto === 'object') && Zepto.zepto.isZ(o)) ? true : false;
-  };
-
-  cxSelect.getIndex = function(n, required) {
-    return required ? n : n - 1;
-  };
-
-  cxSelect.getData = function(data, space) {
-    if (typeof space === 'string' && space.length) {
-      space = space.split('.');
-      for (var i = 0, l = space.length; i < l; i++) {
-        data = data[space[i]];
-      };
-    };
-    return data;
-  };
-
-  cxSelect.init = function(dom, settings) {
-    var self = this;
-
-    if (!cxSelect.isJquery(dom) && !cxSelect.isZepto(dom)) {return};
-
-    var theSelect = {
-      dom: {
-        box: dom
-      }
-    };
-
-    self.attach = cxSelect.attach.bind(theSelect);
-    self.detach = cxSelect.detach.bind(theSelect);
-    self.setOptions = cxSelect.setOptions.bind(theSelect);
-    self.clear = cxSelect.clear.bind(theSelect);
-
-    theSelect.changeEvent = function() {
-      cxSelect.selectChange.call(theSelect, this.className);
-    };
-
-    theSelect.settings = $.extend({}, $.cxSelect.defaults, settings, {
-      url: theSelect.dom.box.data('url'),
-      emptyStyle: theSelect.dom.box.data('emptyStyle'),
-      required: theSelect.dom.box.data('required'),
-      firstTitle: theSelect.dom.box.data('firstTitle'),
-      firstValue: theSelect.dom.box.data('firstValue'),
-      jsonSpace: theSelect.dom.box.data('jsonSpace'),
-      jsonName: theSelect.dom.box.data('jsonName'),
-      jsonValue: theSelect.dom.box.data('jsonValue'),
-      jsonSub: theSelect.dom.box.data('jsonSub')
-    });
-
-    var _dataSelects = theSelect.dom.box.data('selects');
-
-    if (typeof _dataSelects === 'string' && _dataSelects.length) {
-      theSelect.settings.selects = _dataSelects.split(',');
-    };
-
-    self.setOptions();
-    self.attach();
-
-    // 使用独立接口获取数据
-    if (!theSelect.settings.url && !theSelect.settings.data) {
-      cxSelect.start.apply(theSelect);
-
-    // 设置自定义数据
-    } else if ($.isArray(theSelect.settings.data)) {
-      cxSelect.start.call(theSelect, theSelect.settings.data);
-
-    // 设置 URL，通过 Ajax 获取数据
-    } else if (typeof theSelect.settings.url === 'string' && theSelect.settings.url.length) {
-      $.getJSON(theSelect.settings.url, function(json) {
-        cxSelect.start.call(theSelect, json);
-      });
-    };
-  };
-
-  // 设置参数
-  cxSelect.setOptions = function(opts) {
-    var self = this;
-
-    if (opts) {
-      $.extend(self.settings, opts);
-    };
-
-    // 初次或重设选择器组
-    if (!$.isArray(self.selectArray) || !self.selectArray.length || (opts && opts.selects)) {
-      self.selectArray = [];
-
-      if ($.isArray(self.settings.selects) && self.settings.selects.length) {
-        var _tempSelect;
-
-        for (var i = 0, l = self.settings.selects.length; i < l; i++) {
-          _tempSelect = self.dom.box.find('select.' + self.settings.selects[i]);
-
-          if (!_tempSelect || !_tempSelect.length) {break};
-
-          self.selectArray.push(_tempSelect);
-        };
-      };
-    };
-
-    if (opts) {
-      if (!$.isArray(opts.data) && typeof opts.url === 'string' && opts.url.length) {
-        $.getJSON(self.settings.url, function(json) {
-          cxSelect.start.call(self, json);
-        });
-
-      } else {
-        cxSelect.start.call(self, opts.data);
-      };
-    };
-  };
-
-  // 绑定
-  cxSelect.attach = function() {
-    var self = this;
-
-    if (!self.attachStatus) {
-      self.dom.box.on('change', 'select', self.changeEvent);
-    };
-
-    if (typeof self.attachStatus === 'boolean') {
-      cxSelect.start.call(self);
-    };
-
-    self.attachStatus = true;
-  };
-
-  // 移除绑定
-  cxSelect.detach = function() {
-    var self = this;
-    self.dom.box.off('change', 'select', self.changeEvent);
-    self.attachStatus = false;
-  };
-
-  // 清空选项
-  cxSelect.clear = function(index) {
-    var self = this;
-    var _style = {
-      display: '',
-      visibility: ''
-    };
-
-    index = isNaN(index) ? 0 : index;
-
-    // 清空后面的 select
-    for (var i = index, l = self.selectArray.length; i < l; i++) {
-      self.selectArray[i].empty().prop('disabled', true);
-
-      if (self.settings.emptyStyle === 'none') {
-        _style.display = 'none';
-      } else if (self.settings.emptyStyle === 'hidden') {
-        _style.visibility = 'hidden';
-      };
-
-      self.selectArray[i].css(_style);
-    };
-  };
-
-  cxSelect.start = function(data) {
-    var self = this;
-
-    if ($.isArray(data)) {
-      self.settings.data = cxSelect.getData(data, self.settings.jsonSpace);
-    };
-
-    if (!self.selectArray.length) {return};
-
-    // 保存默认值
-    for (var i = 0, l = self.selectArray.length; i < l; i++) {
-      if (typeof self.selectArray[i].attr('data-value') !== 'string' && self.selectArray[i][0].options.length) {
-        self.selectArray[i].attr('data-value', self.selectArray[i].val());
-      };
-    };
-
-    if (self.settings.data || (typeof self.selectArray[0].data('url') === 'string' && self.selectArray[0].data('url').length)) {
-      cxSelect.getOptionData.call(self, 0);
-    } else {
-      self.selectArray[0].prop('disabled', false).css({
-        'display': '',
-        'visibility': ''
-      });
-    };
-  };
-
-  // 获取选项数据
-  cxSelect.getOptionData = function(index) {
-    var self = this;
-
-    if (typeof index !== 'number' || isNaN(index) || index < 0 || index >= self.selectArray.length) {return};
-
-    var _indexPrev = index - 1;
-    var _select = self.selectArray[index];
-    var _selectData;
-    var _valueIndex;
-    var _dataUrl = _select.data('url');
-    var _jsonSpace = typeof _select.data('jsonSpace') === 'undefined' ? self.settings.jsonSpace : _select.data('jsonSpace');
-    var _query = {};
-    var _queryName;
-    var _selectName;
-    var _selectValue;
-
-    cxSelect.clear.call(self, index);
-
-    // 使用独立接口
-    if (typeof _dataUrl === 'string' && _dataUrl.length) {
-      if (index > 0) {
-        for (var i = 0, j = 1; i < index; i++, j++) {
-          _queryName = self.selectArray[j].data('queryName');
-          _selectName = self.selectArray[i].attr('name');
-          _selectValue = self.selectArray[i].val();
-
-          if (typeof _queryName === 'string' && _queryName.length) {
-            _query[_queryName] = _selectValue;
-          } else if (typeof _selectName === 'string' && _selectName.length) {
-            _query[_selectName] = _selectValue;
-          };
-        };
-      };
-
-      $.getJSON(_dataUrl, _query, function(json) {
-        _selectData = cxSelect.getData(json, _jsonSpace);
-
-        cxSelect.buildOption.call(self, index, _selectData);
-      });
-
-    // 使用整合数据
-    } else if (self.settings.data && typeof self.settings.data === 'object') {
-      _selectData = self.settings.data;
-
-      for (var i = 0; i < index; i++) {
-        _valueIndex = cxSelect.getIndex(self.selectArray[i][0].selectedIndex, typeof self.selectArray[i].data('required') === 'boolean' ? self.selectArray[i].data('required') : self.settings.required);
-
-        if (typeof _selectData[_valueIndex] === 'object' && $.isArray(_selectData[_valueIndex][self.settings.jsonSub]) && _selectData[_valueIndex][self.settings.jsonSub].length) {
-          _selectData = _selectData[_valueIndex][self.settings.jsonSub];
-        } else {
-          _selectData = null;
-          break;
-        };
-      };
-
-      cxSelect.buildOption.call(self, index, _selectData);
-    };
-  };
-
-  // 构建选项列表
-  cxSelect.buildOption = function(index, data) {
-    var self = this;
-
-    var _select = self.selectArray[index];
-    var _required = typeof _select.data('required') === 'boolean' ? _select.data('required') : self.settings.required;
-    var _firstTitle = typeof _select.data('firstTitle') === 'undefined' ? self.settings.firstTitle : _select.data('firstTitle');
-    var _firstValue = typeof _select.data('firstValue') === 'undefined' ? self.settings.firstValue : _select.data('firstValue');
-    var _jsonName = typeof _select.data('jsonName') === 'undefined' ? self.settings.jsonName : _select.data('jsonName');
-    var _jsonValue = typeof _select.data('jsonValue') === 'undefined' ? self.settings.jsonValue : _select.data('jsonValue');
-
-    if (!$.isArray(data)) {return};
-
-    var _html = !_required ? '<option value="' + String(_firstValue) + '">' + String(_firstTitle) + '</option>' : '';
-
-    // 区分标题、值的数据
-    if (typeof _jsonName === 'string' && _jsonName.length) {
-      // 无值字段时使用标题作为值
-      if (typeof _jsonValue !== 'string' || !_jsonValue.length) {
-        _jsonValue = _jsonName;
-      };
-
-      for (var i = 0, l = data.length; i < l; i++) {
-        _html += '<option value="' + String(data[i][_jsonValue]) + '">' + String(data[i][_jsonName]) + '</option>';
-      };
-
-    // 数组即为值的数据
-    } else {
-      for (var i = 0, l = data.length; i < l; i++) {
-        _html += '<option value="' + String(data[i]) + '">' + String(data[i]) + '</option>';
-      };
-    };
-
-    _select.html(_html).prop('disabled', false).css({
-      'display': '',
-      'visibility': ''
-    });
-
-    // 初次加载设置默认值
-    if (typeof _select.attr('data-value') === 'string') {
-      _select.val(String(_select.attr('data-value'))).removeAttr('data-value');
-
-      if (_select[0].selectedIndex < 0) {
-        _select[0].options[0].selected = true;
-      };
-    };
-
-    if (_required || _select[0].selectedIndex > 0) {
-      _select.trigger('change');
-    };
-
-  };
-
-  // 改变选择时的处理
-  cxSelect.selectChange = function(name) {
-    var self = this;
-
-    if (typeof name !== 'string' || !name.length) {return};
-
-    var index;
-
-    name = name.replace(/\s+/g, ',');
-    name = ',' + name + ',';
-
-    // 获取当前 select 位置
-    for (var i = 0, l = self.selectArray.length; i < l; i++) {
-      if (name.indexOf(',' + self.settings.selects[i] + ',') > -1) {
-        index = i;
-        break;
-      };
-    };
-
-    if (typeof index === 'number' && index > -1) {
-      index += 1;
-      cxSelect.getOptionData.call(self, index);
-    };
-  };
-
-  $.cxSelect = function() {
-    return cxSelect.apply(this, arguments);
-  };
-
-  // 默认值
-  $.cxSelect.defaults = {
-    selects: [],            // 下拉选框组
-    url: null,              // 列表数据文件路径（URL）或数组数据
-    data: null,             // 自定义数据
-    emptyStyle: null,       // 无数据状态显示方式
-    required: false,        // 是否为必选
-    firstTitle: '请选择',    // 第一个选项的标题
-    firstValue: '',         // 第一个选项的值
-    jsonSpace: '',          // 数据命名空间
-    jsonName: 'n',          // 数据标题字段名称
-    jsonValue: '',          // 数据值字段名称
-    jsonSub: 's'            // 子集数据字段名称
-  };
-
-  $.fn.cxSelect = function(settings, callback) {
-    this.each(function(i) {
-      $.cxSelect(this, settings, callback);
-    });
-    return this;
-  };
-}));
+/*!
+ * jQuery cxSelect
+ * @name jquery.cxselect.js
+ * @version 1.4.1
+ * @date 2016-11-02
+ * @author ciaoca
+ * @email ciaoca@gmail.com
+ * @site https://github.com/ciaoca/cxSelect
+ * @license Released under the MIT license
+ */
+(function(factory) {
+  if (typeof define === 'function' && define.amd) {
+    define(['jquery'], factory);
+  } else {
+    factory(window.jQuery || window.Zepto || window.$);
+  };
+}(function($) {
+  var cxSelect = function() {
+    var self = this;
+    var dom, settings, callback;
+
+    // 分配参数
+    for (var i = 0, l = arguments.length; i < l; i++) {
+      if (cxSelect.isJquery(arguments[i]) || cxSelect.isZepto(arguments[i])) {
+        dom = arguments[i];
+      } else if (cxSelect.isElement(arguments[i])) {
+        dom = $(arguments[i]);
+      } else if (typeof arguments[i] === 'function') {
+        callback = arguments[i];
+      } else if (typeof arguments[i] === 'object') {
+        settings = arguments[i];
+      };
+    };
+
+    var api = new cxSelect.init(dom, settings);
+
+    if (typeof callback === 'function') {
+      callback(api);
+    };
+
+    return api;
+  };
+
+  cxSelect.isElement = function(o){
+    if (o && (typeof HTMLElement === 'function' || typeof HTMLElement === 'object') && o instanceof HTMLElement) {
+      return true;
+    } else {
+      return (o && o.nodeType && o.nodeType === 1) ? true : false;
+    };
+  };
+
+  cxSelect.isJquery = function(o){
+    return (o && o.length && (typeof jQuery === 'function' || typeof jQuery === 'object') && o instanceof jQuery) ? true : false;
+  };
+
+  cxSelect.isZepto = function(o){
+    return (o && o.length && (typeof Zepto === 'function' || typeof Zepto === 'object') && Zepto.zepto.isZ(o)) ? true : false;
+  };
+
+  cxSelect.getIndex = function(n, required) {
+    return required ? n : n - 1;
+  };
+
+  cxSelect.getData = function(data, space) {
+    if (typeof space === 'string' && space.length) {
+      space = space.split('.');
+      for (var i = 0, l = space.length; i < l; i++) {
+        data = data[space[i]];
+      };
+    };
+    return data;
+  };
+
+  cxSelect.init = function(dom, settings) {
+    var self = this;
+
+    if (!cxSelect.isJquery(dom) && !cxSelect.isZepto(dom)) {return};
+
+    var theSelect = {
+      dom: {
+        box: dom
+      }
+    };
+
+    self.attach = cxSelect.attach.bind(theSelect);
+    self.detach = cxSelect.detach.bind(theSelect);
+    self.setOptions = cxSelect.setOptions.bind(theSelect);
+    self.clear = cxSelect.clear.bind(theSelect);
+
+    theSelect.changeEvent = function() {
+      cxSelect.selectChange.call(theSelect, this.className);
+    };
+
+    theSelect.settings = $.extend({}, $.cxSelect.defaults, settings, {
+      url: theSelect.dom.box.data('url'),
+      emptyStyle: theSelect.dom.box.data('emptyStyle'),
+      required: theSelect.dom.box.data('required'),
+      firstTitle: theSelect.dom.box.data('firstTitle'),
+      firstValue: theSelect.dom.box.data('firstValue'),
+      jsonSpace: theSelect.dom.box.data('jsonSpace'),
+      jsonName: theSelect.dom.box.data('jsonName'),
+      jsonValue: theSelect.dom.box.data('jsonValue'),
+      jsonSub: theSelect.dom.box.data('jsonSub')
+    });
+
+    var _dataSelects = theSelect.dom.box.data('selects');
+
+    if (typeof _dataSelects === 'string' && _dataSelects.length) {
+      theSelect.settings.selects = _dataSelects.split(',');
+    };
+
+    self.setOptions();
+    self.attach();
+
+    // 使用独立接口获取数据
+    if (!theSelect.settings.url && !theSelect.settings.data) {
+      cxSelect.start.apply(theSelect);
+
+    // 设置自定义数据
+    } else if ($.isArray(theSelect.settings.data)) {
+      cxSelect.start.call(theSelect, theSelect.settings.data);
+
+    // 设置 URL，通过 Ajax 获取数据
+    } else if (typeof theSelect.settings.url === 'string' && theSelect.settings.url.length) {
+      $.getJSON(theSelect.settings.url, function(json) {
+        cxSelect.start.call(theSelect, json);
+      });
+    };
+  };
+
+  // 设置参数
+  cxSelect.setOptions = function(opts) {
+    var self = this;
+
+    if (opts) {
+      $.extend(self.settings, opts);
+    };
+
+    // 初次或重设选择器组
+    if (!$.isArray(self.selectArray) || !self.selectArray.length || (opts && opts.selects)) {
+      self.selectArray = [];
+
+      if ($.isArray(self.settings.selects) && self.settings.selects.length) {
+        var _tempSelect;
+
+        for (var i = 0, l = self.settings.selects.length; i < l; i++) {
+          _tempSelect = self.dom.box.find('select.' + self.settings.selects[i]);
+
+          if (!_tempSelect || !_tempSelect.length) {break};
+
+          self.selectArray.push(_tempSelect);
+        };
+      };
+    };
+
+    if (opts) {
+      if (!$.isArray(opts.data) && typeof opts.url === 'string' && opts.url.length) {
+        $.getJSON(self.settings.url, function(json) {
+          cxSelect.start.call(self, json);
+        });
+
+      } else {
+        cxSelect.start.call(self, opts.data);
+      };
+    };
+  };
+
+  // 绑定
+  cxSelect.attach = function() {
+    var self = this;
+
+    if (!self.attachStatus) {
+      self.dom.box.on('change', 'select', self.changeEvent);
+    };
+
+    if (typeof self.attachStatus === 'boolean') {
+      cxSelect.start.call(self);
+    };
+
+    self.attachStatus = true;
+  };
+
+  // 移除绑定
+  cxSelect.detach = function() {
+    var self = this;
+    self.dom.box.off('change', 'select', self.changeEvent);
+    self.attachStatus = false;
+  };
+
+  // 清空选项
+  cxSelect.clear = function(index) {
+    var self = this;
+    var _style = {
+      display: '',
+      visibility: ''
+    };
+
+    index = isNaN(index) ? 0 : index;
+
+    // 清空后面的 select
+    for (var i = index, l = self.selectArray.length; i < l; i++) {
+      self.selectArray[i].empty().prop('disabled', true);
+
+      if (self.settings.emptyStyle === 'none') {
+        _style.display = 'none';
+      } else if (self.settings.emptyStyle === 'hidden') {
+        _style.visibility = 'hidden';
+      };
+
+      self.selectArray[i].css(_style);
+    };
+  };
+
+  cxSelect.start = function(data) {
+    var self = this;
+
+    if ($.isArray(data)) {
+      self.settings.data = cxSelect.getData(data, self.settings.jsonSpace);
+    };
+
+    if (!self.selectArray.length) {return};
+
+    // 保存默认值
+    for (var i = 0, l = self.selectArray.length; i < l; i++) {
+      if (typeof self.selectArray[i].attr('data-value') !== 'string' && self.selectArray[i][0].options.length) {
+        self.selectArray[i].attr('data-value', self.selectArray[i].val());
+      };
+    };
+
+    if (self.settings.data || (typeof self.selectArray[0].data('url') === 'string' && self.selectArray[0].data('url').length)) {
+      cxSelect.getOptionData.call(self, 0);
+    } else {
+      self.selectArray[0].prop('disabled', false).css({
+        'display': '',
+        'visibility': ''
+      });
+    };
+  };
+
+  // 获取选项数据
+  cxSelect.getOptionData = function(index) {
+    var self = this;
+
+    if (typeof index !== 'number' || isNaN(index) || index < 0 || index >= self.selectArray.length) {return};
+
+    var _indexPrev = index - 1;
+    var _select = self.selectArray[index];
+    var _selectData;
+    var _valueIndex;
+    var _dataUrl = _select.data('url');
+    var _jsonSpace = typeof _select.data('jsonSpace') === 'undefined' ? self.settings.jsonSpace : _select.data('jsonSpace');
+    var _query = {};
+    var _queryName;
+    var _selectName;
+    var _selectValue;
+
+    cxSelect.clear.call(self, index);
+
+    // 使用独立接口
+    if (typeof _dataUrl === 'string' && _dataUrl.length) {
+      if (index > 0) {
+        for (var i = 0, j = 1; i < index; i++, j++) {
+          _queryName = self.selectArray[j].data('queryName');
+          _selectName = self.selectArray[i].attr('name');
+          _selectValue = self.selectArray[i].val();
+
+          if (typeof _queryName === 'string' && _queryName.length) {
+            _query[_queryName] = _selectValue;
+          } else if (typeof _selectName === 'string' && _selectName.length) {
+            _query[_selectName] = _selectValue;
+          };
+        };
+      };
+
+      $.getJSON(_dataUrl, _query, function(json) {
+        _selectData = cxSelect.getData(json, _jsonSpace);
+
+        cxSelect.buildOption.call(self, index, _selectData);
+      });
+
+    // 使用整合数据
+    } else if (self.settings.data && typeof self.settings.data === 'object') {
+      _selectData = self.settings.data;
+
+      for (var i = 0; i < index; i++) {
+        _valueIndex = cxSelect.getIndex(self.selectArray[i][0].selectedIndex, typeof self.selectArray[i].data('required') === 'boolean' ? self.selectArray[i].data('required') : self.settings.required);
+
+        if (typeof _selectData[_valueIndex] === 'object' && $.isArray(_selectData[_valueIndex][self.settings.jsonSub]) && _selectData[_valueIndex][self.settings.jsonSub].length) {
+          _selectData = _selectData[_valueIndex][self.settings.jsonSub];
+        } else {
+          _selectData = null;
+          break;
+        };
+      };
+
+      cxSelect.buildOption.call(self, index, _selectData);
+    };
+  };
+
+  // 构建选项列表
+  cxSelect.buildOption = function(index, data) {
+    var self = this;
+
+    var _select = self.selectArray[index];
+    var _required = typeof _select.data('required') === 'boolean' ? _select.data('required') : self.settings.required;
+    var _firstTitle = typeof _select.data('firstTitle') === 'undefined' ? self.settings.firstTitle : _select.data('firstTitle');
+    var _firstValue = typeof _select.data('firstValue') === 'undefined' ? self.settings.firstValue : _select.data('firstValue');
+    var _jsonName = typeof _select.data('jsonName') === 'undefined' ? self.settings.jsonName : _select.data('jsonName');
+    var _jsonValue = typeof _select.data('jsonValue') === 'undefined' ? self.settings.jsonValue : _select.data('jsonValue');
+
+    if (!$.isArray(data)) {return};
+
+    var _html = !_required ? '<option value="' + String(_firstValue) + '">' + String(_firstTitle) + '</option>' : '';
+
+    // 区分标题、值的数据
+    if (typeof _jsonName === 'string' && _jsonName.length) {
+      // 无值字段时使用标题作为值
+      if (typeof _jsonValue !== 'string' || !_jsonValue.length) {
+        _jsonValue = _jsonName;
+      };
+
+      for (var i = 0, l = data.length; i < l; i++) {
+        _html += '<option value="' + String(data[i][_jsonValue]) + '">' + String(data[i][_jsonName]) + '</option>';
+      };
+
+    // 数组即为值的数据
+    } else {
+      for (var i = 0, l = data.length; i < l; i++) {
+        _html += '<option value="' + String(data[i]) + '">' + String(data[i]) + '</option>';
+      };
+    };
+
+    _select.html(_html).prop('disabled', false).css({
+      'display': '',
+      'visibility': ''
+    });
+
+    // 初次加载设置默认值
+    if (typeof _select.attr('data-value') === 'string') {
+      _select.val(String(_select.attr('data-value'))).removeAttr('data-value');
+
+      if (_select[0].selectedIndex < 0) {
+        _select[0].options[0].selected = true;
+      };
+    };
+
+    if (_required || _select[0].selectedIndex > 0) {
+      _select.trigger('change');
+    };
+
+  };
+
+  // 改变选择时的处理
+  cxSelect.selectChange = function(name) {
+    var self = this;
+
+    if (typeof name !== 'string' || !name.length) {return};
+
+    var index;
+
+    name = name.replace(/\s+/g, ',');
+    name = ',' + name + ',';
+
+    // 获取当前 select 位置
+    for (var i = 0, l = self.selectArray.length; i < l; i++) {
+      if (name.indexOf(',' + self.settings.selects[i] + ',') > -1) {
+        index = i;
+        break;
+      };
+    };
+
+    if (typeof index === 'number' && index > -1) {
+      index += 1;
+      cxSelect.getOptionData.call(self, index);
+    };
+  };
+
+  $.cxSelect = function() {
+    return cxSelect.apply(this, arguments);
+  };
+
+  // 默认值
+  $.cxSelect.defaults = {
+    selects: [],            // 下拉选框组
+    url: null,              // 列表数据文件路径（URL）或数组数据
+    data: null,             // 自定义数据
+    emptyStyle: null,       // 无数据状态显示方式
+    required: false,        // 是否为必选
+    firstTitle: '请选择',    // 第一个选项的标题
+    firstValue: '',         // 第一个选项的值
+    jsonSpace: '',          // 数据命名空间
+    jsonName: 'n',          // 数据标题字段名称
+    jsonValue: '',          // 数据值字段名称
+    jsonSub: 's'            // 子集数据字段名称
+  };
+
+  $.fn.cxSelect = function(settings, callback) {
+    this.each(function(i) {
+      $.cxSelect(this, settings, callback);
+    });
+    return this;
+  };
+}));
diff --git a/app/assets/javascripts/jquery.cxselect.min.js b/app/assets/javascripts/jquery.cxselect.min.js
old mode 100755
new mode 100644
index 54549a920..9aabba447
--- a/app/assets/javascripts/jquery.cxselect.min.js
+++ b/app/assets/javascripts/jquery.cxselect.min.js
@@ -1,11 +1,11 @@
-/*!
- * jQuery cxSelect
- * @name jquery.cxselect.js
- * @version 1.4.1
- * @date 2016-11-02
- * @author ciaoca
- * @email ciaoca@gmail.com
- * @site https://github.com/ciaoca/cxSelect
- * @license Released under the MIT license
- */
+/*!
+ * jQuery cxSelect
+ * @name jquery.cxselect.js
+ * @version 1.4.1
+ * @date 2016-11-02
+ * @author ciaoca
+ * @email ciaoca@gmail.com
+ * @site https://github.com/ciaoca/cxSelect
+ * @license Released under the MIT license
+ */
 !function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(window.jQuery||window.Zepto||window.$)}(function(a){var b=function(){var d,e,f,g,h,i;for(g=0,h=arguments.length;h>g;g++)b.isJquery(arguments[g])||b.isZepto(arguments[g])?d=arguments[g]:b.isElement(arguments[g])?d=a(arguments[g]):"function"==typeof arguments[g]?f=arguments[g]:"object"==typeof arguments[g]&&(e=arguments[g]);return i=new b.init(d,e),"function"==typeof f&&f(i),i};b.isElement=function(a){return a&&("function"==typeof HTMLElement||"object"==typeof HTMLElement)&&a instanceof HTMLElement?!0:a&&a.nodeType&&1===a.nodeType?!0:!1},b.isJquery=function(a){return a&&a.length&&("function"==typeof jQuery||"object"==typeof jQuery)&&a instanceof jQuery?!0:!1},b.isZepto=function(a){return a&&a.length&&("function"==typeof Zepto||"object"==typeof Zepto)&&Zepto.zepto.isZ(a)?!0:!1},b.getIndex=function(a,b){return b?a:a-1},b.getData=function(a,b){if("string"==typeof b&&b.length){b=b.split(".");for(var c=0,d=b.length;d>c;c++)a=a[b[c]]}return a},b.init=function(c,d){var f,g,e=this;(b.isJquery(c)||b.isZepto(c))&&(f={dom:{box:c}},e.attach=b.attach.bind(f),e.detach=b.detach.bind(f),e.setOptions=b.setOptions.bind(f),e.clear=b.clear.bind(f),f.changeEvent=function(){b.selectChange.call(f,this.className)},f.settings=a.extend({},a.cxSelect.defaults,d,{url:f.dom.box.data("url"),emptyStyle:f.dom.box.data("emptyStyle"),required:f.dom.box.data("required"),firstTitle:f.dom.box.data("firstTitle"),firstValue:f.dom.box.data("firstValue"),jsonSpace:f.dom.box.data("jsonSpace"),jsonName:f.dom.box.data("jsonName"),jsonValue:f.dom.box.data("jsonValue"),jsonSub:f.dom.box.data("jsonSub")}),g=f.dom.box.data("selects"),"string"==typeof g&&g.length&&(f.settings.selects=g.split(",")),e.setOptions(),e.attach(),f.settings.url||f.settings.data?a.isArray(f.settings.data)?b.start.call(f,f.settings.data):"string"==typeof f.settings.url&&f.settings.url.length&&a.getJSON(f.settings.url,function(a){b.start.call(f,a)}):b.start.apply(f))},b.setOptions=function(c){var e,f,g,d=this;if(c&&a.extend(d.settings,c),(!a.isArray(d.selectArray)||!d.selectArray.length||c&&c.selects)&&(d.selectArray=[],a.isArray(d.settings.selects)&&d.settings.selects.length))for(f=0,g=d.settings.selects.length;g>f&&(e=d.dom.box.find("select."+d.settings.selects[f]),e&&e.length);f++)d.selectArray.push(e);c&&(!a.isArray(c.data)&&"string"==typeof c.url&&c.url.length?a.getJSON(d.settings.url,function(a){b.start.call(d,a)}):b.start.call(d,c.data))},b.attach=function(){var a=this;a.attachStatus||a.dom.box.on("change","select",a.changeEvent),"boolean"==typeof a.attachStatus&&b.start.call(a),a.attachStatus=!0},b.detach=function(){var a=this;a.dom.box.off("change","select",a.changeEvent),a.attachStatus=!1},b.clear=function(a){var d,e,b=this,c={display:"",visibility:""};for(a=isNaN(a)?0:a,d=a,e=b.selectArray.length;e>d;d++)b.selectArray[d].empty().prop("disabled",!0),"none"===b.settings.emptyStyle?c.display="none":"hidden"===b.settings.emptyStyle&&(c.visibility="hidden"),b.selectArray[d].css(c)},b.start=function(c){var e,f,d=this;if(a.isArray(c)&&(d.settings.data=b.getData(c,d.settings.jsonSpace)),d.selectArray.length){for(e=0,f=d.selectArray.length;f>e;e++)"string"!=typeof d.selectArray[e].attr("data-value")&&d.selectArray[e][0].options.length&&d.selectArray[e].attr("data-value",d.selectArray[e].val());d.settings.data||"string"==typeof d.selectArray[0].data("url")&&d.selectArray[0].data("url").length?b.getOptionData.call(d,0):d.selectArray[0].prop("disabled",!1).css({display:"",visibility:""})}},b.getOptionData=function(c){var f,g,h,i,j,k,l,m,n,o,p,d=this;if(!("number"!=typeof c||isNaN(c)||0>c||c>=d.selectArray.length))if(f=d.selectArray[c],i=f.data("url"),j="undefined"==typeof f.data("jsonSpace")?d.settings.jsonSpace:f.data("jsonSpace"),k={},b.clear.call(d,c),"string"==typeof i&&i.length){if(c>0)for(o=0,p=1;c>o;o++,p++)l=d.selectArray[p].data("queryName"),m=d.selectArray[o].attr("name"),n=d.selectArray[o].val(),"string"==typeof l&&l.length?k[l]=n:"string"==typeof m&&m.length&&(k[m]=n);a.getJSON(i,k,function(a){g=b.getData(a,j),b.buildOption.call(d,c,g)})}else if(d.settings.data&&"object"==typeof d.settings.data){for(g=d.settings.data,o=0;c>o;o++){if(h=b.getIndex(d.selectArray[o][0].selectedIndex,"boolean"==typeof d.selectArray[o].data("required")?d.selectArray[o].data("required"):d.settings.required),"object"!=typeof g[h]||!a.isArray(g[h][d.settings.jsonSub])||!g[h][d.settings.jsonSub].length){g=null;break}g=g[h][d.settings.jsonSub]}b.buildOption.call(d,c,g)}},b.buildOption=function(b,c){var k,l,m,d=this,e=d.selectArray[b],f="boolean"==typeof e.data("required")?e.data("required"):d.settings.required,g="undefined"==typeof e.data("firstTitle")?d.settings.firstTitle:e.data("firstTitle"),h="undefined"==typeof e.data("firstValue")?d.settings.firstValue:e.data("firstValue"),i="undefined"==typeof e.data("jsonName")?d.settings.jsonName:e.data("jsonName"),j="undefined"==typeof e.data("jsonValue")?d.settings.jsonValue:e.data("jsonValue");if(a.isArray(c)){if(k=f?"":'<option value="'+String(h)+'">'+String(g)+"</option>","string"==typeof i&&i.length)for("string"==typeof j&&j.length||(j=i),l=0,m=c.length;m>l;l++)k+='<option value="'+String(c[l][j])+'">'+String(c[l][i])+"</option>";else for(l=0,m=c.length;m>l;l++)k+='<option value="'+String(c[l])+'">'+String(c[l])+"</option>";e.html(k).prop("disabled",!1).css({display:"",visibility:""}),"string"==typeof e.attr("data-value")&&(e.val(String(e.attr("data-value"))).removeAttr("data-value"),e[0].selectedIndex<0&&(e[0].options[0].selected=!0)),(f||e[0].selectedIndex>0)&&e.trigger("change")}},b.selectChange=function(a){var d,e,f,c=this;if("string"==typeof a&&a.length){for(a=a.replace(/\s+/g,","),a=","+a+",",e=0,f=c.selectArray.length;f>e;e++)if(a.indexOf(","+c.settings.selects[e]+",")>-1){d=e;break}"number"==typeof d&&d>-1&&(d+=1,b.getOptionData.call(c,d))}},a.cxSelect=function(){return b.apply(this,arguments)},a.cxSelect.defaults={selects:[],url:null,data:null,emptyStyle:null,required:!1,firstTitle:"请选择",firstValue:"",jsonSpace:"",jsonName:"n",jsonValue:"",jsonSub:"s"},a.fn.cxSelect=function(b,c){return this.each(function(){a.cxSelect(this,b,c)}),this}});
\ No newline at end of file
diff --git a/app/assets/javascripts/jquery.validate.js b/app/assets/javascripts/jquery.validate.js
index 70297bd5c..d025319db 100644
--- a/app/assets/javascripts/jquery.validate.js
+++ b/app/assets/javascripts/jquery.validate.js
@@ -1,21 +1,21 @@
-/*!
- * jQuery Validation Plugin v1.19.1
- *
- * https://jqueryvalidation.org/
- *
- * Copyright (c) 2019 Jörn Zaefferer
- * Released under the MIT license
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-		define( ["jquery"], factory );
-	} else if (typeof module === "object" && module.exports) {
-		module.exports = factory( require( "jquery" ) );
-	} else {
-		factory( jQuery );
-	}
-}(function( $ ) {
-
+/*!
+ * jQuery Validation Plugin v1.19.1
+ *
+ * https://jqueryvalidation.org/
+ *
+ * Copyright (c) 2019 Jörn Zaefferer
+ * Released under the MIT license
+ */
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+		define( ["jquery"], factory );
+	} else if (typeof module === "object" && module.exports) {
+		module.exports = factory( require( "jquery" ) );
+	} else {
+		factory( jQuery );
+	}
+}(function( $ ) {
+
 $.extend( $.fn, {
 
 	// https://jqueryvalidation.org/validate/
@@ -1610,7 +1610,7 @@ $.extend( $.validator, {
 	}
 
 } );
-
+
 // Ajax mode: abort
 // usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
 // if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
@@ -1646,5 +1646,5 @@ if ( $.ajaxPrefilter ) {
 		return ajax.apply( this, arguments );
 	};
 }
-return $;
+return $;
 }));
\ No newline at end of file
diff --git a/app/assets/javascripts/select2.js b/app/assets/javascripts/select2.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/select2.min.js b/app/assets/javascripts/select2.min.js
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 33d585d83..0aa1329ca 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -25,7 +25,7 @@ a {
   }
 }
 
-input.danger {
+textarea.danger, input.danger {
   border-color: #dc3545!important;
 }
 
@@ -43,4 +43,8 @@ label.error {
       height: calc(1.5em + 0.75rem + 2px)
     }
   }
+}
+
+.flex-1 {
+  flex: 1;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/admins/common.scss b/app/assets/stylesheets/admins/common.scss
index 9830df3c7..2254166fd 100644
--- a/app/assets/stylesheets/admins/common.scss
+++ b/app/assets/stylesheets/admins/common.scss
@@ -100,5 +100,11 @@
       font-size: 24px;
     }
   }
+
+  .nav-tabs {
+    .nav-link {
+      padding: 0.5rem 2rem;
+    }
+  }
 }
 
diff --git a/app/assets/stylesheets/admins/identity-authentications.scss b/app/assets/stylesheets/admins/identity-authentications.scss
new file mode 100644
index 000000000..417581058
--- /dev/null
+++ b/app/assets/stylesheets/admins/identity-authentications.scss
@@ -0,0 +1,9 @@
+.admins-identity-authentications-index-page {
+  .identity-authentication-list-container {
+    span {
+      &.apply-status-1 { color: #28a745; }
+      &.apply-status-2 { color: #dc3545; }
+      &.apply-status-3 { color: #6c757d; }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admins/professional-authentications.scss b/app/assets/stylesheets/admins/professional-authentications.scss
new file mode 100644
index 000000000..6ef78f92d
--- /dev/null
+++ b/app/assets/stylesheets/admins/professional-authentications.scss
@@ -0,0 +1,9 @@
+.admins-professional-authentications-index-page {
+  .professional-authentication-list-container {
+    span {
+      &.apply-status-1 { color: #28a745; }
+      &.apply-status-2 { color: #dc3545; }
+      &.apply-status-3 { color: #6c757d; }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/select2-bootstrap4.min.scss b/app/assets/stylesheets/select2-bootstrap4.min.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/select2.min.scss b/app/assets/stylesheets/select2.min.scss
old mode 100755
new mode 100644
diff --git a/app/controllers/admins/identity_authentications_controller.rb b/app/controllers/admins/identity_authentications_controller.rb
new file mode 100644
index 000000000..90758ace8
--- /dev/null
+++ b/app/controllers/admins/identity_authentications_controller.rb
@@ -0,0 +1,26 @@
+class Admins::IdentityAuthenticationsController < Admins::BaseController
+  def index
+    params[:status] ||= 'pending'
+
+    applies = Admins::ApplyUserAuthenticationQuery.call(params.merge(type: 1))
+
+    @applies = paginate applies.preload(user: { user_extension: [:school, :department] })
+  end
+
+  def agree
+    Admins::IdentityAuths::AgreeApplyService.call(current_apply)
+    render_success_js
+  end
+
+  def refuse
+    Admins::IdentityAuths::RefuseApplyService.call(current_apply, params)
+
+    render_success_js
+  end
+
+  private
+
+  def current_apply
+    @_current_apply ||= ApplyUserAuthentication.real_name_auth.find(params[:id])
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/admins/professional_authentications_controller.rb b/app/controllers/admins/professional_authentications_controller.rb
new file mode 100644
index 000000000..327ee696c
--- /dev/null
+++ b/app/controllers/admins/professional_authentications_controller.rb
@@ -0,0 +1,26 @@
+class Admins::ProfessionalAuthenticationsController < Admins::BaseController
+  def index
+    params[:status] ||= 'pending'
+
+    applies = Admins::ApplyUserAuthenticationQuery.call(params.merge(type: 2))
+
+    @applies = paginate applies.preload(user: { user_extension: [:school, :department] })
+  end
+
+  def agree
+    Admins::ProfessionalAuths::AgreeApplyService.call(current_apply)
+    render_success_js
+  end
+
+  def refuse
+    Admins::ProfessionalAuths::RefuseApplyService.call(current_apply, params)
+
+    render_success_js
+  end
+
+  private
+
+  def current_apply
+    @_current_apply ||= ApplyUserAuthentication.professional_auth.find(params[:id])
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/admins/render_helper.rb b/app/controllers/concerns/admins/render_helper.rb
index c77c0ad32..3651f892b 100644
--- a/app/controllers/concerns/admins/render_helper.rb
+++ b/app/controllers/concerns/admins/render_helper.rb
@@ -40,6 +40,7 @@ module Admins::RenderHelper
   def render_delete_success
     render_js_template 'admins/shared/delete'
   end
+  alias_method :render_success_js, :render_delete_success
 
   def render_js_error(message)
     render_js_template 'admins/shared/error', locals: { message: message }
diff --git a/app/helpers/admins/base_helper.rb b/app/helpers/admins/base_helper.rb
new file mode 100644
index 000000000..c655be2e7
--- /dev/null
+++ b/app/helpers/admins/base_helper.rb
@@ -0,0 +1,102 @@
+module Admins::BaseHelper
+  def sidebar_item_group(url, text, **opts)
+    link_opts = url.start_with?('/') ? {} : { 'data-toggle': 'collapse', 'aria-expanded': false }
+    content =
+      link_to url, link_opts do
+        content_tag(:i, '', class: "fa fa-#{opts[:icon]}", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) +
+          content_tag(:span, text)
+      end
+
+    content +=
+      content_tag(:ul, id: url[1..-1], class: 'collapse list-unstyled', "data-parent": '#sidebar') do
+        yield
+      end
+
+    raw content
+  end
+
+  def sidebar_item(url, text, **opts)
+    content =
+      link_to url, 'data-controller': opts[:controller] do
+        content_tag(:i, '', class: "fa fa-#{opts[:icon]}", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) +
+          content_tag(:span, text)
+      end
+
+    raw content
+  end
+
+  def admin_sidebar_controller
+    key = params[:controller].to_s.gsub(/\//, '-')
+    SidebarUtil.controller_name(key) || key
+  end
+
+  def define_admin_breadcrumbs(&block)
+    content_for(:setup_admin_breadcrumb, &block)
+  end
+
+  def add_admin_breadcrumb(text, url = nil)
+    @_admin_breadcrumbs ||= []
+    @_admin_breadcrumbs << OpenStruct.new(text: text, url: url)
+  end
+
+  def display_text(str, default = '--')
+    str.presence || default
+  end
+
+  def overflow_hidden_span(text, width: 300)
+    opts = { class: 'd-inline-block text-truncate', style: "max-width: #{width}px" }
+    opts.merge!('data-toggle': 'tooltip', title: text) if text != '--'
+
+    content_tag(:span, text, opts)
+  end
+
+  def sort_tag(content = '', **opts)
+    options = {}
+    options[:sort_by] = opts.delete(:name)
+    is_current_sort = params[:sort_by].to_s == options[:sort_by]
+    options[:sort_direction] = is_current_sort && params[:sort_direction].to_s == 'desc' ? 'asc' : 'desc'
+
+    path = opts.delete(:path) + "?" + unsafe_params.merge(options).to_query
+    arrow_class = case params[:sort_direction].to_s
+                  when 'desc' then 'fa-sort-amount-desc'
+                  when 'asc' then 'fa-sort-amount-asc'
+                  else ''
+                  end
+    opts[:style] = "#{opts[:style]} ;position: relative;"
+
+    content_tag(:span, opts) do
+      link_to path, remote: true do
+        content = content_tag(:span) { yield } if block_given?
+
+        content += content_tag(:i, '', class: "fa color-light-green ml-1 #{arrow_class}", style: 'position: absolute;top:0;') if is_current_sort
+        raw content
+      end
+    end
+  end
+
+  def javascript_void_link(name, **opts)
+    raw link_to(name, 'javascript:void(0)', opts)
+  end
+
+  def agree_link(name, url, **opts)
+    klass = ['action agree-action', opts.delete(:class)].compact.join(' ')
+
+    refresh_url_data = "refresh_url=#{CGI::escape(request.fullpath)}"
+    url = url + (url.index('?') ? '&' : '?') + refresh_url_data
+
+    raw link_to(name, url, { method: :post, remote: true, class: klass, 'data-confirm': '确认审核通过？'}.merge(opts))
+  end
+
+  def delete_link(name, url, **opts)
+    klass = ['action delete-action', opts.delete(:class)].compact.join(' ')
+
+    refresh_url_data = "refresh_url=#{CGI::escape(request.fullpath)}"
+    url = url + (url.index('?') ? '&' : '?') + refresh_url_data
+
+    raw link_to(name, url, { method: :delete, remote: true, class: klass, 'data-confirm': '确认删除？'}.merge(opts))
+  end
+
+  def unsafe_params
+    params.except(:controller, :action).to_unsafe_h
+  end
+end
\ No newline at end of file
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0f536433d..44169dc59 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -158,10 +158,22 @@ module ApplicationHelper
     disk_auth_filename('UserAuthentication', source_id, 'ID')
   end
 
+  def auth_file_url(source_type, source_id, type)
+    File.join('/images', relative_path, source_type, "#{source_id}#{type}")
+  end
+
+  def real_name_auth_file_url(source_id)
+    auth_file_url('UserAuthentication', source_id, 'ID')
+  end
+
   def disk_professional_auth_filename(source_id)
     disk_auth_filename('UserAuthentication', source_id, 'PRO')
   end
 
+  def professional_auth_file_url(source_id)
+    auth_file_url('UserAuthentication', source_id, 'PRO')
+  end
+
   def shixun_url_to_avatar(shixun)
     if File.exist?(disk_filename(shixun.class, shixun.id))
       File.join("images/#{relative_path}", "#{shixun.class}", "#{shixun.id}")
@@ -386,95 +398,6 @@ module ApplicationHelper
     m_t&.include?("src=\"") ? m_t&.gsub("src=\"","src=\"#{origin_url}") : m_t
   end
 
-  # =========== Admin Helpers Begin ===========
-  def sidebar_item_group(url, text, **opts)
-    link_opts = url.start_with?('/') ? {} : { 'data-toggle': 'collapse', 'aria-expanded': false }
-    content =
-      link_to url, link_opts do
-        content_tag(:i, '', class: "fa fa-#{opts[:icon]}", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) +
-          content_tag(:span, text)
-      end
-
-    content +=
-      content_tag(:ul, id: url[1..-1], class: 'collapse list-unstyled', "data-parent": '#sidebar') do
-        yield
-      end
-
-    raw content
-  end
-
-  def sidebar_item(url, text, **opts)
-    content =
-      link_to url, 'data-controller': opts[:controller] do
-        content_tag(:i, '', class: "fa fa-#{opts[:icon]}", 'data-toggle': 'tooltip', 'data-placement': 'right', 'data-boundary': 'window', title: text) +
-          content_tag(:span, text)
-      end
-
-    raw content
-  end
-
-  def admin_sidebar_controller
-    key = params[:controller].to_s.gsub(/\//, '-')
-    SidebarUtil.controller_name(key) || key
-  end
-
-  def define_admin_breadcrumbs(&block)
-    content_for(:setup_admin_breadcrumb, &block)
-  end
-
-  def add_admin_breadcrumb(text, url = nil)
-    @_admin_breadcrumbs ||= []
-    @_admin_breadcrumbs << OpenStruct.new(text: text, url: url)
-  end
-
-  def display_text(str, default = '--')
-    str.presence || default
-  end
-
-  def overflow_hidden_span(text, width: 300)
-    opts = { class: 'd-inline-block text-truncate', style: "max-width: #{width}px" }
-    opts.merge!('data-toggle': 'tooltip', title: text) if text != '--'
-
-    content_tag(:span, text, opts)
-  end
-
-  def sort_tag(content = '', **opts)
-    options = {}
-    options[:sort_by] = opts.delete(:name)
-    is_current_sort = params[:sort_by].to_s == options[:sort_by]
-    options[:sort_direction] = is_current_sort && params[:sort_direction].to_s == 'desc' ? 'asc' : 'desc'
-
-    path = opts.delete(:path) + "?" + params.slice(:action, :controller).merge(options).to_unsafe_h.to_query
-    arrow_class = case params[:sort_direction].to_s
-                  when 'desc' then 'fa-sort-amount-desc'
-                  when 'asc' then 'fa-sort-amount-asc'
-                  else ''
-                  end
-    opts[:style] = "#{opts[:style]} ;position: relative;"
-
-    content_tag(:span, opts) do
-      link_to path, remote: true do
-        content = content_tag(:span) { yield } if block_given?
-
-        content += content_tag(:i, '', class: "fa color-light-green ml-1 #{arrow_class}", style: 'position: absolute;top:0;') if is_current_sort
-        raw content
-      end
-    end
-  end
-
-  def javascript_void_link(name, **opts)
-    raw link_to(name, 'javascript:void(0)', opts)
-  end
-
-  def delete_link(name, url, **opts)
-    klass = ['action delete-action', opts.delete(:class)].compact.join(' ')
-
-    refresh_url_data = "refresh_url=#{CGI::escape(request.fullpath)}"
-    url = url + (url.index('?') ? '&' : '?') + refresh_url_data
-
-    raw link_to(name, url, { method: :delete, remote: true, class: klass, 'data-confirm': '确认删除？'}.merge(opts))
-  end
-  # =========== Admin Helpers End ===========
 end
 
 
diff --git a/app/libs/util/file_manage.rb b/app/libs/util/file_manage.rb
new file mode 100644
index 000000000..620fd7f01
--- /dev/null
+++ b/app/libs/util/file_manage.rb
@@ -0,0 +1,40 @@
+module Util::FileManage
+  module_function
+
+  # 不同的类型扩展不同的目录
+  def relative_path
+    "avatars"
+  end
+
+  def storage_path
+    File.join(Rails.root, "public", "images", relative_path)
+  end
+
+  def disk_filename(source_type,source_id,image_file=nil)
+    File.join(storage_path, "#{source_type}", "#{source_id}")
+  end
+
+  def disk_auth_filename(source_type, source_id, type)
+    File.join(storage_path, "#{source_type}", "#{source_id}#{type}")
+  end
+
+  def disk_real_name_auth_filename(source_id)
+    disk_auth_filename('UserAuthentication', source_id, 'ID')
+  end
+
+  def auth_file_url(source_type, source_id, type)
+    File.join('/images', relative_path, source_type, "#{source_id}#{type}")
+  end
+
+  def real_name_auth_file_url(source_id)
+    auth_file_url('UserAuthentication', source_id, 'ID')
+  end
+
+  def disk_professional_auth_filename(source_id)
+    disk_auth_filename('UserAuthentication', source_id, 'PRO')
+  end
+
+  def professional_auth_file_url(source_id)
+    auth_file_url('UserAuthentication', source_id, 'PRO')
+  end
+end
\ No newline at end of file
diff --git a/app/models/apply_user_authentication.rb b/app/models/apply_user_authentication.rb
index d467eb850..c379fb82e 100644
--- a/app/models/apply_user_authentication.rb
+++ b/app/models/apply_user_authentication.rb
@@ -12,6 +12,12 @@ class ApplyUserAuthentication < ApplicationRecord
 
   after_create :send_tiding
 
+  def status_text
+    I18n.t!("apply_user_authentication.status.#{status}")
+  rescue I18n::MissingTranslationData
+    nil
+  end
+
   private
 
   def send_tiding
diff --git a/app/queries/admins/apply_user_authentication_query.rb b/app/queries/admins/apply_user_authentication_query.rb
new file mode 100644
index 000000000..a4d1c2a4a
--- /dev/null
+++ b/app/queries/admins/apply_user_authentication_query.rb
@@ -0,0 +1,34 @@
+class Admins::ApplyUserAuthenticationQuery < ApplicationQuery
+  include CustomSortable
+
+  attr_reader :params
+
+  sort_columns :updated_at, default_by: :updated_at, default_direction: :desc
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    applies = ApplyUserAuthentication.where(auth_type: params[:type].presence || 1)
+
+    status =
+      case params[:status]
+      when 'pending'   then 0
+      when 'processed' then [1, 2]
+      when 'agreed'    then 1
+      when 'refused'   then 2
+      else 0
+      end
+    applies = applies.where(status: status) if status.present?
+
+    # 关键字模糊查询
+    keyword = params[:keyword].to_s.strip
+    if keyword.present?
+      applies = applies.joins(user: { user_extension: :school })
+                  .where('CONCAT(lastname,firstname) LIKE :keyword OR schools.name LIKE :keyword', keyword: "%#{keyword}%")
+    end
+
+    custom_sort(applies, params[:sort_by], params[:sort_direction])
+  end
+end
\ No newline at end of file
diff --git a/app/services/admins/identity_auths/agree_apply_service.rb b/app/services/admins/identity_auths/agree_apply_service.rb
new file mode 100644
index 000000000..65a3b2376
--- /dev/null
+++ b/app/services/admins/identity_auths/agree_apply_service.rb
@@ -0,0 +1,38 @@
+class Admins::IdentityAuths::AgreeApplyService < ApplicationService
+  attr_reader :apply, :user
+
+  def initialize(apply)
+    @apply = apply
+    @user  = apply.user
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.update!(status: 1)
+      user.update!(authentication: true)
+
+      RewardGradeService.call(user, container_id: user.id, container_type: 'Authentication', score: 500)
+
+      deal_tiding!
+      delete_auth_file!
+    end
+  end
+
+  private
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply').update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyUserAuthentication',
+                   belong_container_id: apply.user_id, belong_container_type: 'User',
+                   status: 1, tiding_type: 'System')
+  end
+
+  def delete_auth_file!
+    path = Util::FileManage.disk_real_name_auth_filename(user.id)
+    File.delete(path) if File.exists?(path)
+
+    apply.update!(is_delete: true)
+  end
+end
\ No newline at end of file
diff --git a/app/services/admins/identity_auths/refuse_apply_service.rb b/app/services/admins/identity_auths/refuse_apply_service.rb
new file mode 100644
index 000000000..57581dd40
--- /dev/null
+++ b/app/services/admins/identity_auths/refuse_apply_service.rb
@@ -0,0 +1,40 @@
+class Admins::IdentityAuths::RefuseApplyService < ApplicationService
+  attr_reader :apply, :user, :params
+
+  def initialize(apply, params)
+    @apply  = apply
+    @user   = apply.user
+    @params = params
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.update!(status: 2, remarks: reason)
+
+      deal_tiding!
+      delete_auth_file!
+    end
+  end
+
+  private
+
+  def reason
+    params[:reason].to_s.strip
+  end
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply').update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyUserAuthentication',
+                   belong_container_id: apply.user_id, belong_container_type: 'User',
+                   status: 2, tiding_type: 'System')
+  end
+
+  def delete_auth_file!
+    path = Util::FileManage.disk_real_name_auth_filename(user.id)
+    File.delete(path) if File.exists?(path)
+
+    apply.update!(is_delete: true)
+  end
+end
\ No newline at end of file
diff --git a/app/services/admins/professional_auths/agree_apply_service.rb b/app/services/admins/professional_auths/agree_apply_service.rb
new file mode 100644
index 000000000..81654f0d3
--- /dev/null
+++ b/app/services/admins/professional_auths/agree_apply_service.rb
@@ -0,0 +1,38 @@
+class Admins::ProfessionalAuths::AgreeApplyService < ApplicationService
+  attr_reader :apply, :user
+
+  def initialize(apply)
+    @apply = apply
+    @user  = apply.user
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.update!(status: 1)
+      user.update!(professional_certification: true)
+
+      RewardGradeService.call(user, container_id: user.id, container_type: 'Professional', score: 500)
+
+      deal_tiding!
+      delete_auth_file!
+    end
+  end
+
+  private
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply').update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyUserAuthentication',
+                   belong_container_id: apply.user_id, belong_container_type: 'User',
+                   status: 1, tiding_type: 'System')
+  end
+
+  def delete_auth_file!
+    path = Util::FileManage.disk_professional_auth_filename(user.id)
+    File.delete(path) if File.exists?(path)
+
+    apply.update!(is_delete: true)
+  end
+end
\ No newline at end of file
diff --git a/app/services/admins/professional_auths/refuse_apply_service.rb b/app/services/admins/professional_auths/refuse_apply_service.rb
new file mode 100644
index 000000000..b5332c999
--- /dev/null
+++ b/app/services/admins/professional_auths/refuse_apply_service.rb
@@ -0,0 +1,40 @@
+class Admins::ProfessionalAuths::RefuseApplyService < ApplicationService
+  attr_reader :apply, :user, :params
+
+  def initialize(apply, params)
+    @apply  = apply
+    @user   = apply.user
+    @params = params
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.update!(status: 2, remarks: reason)
+
+      deal_tiding!
+      delete_auth_file!
+    end
+  end
+
+  private
+
+  def reason
+    params[:reason].to_s.strip
+  end
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply').update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyUserAuthentication',
+                   belong_container_id: apply.user_id, belong_container_type: 'User',
+                   status: 2, tiding_type: 'System')
+  end
+
+  def delete_auth_file!
+    path = Util::FileManage.disk_professional_auth_filename(user.id)
+    File.delete(path) if File.exists?(path)
+
+    apply.update!(is_delete: true)
+  end
+end
\ No newline at end of file
diff --git a/app/views/admins/identity_authentications/index.html.erb b/app/views/admins/identity_authentications/index.html.erb
new file mode 100644
index 000000000..170a8fc4a
--- /dev/null
+++ b/app/views/admins/identity_authentications/index.html.erb
@@ -0,0 +1,32 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('实名认证') %>
+<% end %>
+
+<div class="box search-form-container flex-column mb-0 pb-0 identity-authentication-list-form">
+  <ul class="nav nav-tabs w-100 search-form-tabs">
+    <li class="nav-item">
+      <%= link_to '待审批', admins_identity_authentications_path(status: :pending), remote: true, 'data-value': 'pending',
+                  class: "nav-link search-form-tab #{params[:status] == 'pending' ? 'active' : ''}" %>
+    </li>
+    <li class="nav-item">
+      <%= link_to '已审批', admins_identity_authentications_path(status: :processed), remote: true, 'data-value': 'processed',
+                  class: "nav-link search-form-tab #{params[:status] != 'pending' ? 'active' : ''}" %>
+    </li>
+  </ul>
+
+  <%= form_tag(admins_identity_authentications_path(unsafe_params), method: :get, class: 'form-inline search-form justify-content-end mt-3', remote: true) do %>
+    <div class="form-group status-filter" style="<%= params[:status] != 'pending' ? '' : 'display: none;' %>">
+      <label for="status">审核状态：</label>
+      <% status_options = [['全部', 'processed'], ['已同意', 'agreed'], ['已拒绝', 'refused']] %>
+      <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
+    </div>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '姓名/学校/单位检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
+  <% end %>
+</div>
+
+<div class="box identity-authentication-list-container">
+  <%= render(partial: 'admins/identity_authentications/shared/list', locals: { applies: @applies }) %>
+</div>
+
+<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>
\ No newline at end of file
diff --git a/app/views/admins/identity_authentications/index.js.erb b/app/views/admins/identity_authentications/index.js.erb
new file mode 100644
index 000000000..81d108b0d
--- /dev/null
+++ b/app/views/admins/identity_authentications/index.js.erb
@@ -0,0 +1 @@
+$('.identity-authentication-list-container').html("<%= j( render partial: 'admins/identity_authentications/shared/list', locals: { applies: @applies } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/identity_authentications/shared/_list.html.erb b/app/views/admins/identity_authentications/shared/_list.html.erb
new file mode 100644
index 000000000..f6aa53dd1
--- /dev/null
+++ b/app/views/admins/identity_authentications/shared/_list.html.erb
@@ -0,0 +1,74 @@
+<% is_processed = params[:status].to_s != 'pending' %>
+
+<table class="table table-hover text-center identity-authentication-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="8%">头像</th>
+    <th width="10%">姓名</th>
+    <th width="14%">身份证号</th>
+    <th width="20%">学校/单位</th>
+    <th width="12%">职称</th>
+    <% unless is_processed %>
+      <th width="8%">
+        照片
+        <i class="fa fa-question-circle" data-toggle="tooltip" data-html="true" data-placement="top" title="审核完成后自动删除图片"></i>
+      </th>
+    <% end %>
+    <th width="16%">时间</th>
+    <% if is_processed %>
+      <th width="14%">拒绝原因</th>
+      <th width="8%">状态</th>
+    <% else %>
+      <th width="20%">操作</th>
+    <% end %>
+  </tr>
+  </thead>
+  <tbody>
+  <% if applies.present? %>
+    <% applies.each do |apply| %>
+      <% user = apply.user %>
+      <tr class="identity-authentication-item identity-authentication-<%= apply.id %>">
+        <td>
+          <%= link_to "/users/#{user.login}", class: 'identity-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+            <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
+          <% end %>
+        </td>
+        <td><%= user.real_name %></td>
+        <td><%= user.ID_number %></td>
+        <td><%= raw [user.school_name.presence, user.department_name.presence].compact.join('<br/>') %></td>
+        <td><%= user.identity %> <%= raw user.user_extension.student? && user.student_id ? "<br/>#{user.student_id}" : '' %></td>
+
+        <% unless is_processed %>
+          <td>
+            <% if File.exists?(disk_real_name_auth_filename(user.id)) %>
+              <%= image_tag(real_name_auth_file_url(user.id).to_s + "?#{Time.now.to_i}", width: 40, height: 40, class: 'preview-image auth-image', data: { toggle: 'tooltip', title: '点击预览' }) %>
+            <% else %>
+              <%= content_tag(:span, '图片已删除', class: 'text-secondary') %>
+            <% end %>
+          </td>
+        <% end %>
+
+        <td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
+
+        <% if is_processed %>
+          <td class="text-secondary"><%= overflow_hidden_span apply.remarks, width: 140 %></td>
+          <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
+        <% else %>
+          <td class="action-container">
+            <%= agree_link '同意', agree_admins_identity_authentication_path(apply, element: ".identity-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
+            <%= javascript_void_link('拒绝', class: 'action refuse-action',
+                                     data: {
+                                         toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
+                                         url: refuse_admins_identity_authentication_path(apply, element: ".identity-authentication-#{apply.id}")
+                                     }) %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>
\ No newline at end of file
diff --git a/app/views/admins/professional_authentications/index.html.erb b/app/views/admins/professional_authentications/index.html.erb
new file mode 100644
index 000000000..e10d2bd80
--- /dev/null
+++ b/app/views/admins/professional_authentications/index.html.erb
@@ -0,0 +1,32 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('职业认证') %>
+<% end %>
+
+<div class="box search-form-container flex-column mb-0 pb-0 professional-authentication-list-form">
+  <ul class="nav nav-tabs w-100 search-form-tabs">
+    <li class="nav-item">
+      <%= link_to '待审批', admins_professional_authentications_path(status: :pending), remote: true, 'data-value': 'pending',
+                  class: "nav-link search-form-tab #{params[:status] == 'pending' ? 'active' : ''}" %>
+    </li>
+    <li class="nav-item">
+      <%= link_to '已审批', admins_professional_authentications_path(status: :processed), remote: true, 'data-value': 'processed',
+                  class: "nav-link search-form-tab #{params[:status] != 'pending' ? 'active' : ''}" %>
+    </li>
+  </ul>
+
+  <%= form_tag(admins_professional_authentications_path(unsafe_params), method: :get, class: 'form-inline search-form justify-content-end mt-3', remote: true) do %>
+    <div class="form-group status-filter" style="<%= params[:status] != 'pending' ? '' : 'display: none;' %>">
+      <label for="status">审核状态：</label>
+      <% status_options = [['全部', 'processed'], ['已同意', 'agreed'], ['已拒绝', 'refused']] %>
+      <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
+    </div>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '姓名/学校/单位检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
+  <% end %>
+</div>
+
+<div class="box professional-authentication-list-container">
+  <%= render(partial: 'admins/professional_authentications/shared/list', locals: { applies: @applies }) %>
+</div>
+
+<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>
\ No newline at end of file
diff --git a/app/views/admins/professional_authentications/index.js.erb b/app/views/admins/professional_authentications/index.js.erb
new file mode 100644
index 000000000..468c131d6
--- /dev/null
+++ b/app/views/admins/professional_authentications/index.js.erb
@@ -0,0 +1 @@
+$('.professional-authentication-list-container').html("<%= j( render partial: 'admins/professional_authentications/shared/list', locals: { applies: @applies } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/professional_authentications/shared/_list.html.erb b/app/views/admins/professional_authentications/shared/_list.html.erb
new file mode 100644
index 000000000..fd7685f98
--- /dev/null
+++ b/app/views/admins/professional_authentications/shared/_list.html.erb
@@ -0,0 +1,72 @@
+<% is_processed = params[:status].to_s != 'pending' %>
+
+<table class="table table-hover text-center professional-authentication-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="8%">头像</th>
+    <th width="14%">姓名</th>
+    <th width="28%">学校/单位</th>
+    <th width="12%">职称</th>
+    <% unless is_processed %>
+      <th width="10%">
+        照片
+        <i class="fa fa-question-circle" data-toggle="tooltip" data-html="true" data-placement="top" title="审核完成后自动删除图片"></i>
+      </th>
+    <% end %>
+    <th width="16%">时间</th>
+    <% if is_processed %>
+      <th width="14%">拒绝原因</th>
+      <th width="8%">状态</th>
+    <% else %>
+      <th width="18%">操作</th>
+    <% end %>
+  </tr>
+  </thead>
+  <tbody>
+  <% if applies.present? %>
+    <% applies.each do |apply| %>
+      <% user = apply.user %>
+      <tr class="professional-authentication-item professional-authentication-<%= apply.id %>">
+        <td>
+          <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+            <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
+          <% end %>
+        </td>
+        <td><%= user.real_name %></td>
+        <td><%= raw [user.school_name.presence, user.department_name.presence].compact.join('<br/>') %></td>
+        <td><%= user.identity %> <%= raw user.user_extension.student? && user.student_id ? "<br/>#{user.student_id}" : '' %></td>
+
+        <% unless is_processed %>
+          <td>
+            <% if File.exists?(disk_professional_auth_filename(user.id)) %>
+              <%= image_tag(professional_auth_file_url(user.id).to_s + "?#{Time.now.to_i}", width: 40, height: 40, class: 'preview-image auth-image', data: { toggle: 'tooltip', title: '点击预览' }) %>
+            <% else %>
+              <%= content_tag(:span, '图片已删除', class: 'text-secondary') %>
+            <% end %>
+          </td>
+        <% end %>
+
+        <td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
+
+        <% if is_processed %>
+          <td class="text-secondary"><%= overflow_hidden_span apply.remarks, width: 140 %></td>
+          <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
+        <% else %>
+          <td class="action-container">
+            <%= agree_link '同意', agree_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
+            <%= javascript_void_link('拒绝', class: 'action refuse-action',
+                                     data: {
+                                         toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
+                                         url: refuse_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}")
+                                     }) %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>
\ No newline at end of file
diff --git a/app/views/admins/school_statistics/index.html.erb b/app/views/admins/school_statistics/index.html.erb
index fd0c7cac1..0453dfffa 100644
--- a/app/views/admins/school_statistics/index.html.erb
+++ b/app/views/admins/school_statistics/index.html.erb
@@ -32,9 +32,9 @@
 
     <div class="type-box ml-3">
       <%= hidden_field_tag :data_type, params[:data_type] || 'grow' %>
-      <%= javascript_void_link '时段对比', class: "btn btn-outline-primary btn-sm contrast-btn #{params[:data_type] == 'contrast' ? 'active' : ''}",
+      <%= javascript_void_link '时段对比', class: "btn btn-outline-info btn-sm contrast-btn #{params[:data_type] == 'contrast' ? 'active' : ''}",
                                data: { toggle: 'tooltip', trigger: 'hover', title: '请在左侧分别选择需进行对比的两个时段，具体从当日5:00开始计算，下表显示两时段选定指标两时段变化情况对比' } %>
-      <%= javascript_void_link '数据变化', class: "btn btn-outline-primary btn-sm grow-btn #{params[:data_type] == 'contrast' ? '' : 'active'}",
+      <%= javascript_void_link '数据变化', class: "btn btn-outline-info btn-sm grow-btn #{params[:data_type] == 'contrast' ? '' : 'active'}",
                                data: { toggle: 'tooltip', trigger: 'hover', title: '请在左侧选择时间段，具体从当日5:00开始计算，下表显示选定时间段内各项指标数据变化情况' } %>
     </div>
 
diff --git a/app/views/admins/shared/_admin_common_refuse_modal.html.erb b/app/views/admins/shared/_admin_common_refuse_modal.html.erb
new file mode 100644
index 000000000..a2daf7f0c
--- /dev/null
+++ b/app/views/admins/shared/_admin_common_refuse_modal.html.erb
@@ -0,0 +1,26 @@
+<div class="modal fade admin-common-refuse-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLongTitle">拒绝原因</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form class="admin-common-refuse-form">
+          <%= hidden_field_tag(:apply_id, nil) %>
+          <div class="form-group">
+            <label for="reason" class="col-form-label">原因:</label>
+            <%= text_area_tag(:reason, nil, class: 'form-control', placeholder: '我得说点儿什么，最多200字') %>
+          </div>
+          <div class="error text-danger"></div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+        <button type="button" class="btn btn-primary submit-btn">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index cd64f3d0f..2be899ebd 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -37,6 +37,13 @@
       <% end %>
     </li>
 
+    <li>
+      <%= sidebar_item_group('#apply-review-submenu', '审核', icon: 'gavel') do %>
+        <li><%= sidebar_item(admins_identity_authentications_path, '实名认证', icon: 'id-card-o', controller: 'admins-identity_authentications') %></li>
+        <li><%= sidebar_item(admins_professional_authentications_path, '职业认证', icon: 'drivers-license', controller: 'admins-professional_authentications') %></li>
+      <% end %>
+    </li>
+
     <li><%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %></li>
   </ul>
 </nav>
\ No newline at end of file
diff --git a/app/views/admins/shared/after_render_js_hook.js.erb b/app/views/admins/shared/after_render_js_hook.js.erb
index 9ceb13f5c..efc1e9295 100644
--- a/app/views/admins/shared/after_render_js_hook.js.erb
+++ b/app/views/admins/shared/after_render_js_hook.js.erb
@@ -1,3 +1,4 @@
 ;
 $('[data-toggle="tooltip"]').tooltip();
-$('[data-toggle="popover"]').popover();
\ No newline at end of file
+$('[data-toggle="popover"]').popover();
+$('img.preview-image').bootstrapViewer();
\ No newline at end of file
diff --git a/app/views/admins/shared/delete.js.erb b/app/views/admins/shared/delete.js.erb
index a10e1ae28..74512d55b 100644
--- a/app/views/admins/shared/delete.js.erb
+++ b/app/views/admins/shared/delete.js.erb
@@ -1,6 +1,8 @@
 var deleteRow = $('<%= params[:element] %>');
 var refreshUrl = '<%= params[:refresh_url] %>';
 
+$.notify({ message: '操作成功' },{ type: 'success' });
+
 var refreshFunc = function(url) {
   $.ajax({
     url: url.length > 0 ? url : window.location.href,
diff --git a/app/views/admins/users/shared/_user_list.html.erb b/app/views/admins/users/shared/_user_list.html.erb
index e23e918fb..36b5d0f6e 100644
--- a/app/views/admins/users/shared/_user_list.html.erb
+++ b/app/views/admins/users/shared/_user_list.html.erb
@@ -1,29 +1,23 @@
 <table class="table table-hover users-list-table">
   <thead class="thead-light">
     <tr>
-      <th width="10%">ID</th>
-      <th width="10%">真实姓名</th>
+      <th width="10%" class="text-left">真实姓名</th>
       <th width="16%">邮件地址</th>
       <th width="10%">手机号码</th>
       <th width="14%">单位</th>
-      <th width="12%"><%= sort_tag('创建于', name: 'created_on', path: admins_users_path) %></th>
-      <th width="12%"><%= sort_tag('最后登录', name: 'last_login_on', path: admins_users_path) %></th>
-      <th width="10%"><%= sort_tag('经验值', name: 'experience', path: admins_users_path) %></th>
-      <th width="8%"><%= sort_tag('金币', name: 'grade', path: admins_users_path) %></th>
-      <th width="14%">操作</th>
+      <th width="10%"><%= sort_tag('创建于', name: 'created_on', path: admins_users_path) %></th>
+      <th width="10%"><%= sort_tag('最后登录', name: 'last_login_on', path: admins_users_path) %></th>
+      <th width="6%"><%= sort_tag('经验值', name: 'experience', path: admins_users_path) %></th>
+      <th width="6%"><%= sort_tag('金币', name: 'grade', path: admins_users_path) %></th>
+      <th width="20%">操作</th>
     </tr>
   </thead>
   <tbody>
     <% if users.present? %>
       <% users.each do |user| %>
         <tr class="user-item-<%= user.id %>">
-          <td>
+          <td class="text-left">
             <%= link_to "/users/#{user.login}", target: '_blank' do %>
-              <%= overflow_hidden_span user.login, width: 100 %>
-            <% end %>
-          </td>
-          <td>
-            <%= link_to edit_admins_user_path(user) do %>
               <%= overflow_hidden_span user.real_name, width: 100 %>
             <% end %>
           </td>
@@ -35,6 +29,8 @@
           <td><%= user.experience.to_i %></td>
           <td class="grade-content"><%= user.grade.to_i %></td>
           <td class="action-container">
+            <%= link_to '编辑', edit_admins_user_path(user), class: 'action' %>
+
             <%= javascript_void_link('奖励', class: 'action reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
 
             <%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id, confirm: '确认解锁吗？' }, style: user.locked? ? '' : 'display: none;' %>
diff --git a/config/locales/apply_user_authentications/zh-CN.yml b/config/locales/apply_user_authentications/zh-CN.yml
new file mode 100644
index 000000000..e886c2695
--- /dev/null
+++ b/config/locales/apply_user_authentications/zh-CN.yml
@@ -0,0 +1,7 @@
+zh-CN:
+  apply_user_authentication:
+    status:
+      '0': '待处理'
+      '1': '已同意'
+      '2': '已拒绝'
+      '3': '已撤销'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5ed8ecd69..4fc660a45 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -753,7 +753,7 @@ Rails.application.routes.draw do
       get :contrast, on: :collection
     end
 
-    resources :users, only: [:index, :edit, :update] do
+    resources :users, only: [:index, :edit, :update, :destroy] do
       member do
         post :reward_grade
         post :lock
@@ -761,6 +761,19 @@ Rails.application.routes.draw do
         post :active
       end
     end
+
+    resources :identity_authentications, only: [:index] do
+      member do
+        post :agree
+        post :refuse
+      end
+    end
+    resources :professional_authentications, only: [:index] do
+      member do
+        post :agree
+        post :refuse
+      end
+    end
   end
 
   #git 认证回调
diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index 510bcaa4f..f126bc363 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -30,7 +30,8 @@ module.exports = {
   // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
-	// 开启调试
+  // 开启调试
+  devtool: "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/scripts/build.js b/public/react/scripts/build.js
index 022e8074f..269304764 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -195,7 +195,29 @@ function generateNewIndexJsp() {
     let cdnHost = 'https://shixun.educoder.net'
     cdnHost = 'https://ali-cdn.educoder.net'
     cdnHost = ''
-    var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
+    
+
+    var mainRegex = /<script type="text\/javascript" src="\/react\/build\/.\/static\/js\/main.([a-zA-Z0-9]{8,}).js"><\/script>/
+    var matchResult = data.match(mainRegex)
+    var code = `
+      <script>
+         (function() {
+            var _host = ''
+            if (window.location.host == 'pre-newweb.educoder.net') {
+                _host = 'https://testali-cdn.educoder.net/react/build/'
+            } else if (window.location.host == 'www.educoder.net') {
+                _host = 'https://ali-newweb.educoder.net/react/build/'
+            }
+            document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
+         })()
+      </script>
+    `
+    var jsMinAllRegex = /<script type="text\/javascript" src="\/js\/js_min_all.js"><\/script>/
+    // <script type="text/javascript" src="/js/js_min_all.js"></script>
+    var result = data
+        .replace(jsMinAllRegex, code)
+        // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
@@ -204,10 +226,11 @@ function generateNewIndexJsp() {
 			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
 
+        .replace(mainRegex, '')
         // .replace('/react/build/./static/css/main', `${cdnHost}/react/build/./static/css/main`)
         // .replace('/react/build/./static/js/main', `${cdnHost}/react/build/./static/js/main`)
        
-        .replace(/https:\/\/testeduplus2.educoder.net/g, '');
+        // .replace(/https:\/\/testeduplus2.educoder.net/g, '');
         // .replace(/http:\/\/testbdweb.educoder.net/g, '');
 
         // .replace('/css/css_min_all.css', '/react/build/css/css_min_all.css');
diff --git a/public/react/src/App.css b/public/react/src/App.css
index a6f1d45e7..2b3d8d08c 100644
--- a/public/react/src/App.css
+++ b/public/react/src/App.css
@@ -55,6 +55,10 @@ html, body {
 .markdown-body p {
   white-space: pre-wrap;
 }
+/* https://www.educoder.net/courses/2346/group_homeworks/34405/question */
+.renderAsHtml.markdown-body p {
+  white-space: inherit;
+}
 /* resize */
 .editormd .CodeMirror {
   border-right: none !important;
diff --git a/public/react/src/App.js b/public/react/src/App.js
index e6f55f5d2..b40af3e0b 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -1,4 +1,5 @@
 import React, {Component} from 'react';
+import './public-path';
 import logo from './logo.svg';
 import './App.css';
 import {LocaleProvider} from 'antd'
diff --git a/public/react/src/common/TextUtil.js b/public/react/src/common/TextUtil.js
index 4c83131f1..74cdef3e6 100644
--- a/public/react/src/common/TextUtil.js
+++ b/public/react/src/common/TextUtil.js
@@ -9,6 +9,7 @@ export function markdownToHTML(oldContent, selector) {
     window.$('#md_div').html('')
     // markdown to html
     if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
+        window.$('#' + selector).addClass('renderAsHtml')
         window.$('#' + selector).html(oldContent)
     } else {
         try {    
diff --git a/public/react/src/common/components/attachment/AttachmentList.js b/public/react/src/common/components/attachment/AttachmentList.js
index 8ece1c39d..afc55fe1f 100644
--- a/public/react/src/common/components/attachment/AttachmentList.js
+++ b/public/react/src/common/components/attachment/AttachmentList.js
@@ -1,4 +1,5 @@
 import React,{ Component } from "react";
+import { ConditionToolTip } from 'educoder'
 
 class AttachmentsList extends Component{
   constructor(props){
@@ -12,14 +13,18 @@ class AttachmentsList extends Component{
           attachments.map((item,key)=>{
             return(
               <p key={key}>
-                <a className="color-grey">
+                <a className="color-grey fl">
                   <i className="font-14 color-green iconfont icon-fujian mr8"></i>
                 </a>
                 {
                   item.is_pdf && item.is_pdf == true ?
-                  <a href={item.url} className="mr12" length="58" target="_blank">{item.title}</a>
+                  <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
+                    <a href={item.url} className="mr12 fl task-hide" length="58" target="_blank"  style={{"maxWidth":"432px"}}>{item.title}</a>
+                  </ConditionToolTip>
                   :
-                  <a href={item.url} className="mr12" length="58">{item.title}</a>
+                  <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
+                    <a href={item.url} className="mr12 fl task-hide" length="58"  style={{"maxWidth":"432px"}}>{item.title}</a>
+                  </ConditionToolTip>
                 }
                 <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
               </p>
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 925bcc817..b06ab3dc1 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -129,12 +129,16 @@ class Fileslistitem extends Component{
 			.catch(function (error) {
 				console.log(error);
 			});
-	}
+  }
+  
+  eventStop = (event) =>{
+    event.stopPropagation()
+  }
 
 	render(){
 
         const { checkBox,
-            discussMessage,
+            discussMessage,index
         } = this.props;
 
         return(
@@ -190,9 +194,9 @@ class Fileslistitem extends Component{
                 white-space:nowrap
             }
           `}</style>
-                <div className="clearfix ds pr contentSection">
-                    <h6>
-		        	<span className="fl mr12 mt3">
+                <div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }>
+                    <h6 onClick={(event)=>this.eventStop(event)}>
+		        	<span className={`sourceitem${index} fl mr12 mt3`}>
 								{checkBox}
 							</span>
 											{
@@ -283,16 +287,15 @@ class Fileslistitem extends Component{
                         </span>
                       </span>
 											{this.props.isAdmin?
-												<span className={"fr mrf2 mr10"}>
-
+												<span className={"fr mrf2 mr10"} onClick={(event)=>this.eventStop(event)}>
                       <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
-                        <a className="btn colorblue"
-													 onClick={()=>this.settingList()}>设置</a>
-                      </WordsBtn>
+                          <a className="btn colorblue"
+                            onClick={()=>this.settingList()}>设置</a>
+                        </WordsBtn>
                       </span>:""}
 
 											{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
-												<span className={"fr mrf2 mr10"}>
+												<span className={"fr mrf2 mr10"} onClick={(event)=>this.eventStop(event)}>
 
                       <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
                         <a className="btn colorblue"
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index d59519456..63d230cfa 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -918,7 +918,8 @@ class Fileslists extends Component{
                                 checkBox={this.props.isAdmin()?<Checkbox value={item.id} key={item.id}></Checkbox>:""}
                                 Settingtypes={(id)=>this.Settingtypes(id)}
                                 coursesId={this.props.match.params.coursesId}
-																updatafiledfun={()=>this.updatafiled()}
+                                updatafiledfun={()=>this.updatafiled()}
+                                index={index}
                             ></Fileslistitem>
                           </div>
                         </div>
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index b02f6a73f..0b27ea8b8 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -337,6 +337,17 @@ class BoardsNew extends Component{
                       <span style={{ "padding-left": 0, "padding-right": 0 }}></span>
                     </React.Fragment>
                   }
+                <style>
+                  {
+                    `
+                .yslboardsnewinputaddonAfter .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+                  }
+                </style>
                 <Form.Item
                   label="标题"
                   className="topicTitle "
@@ -349,8 +360,8 @@ class BoardsNew extends Component{
                       max: MAX_TITLE_LENGTH, message: `最大限制为${MAX_TITLE_LENGTH}个字符`,
                     }],
                   })(
-                    <Input placeholder={`请输入帖子标题，最大限制${MAX_TITLE_LENGTH}个字符 `}className="searchViewAfter" maxLength={MAX_TITLE_LENGTH}
-                      onInput={this.changeTitle} suffix={`${title_num}/${MAX_TITLE_LENGTH}`} />
+                    <Input placeholder={`请输入帖子标题，最大限制${MAX_TITLE_LENGTH}个字符 `}className="searchViewAfter yslboardsnewinputaddonAfter" maxLength={MAX_TITLE_LENGTH}
+                      onInput={this.changeTitle} addonAfter={`${title_num}/${MAX_TITLE_LENGTH}`} />
                   )}
                 </Form.Item>
 
@@ -365,10 +376,15 @@ class BoardsNew extends Component{
                       dropdownRender={menu => (
                         <div>
                           {menu}
-                          <Divider style={{ margin: '4px 0' }} />
-                          <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>
-                            <Icon type="plus" /> 添加目录
-                          </div>
+                          {
+                            isAdmin && 
+                            <React.Fragment>
+                              <Divider style={{ margin: '4px 0' }} />
+                              <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>
+                                <Icon type="plus" /> 添加目录
+                              </div>
+                            </React.Fragment>
+                          }
                         </div>
                       )}
                     >
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 432c597ee..542157bfb 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -24,7 +24,7 @@ import '../../forums/RightSection.css'
 import './TopicDetail.css'
 import '../common/courseMessage.css'
 import { Pagination, Tooltip } from 'antd'
-import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml } from 'educoder'
+import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml , setImagesUrl } from 'educoder'
 import SendToCourseModal from '../coursesPublic/modal/SendToCourseModal'
 import CBreadcrumb from '../common/CBreadcrumb'
 import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
@@ -57,6 +57,7 @@ class TopicDetail extends Component {
         pageCount: 1,
         comments: [],
         goldRewardDialogOpen: false,
+        author:undefined
       }
     }
     componentDidMount() {
@@ -85,7 +86,8 @@ class TopicDetail extends Component {
                 memo: Object.assign({}, {
                   ...response.data.data,
                   replies_count: response.data.data.total_replies_count
-                }, {...this.state.memo})
+                }, {...this.state.memo}),
+                author:response.data.data.author
               }, () => {
               })
 
@@ -514,7 +516,7 @@ class TopicDetail extends Component {
   	render() {
   		const { match, history } = this.props
       const { recommend_shixun, current_user,author_info } = this.props;
-      const { memo, comments, hasMoreComments, goldRewardDialogOpen, pageCount, total_count } = this.state;
+      const { memo, comments, hasMoreComments, goldRewardDialogOpen, pageCount, total_count , author } = this.state;
       const messageId = match.params.topicId
       if (this.state.memoLoading || !current_user) {
         return <div className="edu-back-white" id="forum_index_list"></div>
@@ -599,51 +601,54 @@ class TopicDetail extends Component {
                             }
                             
                         </div>
-                        <div className="color-grey-9 clearfix">
-                            <span className="fl" style={{marginTop: "2px"}}>{moment(memo.created_on).fromNow()} 发布</span>
-                            <div className="fr">
-                                
-                            </div>
-                        </div>
-
-                        <div className="color-grey-9 clearfix">
-                            <span className="fl" style={{marginTop: '4px'}}>
-                              {/* { current_user.admin && <Tooltip title={ "帖子奖励" }>
-                                <span className="noteDetailNum rightline cdefault" style={{padding: '0 4px', cursor: 'pointer'}}>
-                                  <i className="iconfont icon-jiangli mr5" onClick={this.showRewardDialog}></i>
-                                </span>
-                                </Tooltip> } */}
-                                <Tooltip title={"浏览数"}>
-                                  <span className={`noteDetailNum `} style={{paddingLeft: '0px'}}>
-                                    <i className="iconfont icon-liulanyan mr5"></i>
-                                    <span style={{ top: "1px", position: "relative" }}>{memo.visits || '1'}</span>
-                                  </span>
-                                </Tooltip>
-                                { !!memo.total_replies_count && 
-                                <Tooltip title={"回复数"}>
-                                <a href="javascript:void(0)" className="noteDetailNum">
-                                  <i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>
-                                  <span style={{ top: "2px", position: "relative" }}>{ memo.total_replies_count }</span>
-                                </a>
-                                </Tooltip>
-                                 }
-                                 {!!memo.praises_count && 
-                                <Tooltip title={"点赞数"}>                                 
-                                  <span className={`noteDetailNum `} style={{}}>
-                                    <i className="iconfont icon-dianzan-xian mr5"></i>
-                                    <span style={{ top: "2px", position: "relative" }}>{ memo.praises_count }</span>
+                        <div className="df mt20">    
+                        <img src={setImagesUrl(`/images/${author && author.image_url}`)} className="radius mr10 mt2" width="40px" height="40px"/>
+                        <div className="flex1">
+                          <div className="color-grey-9 lineh-20">
+                            <span class="color-grey-3 mr20 fl" style={{"fontWeight":"400"}}>{author && author.name}</span>
+                            <span className="fl">{moment(memo.created_on).fromNow()} 发布</span>
+                          </div>
+
+                          <div className="color-grey-9 clearfix">
+                              <span className="fl" style={{marginTop: '4px'}}>
+                                {/* { current_user.admin && <Tooltip title={ "帖子奖励" }>
+                                  <span className="noteDetailNum rightline cdefault" style={{padding: '0 4px', cursor: 'pointer'}}>
+                                    <i className="iconfont icon-jiangli mr5" onClick={this.showRewardDialog}></i>
                                   </span>
-                                </Tooltip>
+                                  </Tooltip> } */}
+                                  <Tooltip title={"浏览数"}>
+                                    <span className={`noteDetailNum `} style={{paddingLeft: '0px'}}>
+                                      <i className="iconfont icon-liulanyan mr5"></i>
+                                      <span style={{ top: "1px", position: "relative" }}>{memo.visits || '1'}</span>
+                                    </span>
+                                  </Tooltip>
+                                  { !!memo.total_replies_count && 
+                                  <Tooltip title={"回复数"}>
+                                  <a href="javascript:void(0)" className="noteDetailNum">
+                                    <i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>
+                                    <span style={{ top: "2px", position: "relative" }}>{ memo.total_replies_count }</span>
+                                  </a>
+                                  </Tooltip>
                                   }
-                            </span>
-                            <div className="fr">
-                            {/* || current_user.user_id === author_info.user_id */}
-                              <a className={`task-hide fr return_btn color-grey-6 ${ current_user && (isAdmin 
-                                  ) ? '': 'no_mr'} `} onClick={() => this.props.toListPage(Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id})) } >
-                                返回
-                              </a>
-                            </div>
+                                  {!!memo.total_praises_count && 
+                                  <Tooltip title={"点赞数"}>                                 
+                                    <span className={`noteDetailNum `} style={{}}>
+                                      <i className="iconfont icon-dianzan-xian mr5"></i>
+                                      <span style={{ top: "2px", position: "relative" }}>{ memo.total_praises_count }</span>
+                                    </span>
+                                  </Tooltip>
+                                    }
+                              </span>
+                              <div className="fr">
+                              {/* || current_user.user_id === author_info.user_id */}
+                                <a className={`task-hide fr return_btn color-grey-6 ${ current_user && (isAdmin 
+                                    ) ? '': 'no_mr'} `} onClick={() => this.props.toListPage(Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id})) } >
+                                  返回
+                                </a>
+                              </div>
+                          </div>
                         </div>
+                      </div>
                     </div>
 
                     
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index 3a7e25fcd..ae40fedda 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -15,7 +15,7 @@ import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import CommonWorkAppraiseReply from './reply/CommonWorkAppraiseReply'
 import Example from './TestHooks'
 import CommonWorkAppraiseReviseAttachments from './CommonWorkAppraiseReviseAttachments'
-
+import LeaderIcon from './common/LeaderIcon'
 const { Option} = Select;
 const CheckboxGroup = Checkbox.Group;
 const confirm = Modal.confirm;
@@ -88,6 +88,14 @@ class CommonWorkAppraise extends Component{
        console.log(error)
      })
   }
+  componentDidUpdate(prevProps, prevState) {
+    if (this.props.match.params.studentWorkId != prevProps.match.params.studentWorkId) {
+      this.getWork();
+      this.getReviseAttachments()
+      this.commonWorkAppraiseReply && this.commonWorkAppraiseReply.fetchAllComments()
+    }
+  }
+  
   componentDidMount() {
     this.getWork();
     this.getReviseAttachments()
@@ -156,12 +164,13 @@ class CommonWorkAppraise extends Component{
       attachments, homework_id, project_info, work_members, is_evaluation,
       description, update_user_name, update_time, commit_time, author_name,
       revise_attachments, revise_reason, atta_update_user, atta_update_time, atta_update_user_login,
-      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype
+      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype, is_leader_work
     } =this.state;
 
     let courseId=this.props.match.params.coursesId;
     let category_id=this.props.match.params.category_id;
     let studentWorkId=this.props.match.params.studentWorkId;
+    const isAdmin = this.props.isAdmin()
     return(
       <WorkDetailPageHeader 
         {...this.props} {...this.state}
@@ -251,12 +260,27 @@ class CommonWorkAppraise extends Component{
 
             {is_evaluation != true && work_members && !!work_members.length && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
               <div className={"color-grey-6 mb10"}>
-                其他组员
+                全部组员
               </div>
-              <div className={"ml20"}>
-                {work_members.map((item, index) => {
-                  return item.user_name + '　'
-                })}
+              <div className={"ml20 color-grey-6"}>
+                <div className="">
+                  当前组员：{author_name} {is_leader_work && <LeaderIcon small={true} ></LeaderIcon>}
+                </div>
+                <div>
+                  其他组员：
+                  {work_members.map((item, index) => {
+                    return <React.Fragment>
+                      {isAdmin ? 
+                      <a className={`color-blue ${index == 0 ? '' : 'ml10'}`} href="javascript:void(0)" 
+                          onClick={() => this.props.toWorkDetailPage(this.props.match.params, null, item.work_id)}
+                      >
+                        {item.user_name}
+                      </a> : <span className={`${index == 0 ? '' : 'ml10'}`} >{item.user_name}</span>}
+                      {item.is_leader && <LeaderIcon small={true} ></LeaderIcon>}
+                    </React.Fragment>
+                  })}
+                </div>
+                
               </div>
             </div>
             }
@@ -266,6 +290,7 @@ class CommonWorkAppraise extends Component{
             {/* task_type={datalist&&datalist.task_type} */}
             <CommonWorkAppraiseReply {...this.props} task_id={studentWorkId} 
                 onReplySuccess={this.onReplySuccess} {...this.state}
+                wrappedComponentRef={(ref) => {this.commonWorkAppraiseReply = ref}}
             ></CommonWorkAppraiseReply>
 
         </div>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 528aa1d9e..28e54fff3 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -15,7 +15,7 @@ import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import PublishRightnow from './PublishRightnow'
 import ModulationModal from "../coursesPublic/ModulationModal";
 import AccessoryModal from "../coursesPublic/AccessoryModal";
-
+import LeaderIcon from './common/LeaderIcon'
 const { Option} = Select;
 const CheckboxGroup = Checkbox.Group;
 const confirm = Modal.confirm;
@@ -97,7 +97,12 @@ function buildColumns(that, student_works, studentData) {
 					 }} title={text && text.length > 5 ? text : ''}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
-					{text}
+          {record.is_leader ? 
+          <div style={{ display: 'flex', 'flex-direction': 'column', 'align-items': 'center'}}>
+            <div >{text}</div>
+            <LeaderIcon></LeaderIcon>
+          </div>
+					: <React.Fragment>{text}</React.Fragment>}
       </div>
     ),
   }]
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index ca79e8ac5..525e13922 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -389,6 +389,17 @@ class NewWork extends Component{
           </p>
           <div>
             {/* onSubmit={this.handleSubmit} */}
+            <style>
+              {
+                `
+                .yslnewworkinputaddonAfter .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+              }
+            </style>
             <Form className="courseForm">
               <Form.Item
                 label="标题"
@@ -399,7 +410,7 @@ class NewWork extends Component{
                     required: true, message: '请输入标题'
                   }],
                 })(
-                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} suffix={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
+                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView yslnewworkinputaddonAfter searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} addonAfter={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
                 )}
               </Form.Item>
               <style>{`
diff --git a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
new file mode 100644
index 000000000..526e165c5
--- /dev/null
+++ b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
@@ -0,0 +1,19 @@
+import React,{Component} from "React";
+
+export default function LeaderIcon(props = {}) {
+    let icon = null;
+    if (props.small) {
+        icon = <div className="font-8 blueFull Actionbtn" style={{ 
+            height: '14px',
+            'line-height': '14px',
+            width: '24px',
+            padding: 0,
+            'margin-top': '-2px',
+            'margin-left': '2px',
+            'vertical-align': 'middle', }}>组长</div>
+    } else {
+        icon = <div className="font-8 blueFull Actionbtn" style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
+    
+    }
+    return icon
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index a092c5066..4177be8a4 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -85,8 +85,7 @@ class WorkDetailPageHeader extends Component{
                   background: #fff;
                 }
                 .workDetailPageHeader .summaryname {
-                  line-height: 20px; 
-                  margin-top: 13px;
+                  line-height:30px
                 }
               `}</style>
               <CBreadcrumb items={[
@@ -99,18 +98,18 @@ class WorkDetailPageHeader extends Component{
                 // { name: childModuleName }
               ]}></CBreadcrumb>
 
-              <div style={{ width:'100%',height:'52px'}} >
-                <span className=" fl color-black summaryname" style={{height: 'auto'}}>
+              <div className="clearfix mt20 mb20" >
+                <span className=" fl color-black summaryname">
                    {homework_name}
                   {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
                 </span>
                 <CoursesListType
                   typelist={homework_status}
-                  typesylename={"mt12"}
+                  typesylename={"mt3"}
                 />
                
 
-                {category && <a className="color-grey-6 fr font-16 ml30 mt7 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
+                {category && <a className="color-grey-6 fr font-16 ml30 mr30 lineh-25" onClick={this.goback}>返回</a>}
 
                 {this.props.update_atta &&
                 <React.Fragment>
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index f9c34cfcf..d5ac0be68 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -143,7 +143,9 @@ class commonWork extends Component{
     this.setState({
       order:e.key==="all"?"":e.key,
       page:1,
-      isSpin:true
+      isSpin:true,
+      checkBoxValues:[],
+      checkAll:false
     })
     let {search}=this.state;
     this.getList(1,search,e.key==="all"?"":e.key);
diff --git a/public/react/src/modules/courses/coursesPublic/NoneData.js b/public/react/src/modules/courses/coursesPublic/NoneData.js
index 73406ab5c..35d7a5271 100644
--- a/public/react/src/modules/courses/coursesPublic/NoneData.js
+++ b/public/react/src/modules/courses/coursesPublic/NoneData.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
+import { getImageUrl , getUrl } from 'educoder';
 
 class NoneData extends Component{
   constructor(props) {
@@ -9,7 +9,20 @@ class NoneData extends Component{
     const { style } = this.props;
     return(
       <div className="edu-tab-con-box clearfix edu-txt-center" style={style}>
-        <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+        <style>
+          {`
+            .edu-tab-con-box{
+              padding:100px 0px;
+            }
+            .ant-modal-body .edu-tab-con-box{
+              padding:0px!important;
+            }
+            img.edu-nodata-img{
+              margin: 40px auto 20px;
+            }
+          `}
+        </style>
+        <img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
         <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
       </div>
     )
diff --git a/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js b/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js
index af3fc1a30..c4c306a12 100644
--- a/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js
+++ b/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js
@@ -1,209 +1,209 @@
-import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin} from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-
-const Search = Input.Search
-const pageCount = 15;
-class SendToCourseModal extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      checkBoxValues: [],
-      course_lists: [],
-      course_lists_after_filter: [],
-      searchValue: '',
-      hasMore: true,
-      loading: false,
-      page: 1
-    }
-  }
-  fetchCourseList = (arg_page) => {
-    const page = arg_page || this.state.page;
-    // search=''&
-    let url = `/courses/mine.json?page=${page}&page_size=${pageCount}`
-    const searchValue = this.state.searchValue.trim()
-    if (searchValue) {
-      url += `&search=${searchValue}`
-    }
-    this.setState({ loading: true })
-    axios.get(url, {
-    })
-    .then((response) => {
-      if (!response.data.data || response.data.data.length == 0) {
-        this.setState({
-          course_lists: page == 1 ? [] : this.state.course_lists,
-          page,
-          loading: false,
-          hasMore: false,
-        })
-      } else {
-        this.setState({
-          course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data),
-          course_lists_after_filter: response.data.data,
-          page,
-          loading: false,
-          hasMore: response.data.data.length == pageCount
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-  componentDidMount() {
-    setTimeout(() => {
-      this.fetchCourseList()
-    }, 500)
-    
-  }
-  setVisible = (visible) => {
-    this.refs.modalWrapper.setVisible(visible)
-    if (visible == false) {
-      this.setState({
-        checkBoxValues: []
-      })
-    }
-  }
-
-  onSendOk = () => {
-    if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
-      this.props.showNotification('请先选择要发送至的课堂')
-      return;
-    }
-    if(this.props.url==="/files/bulk_send.json"){
-      axios.post("/files/bulk_send.json", {
-         course_id:this.props.match.params.coursesId,
-        ids: this.props.selectedMessageIds,
-        to_course_ids: this.state.checkBoxValues
-        })
-      .then((response) => {
-        if (response.data.status == 0) {
-          this.setVisible(false)
-          this.props.gobackonSend(response.data.message)
-        }
-      })
-      .catch(function (error) {
-        console.log(error);
-      });
-    }else{
-      const bid = this.props.match.params.boardId
-      const url = `/boards/${bid}/messages/bulk_send.json`
-      axios.post(url, {
-          ids: this.props.selectedMessageIds,
-          to_course_ids: this.state.checkBoxValues
-        })
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.setVisible(false)
-            this.props.showNotification('发送成功')
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    }
-
-  }
-
-  onOk = () => {
-    const { course_lists, checkBoxValues } = this.state
-    this.onSendOk()
-    // this.props.onOk && this.props.onOk(checkBoxValues)
-    
-    // this.refs.modalWrapper.setVisible(false)
-  }
-
-  onCheckBoxChange = (checkBoxValues) => {
-    this.setState({
-      checkBoxValues: checkBoxValues
-    })
-  }
-
-  onSearchChange = (e) => {
-    this.setState({
-      searchValue: e.target.value
-    })
-  }
-  handleInfiniteOnLoad = () => {
-    console.log('loadmore...')
-    this.fetchCourseList(this.state.page + 1)
-  }
-
-  onSearch = () => {
-    // const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 )
-    // this.setState({ course_lists_after_filter })
-    this.fetchCourseList(1)
-  }
-  render(){
-    const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state
-    const { moduleName } = this.props
-    return(
-      <ModalWrapper
-        ref="modalWrapper"
-        title={`发送${moduleName}`}
-        {...this.props }
-        onOk={this.onOk}
-      >
-        <style>
-        {`
-        .demo-loading-container {
-          position: absolute;
-          bottom: 93px;
-          width: 82%;
-          text-align: center;
-        }`}
-        </style>
-        <p className="color-grey-6 mb20 edu-txt-center" style={{ fontWeight: "bold" }} >选择的{moduleName}发送到<span className="color-orange-tip">指定课堂</span></p>
-
-        <Search 
-          className="mb14"
-          value={searchValue}
-          placeholder="请输入课堂名称进行搜索"
-          onChange={this.onSearchChange}
-          onSearch={this.onSearch}
-        ></Search>
-
-        <div>
-          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-          <div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
-            <InfiniteScroll
-              threshold={10}
-              initialLoad={false}
-              pageStart={0}
-              loadMore={this.handleInfiniteOnLoad}
-              hasMore={!loading && hasMore}
-              useWindow={false}
-            >
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-
-                { course_lists && course_lists.map( course => {
-                  return (
-                    <p className="clearfix mb7" key={course.id}>
-                      <Checkbox className="fl" value={course.id} key={course.id}></Checkbox>
-                      <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
-                    </p>
-                  )
-                }) }
-              </Checkbox.Group>
-              {loading && hasMore && (
-                <div className="demo-loading-container">
-                  <Spin />
-                </div>
-              )}
-              {/* TODO */}
-              {/* {
-                !hasMore && <div>没有更多了。。</div>
-              } */}
-            </InfiniteScroll>
-          </div>
-        </div>
-      </ModalWrapper>
-    )
-  }
-}
-export default SendToCourseModal;
-
-
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin} from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+import InfiniteScroll from 'react-infinite-scroller';
+
+const Search = Input.Search
+const pageCount = 15;
+class SendToCourseModal extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      checkBoxValues: [],
+      course_lists: [],
+      course_lists_after_filter: [],
+      searchValue: '',
+      hasMore: true,
+      loading: false,
+      page: 1
+    }
+  }
+  fetchCourseList = (arg_page) => {
+    const page = arg_page || this.state.page;
+    // search=''&
+    let url = `/courses/mine.json?page=${page}&page_size=${pageCount}`
+    const searchValue = this.state.searchValue.trim()
+    if (searchValue) {
+      url += `&search=${searchValue}`
+    }
+    this.setState({ loading: true })
+    axios.get(url, {
+    })
+    .then((response) => {
+      if (!response.data.data || response.data.data.length == 0) {
+        this.setState({
+          course_lists: page == 1 ? [] : this.state.course_lists,
+          page,
+          loading: false,
+          hasMore: false,
+        })
+      } else {
+        this.setState({
+          course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data),
+          course_lists_after_filter: response.data.data,
+          page,
+          loading: false,
+          hasMore: response.data.data.length == pageCount
+        })
+      }
+
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+  componentDidMount() {
+    setTimeout(() => {
+      this.fetchCourseList()
+    }, 500)
+    
+  }
+  setVisible = (visible) => {
+    this.refs.modalWrapper.setVisible(visible)
+    if (visible == false) {
+      this.setState({
+        checkBoxValues: []
+      })
+    }
+  }
+
+  onSendOk = () => {
+    if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
+      this.props.showNotification('请先选择要发送至的课堂')
+      return;
+    }
+    if(this.props.url==="/files/bulk_send.json"){
+      axios.post("/files/bulk_send.json", {
+         course_id:this.props.match.params.coursesId,
+        ids: this.props.selectedMessageIds,
+        to_course_ids: this.state.checkBoxValues
+        })
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.setVisible(false)
+          this.props.gobackonSend(response.data.message)
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+    }else{
+      const bid = this.props.match.params.boardId
+      const url = `/boards/${bid}/messages/bulk_send.json`
+      axios.post(url, {
+          ids: this.props.selectedMessageIds,
+          to_course_ids: this.state.checkBoxValues
+        })
+        .then((response) => {
+          if (response.data.status == 0) {
+            this.setVisible(false)
+            this.props.showNotification('发送成功')
+          }
+        })
+        .catch(function (error) {
+          console.log(error);
+        });
+    }
+
+  }
+
+  onOk = () => {
+    const { course_lists, checkBoxValues } = this.state
+    this.onSendOk()
+    // this.props.onOk && this.props.onOk(checkBoxValues)
+    
+    // this.refs.modalWrapper.setVisible(false)
+  }
+
+  onCheckBoxChange = (checkBoxValues) => {
+    this.setState({
+      checkBoxValues: checkBoxValues
+    })
+  }
+
+  onSearchChange = (e) => {
+    this.setState({
+      searchValue: e.target.value
+    })
+  }
+  handleInfiniteOnLoad = () => {
+    console.log('loadmore...')
+    this.fetchCourseList(this.state.page + 1)
+  }
+
+  onSearch = () => {
+    // const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 )
+    // this.setState({ course_lists_after_filter })
+    this.fetchCourseList(1)
+  }
+  render(){
+    const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state
+    const { moduleName } = this.props
+    return(
+      <ModalWrapper
+        ref="modalWrapper"
+        title={`发送${moduleName}`}
+        {...this.props }
+        onOk={this.onOk}
+      >
+        <style>
+        {`
+        .demo-loading-container {
+          position: absolute;
+          bottom: 93px;
+          width: 82%;
+          text-align: center;
+        }`}
+        </style>
+        <p className="color-grey-6 mb20 edu-txt-center" style={{ fontWeight: "bold" }} >选择的{moduleName}发送到<span className="color-orange-tip">指定课堂</span></p>
+
+        <Search 
+          className="mb14"
+          value={searchValue}
+          placeholder="请输入课堂名称进行搜索"
+          onChange={this.onSearchChange}
+          onSearch={this.onSearch}
+        ></Search>
+
+        <div>
+          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+          <div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
+            <InfiniteScroll
+              threshold={10}
+              initialLoad={false}
+              pageStart={0}
+              loadMore={this.handleInfiniteOnLoad}
+              hasMore={!loading && hasMore}
+              useWindow={false}
+            >
+              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+
+                { course_lists && course_lists.map( course => {
+                  return (
+                    <p className="clearfix mb7" key={course.id}>
+                      <Checkbox className="fl" value={course.id} key={course.id}></Checkbox>
+                      <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
+                    </p>
+                  )
+                }) }
+              </Checkbox.Group>
+              {loading && hasMore && (
+                <div className="demo-loading-container">
+                  <Spin />
+                </div>
+              )}
+              {/* TODO */}
+              {/* {
+                !hasMore && <div>没有更多了。。</div>
+              } */}
+            </InfiniteScroll>
+          </div>
+        </div>
+      </ModalWrapper>
+    )
+  }
+}
+export default SendToCourseModal;
+
+
diff --git a/public/react/src/modules/courses/css/members.css b/public/react/src/modules/courses/css/members.css
index ff6f0d99d..df3f884d9 100644
--- a/public/react/src/modules/courses/css/members.css
+++ b/public/react/src/modules/courses/css/members.css
@@ -1,80 +1,80 @@
-.studentList_operation_ul{
-  color: #999;
-  font-size: 12px;
-  float: right;
-  margin-top: 2px;
-}
-.studentList_operation_ul li{
-  float: left;
-  padding:0px 20px;
-  position: relative;
-  cursor: pointer;
-  flex: 0 0 26px;
-  line-height: 26px;
-}
-.studentList_operation_ul li.li_line:after{
-  position: absolute;
-  content: '';
-  width: 1px;
-  height: 12px;
-  background-color: #EDEDED;
-  right: 0px;
-  top:6px;
-}
-.studentList_operation_ul li:last-child{
-  padding-right: 0px;
-}
-.studentList_operation_ul li:last-child:after{
-  width: 0px;
-}
-
-/* 基础的下拉列表、列如排序等 */
-.drop_down_normal li{
-  padding: 0px 20px;
-  height: 34px;
-  line-height: 34px;
-  min-width: 96px;
-  color: #333;
-  font-size: 14px;
-  cursor: pointer;
-  width: 100%;
-}
-
-.stu_table table{
-  line-height: 1.2;
-}
-.stu_table .classesName{
-  display: block;
-  max-width: 428px;
-}
-.stu_table .ant-table-thead > tr > th{
-  padding:21px 16px;
-  border-bottom: none;
-}
-.stu_table .ant-table-tbody tr:last-child td{
-  border-bottom: none;
-}
-.stu_table table .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td{
-  background-color: #fff;
-}
-
-.stu_head{
-  padding-bottom: 15px;
-}
-.ant-modal-body{
-  padding:30px 40px;
-}
-.color-dark-21{
-  color: #212121;
-}
-.tabletd {
-  background-color:#E6F7FF;
-}
-
-.yslminheigth{
-  min-height: 20px;
-}
-
-.yslminheigths{
-  min-height: 21px;
+.studentList_operation_ul{
+  color: #999;
+  font-size: 12px;
+  float: right;
+  margin-top: 2px;
+}
+.studentList_operation_ul li{
+  float: left;
+  padding:0px 20px;
+  position: relative;
+  cursor: pointer;
+  flex: 0 0 26px;
+  line-height: 26px;
+}
+.studentList_operation_ul li.li_line:after{
+  position: absolute;
+  content: '';
+  width: 1px;
+  height: 12px;
+  background-color: #EDEDED;
+  right: 0px;
+  top:6px;
+}
+.studentList_operation_ul li:last-child{
+  padding-right: 0px;
+}
+.studentList_operation_ul li:last-child:after{
+  width: 0px;
+}
+
+/* 基础的下拉列表、列如排序等 */
+.drop_down_normal li{
+  padding: 0px 20px;
+  height: 34px;
+  line-height: 34px;
+  min-width: 96px;
+  color: #333;
+  font-size: 14px;
+  cursor: pointer;
+  width: 100%;
+}
+
+.stu_table table{
+  line-height: 1.2;
+}
+.stu_table .classesName{
+  display: block;
+  max-width: 428px;
+}
+.stu_table .ant-table-thead > tr > th{
+  padding:21px 16px;
+  border-bottom: none;
+}
+.stu_table .ant-table-tbody tr:last-child td{
+  border-bottom: none;
+}
+.stu_table table .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td{
+  background-color: #fff;
+}
+
+.stu_head{
+  padding-bottom: 15px;
+}
+.ant-modal-body{
+  padding:30px 40px;
+}
+.color-dark-21{
+  color: #212121;
+}
+.tabletd {
+  background-color:#E6F7FF;
+}
+
+.yslminheigth{
+  min-height: 20px;
+}
+
+.yslminheigths{
+  min-height: 21px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index c905c641f..83227fb5a 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -572,7 +572,7 @@ class Exercise extends Component{
                                                     {...this.props}
                                                     {...this.state}
                                                     item={item}
-                                                    key={key}
+                                                    index={key}
 																										onItemClick={this.onItemClick}
                                                     checkBox={<Checkbox value={item.id} key={item.id}
                                                     ></Checkbox>}
diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js
index b5af9ebbd..77bb01d04 100644
--- a/public/react/src/modules/courses/exercise/ExerciseListItem.js
+++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js
@@ -52,17 +52,17 @@ class ExerciseListItem extends Component{
 			})
 	  }
     render(){
-        let{item,checkBox}=this.props;
+        let{item,checkBox,index}=this.props;
         let {coursesId,Id}=this.props.match.params
         const IsAdmin =this.props.isAdmin();
         const IsStudent =this.props.isStudent();
 
         // console.log(this.props.current_user.user_id)
         return(
-            <div className="workList_Item" style={{padding:"30px"}}  onClick={() => this.props.onItemClick(this.props.item)}>
+            <div className="workList_Item" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => this.props.onItemClick(this.props.item)}>
                 {
-                    IsAdmin &&
-                    <span className="fl mr12">
+                  IsAdmin &&
+                  <span className={`exerciseitem${index} fl mr12`}>
 										{checkBox}
 									</span>
                 }
@@ -96,20 +96,20 @@ class ExerciseListItem extends Component{
 
                         {/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
                         {
-                            this.props.isAdmin()? <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580"
+                            this.props.isAdmin()? <Link  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580"
 																											title={item.exercise_name}
-                                                      href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+                                                      to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
                         }
 
 												{
 													this.props.isStudent()?
-														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+														<Link  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
 												}
 
                         {
                         this.props.isNotMember()? item.lock_status === 0 ?
                                 <span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
-                                :														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+                                :														<Link className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
                         }
 
                         {
@@ -165,8 +165,8 @@ class ExerciseListItem extends Component{
 
 
 										{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"51px","display":"block","width":"100px"}}>
-											<a className="btn colorblue font-16" href={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</a>
-											<a  className="btn colorblue ml20 font-16" href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</a>
+											<Link className="btn colorblue font-16" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
+											<Link  className="btn colorblue ml20 font-16" to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link>
 										</div> }
 
 									</p>
@@ -193,7 +193,7 @@ class ExerciseListItem extends Component{
                         <div className="homepagePostSetting" style={{"right":"0px","top":"62px","position":"absolute","display":"block"}}>
                         {item.current_status ===0&&item.exercise_status>1? <li> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
                           item.current_status ===1&&item.exercise_status>1? <li> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</Link></li>:
-                            item.current_status ===2&&item.exercise_status>1? <li> <a  className="btn colorblue ml20  font-16" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
+                            item.current_status ===2&&item.exercise_status>1? <li> <a className="btn colorblue ml20  font-16" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
                         </div>
                     }
                 </div>
diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index cbde30a5e..017fff71e 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -481,8 +481,19 @@ class ExerciceNew extends Component{
                       max: 20, message: '最大限制为20个字符',
                     }],
                   })( */}
-                    <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="mt5" value={exercise_name} 
-                        onChange={this.exercise_name_change} suffix={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
+                  <style>
+                    {
+                      `
+                .exercicenewinputysl .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+                    }
+                  </style>
+                    <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="mt5 exercicenewinputysl" value={exercise_name}
+                         onChange={this.exercise_name_change} addonAfter={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
                     />
                   {/* )} */}
                 </Form.Item>
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index cdbc7218b..f38ad7435 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -541,6 +541,18 @@ class ExerciseReviewAndAnswer extends Component{
           .inputNumber30 .ant-input-number-input-wrap .ant-input-number-input{
             height: 28px;
           }
+          .setRadioStyle{
+            width:100%;
+            cursor:pointer;
+          }
+          .setRadioStyle span:last-child{
+            flex:1;
+            display:flex;
+          }
+          .setRadioStyle .ant-radio,.setRadioStyle .ant-checkbox{
+            height:16px;
+            margin-top:2px;
+          }
         `}</style>
         {/*<p style={{height:"60px"}}></p>*/}
         <Modals
diff --git a/public/react/src/modules/courses/exercise/question/multiple.js b/public/react/src/modules/courses/exercise/question/multiple.js
index 76195f8fc..4e74b68ce 100644
--- a/public/react/src/modules/courses/exercise/question/multiple.js
+++ b/public/react/src/modules/courses/exercise/question/multiple.js
@@ -44,19 +44,19 @@ class Multiple extends Component{
     console.log(questionType);
     return(
       <div className="pl30 pr30 singleDisplay">
-        <Checkbox.Group disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} value={questionType.user_answer}>
+        <Checkbox.Group className="with100" disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} value={questionType.user_answer}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
               let prefix = `${tagArray[key]}.`
 
               return(
                 <p className="clearfix mb15 df">
-                  <Checkbox className="fl lineh-15 df mr8 mt2" value={item.choice_id} key={item.choice_id}>{prefix}</Checkbox>
-                  {/* <span class="fl lineh-20 mt1"></span> */}
-                  {/* <span style={{display:"inline-block"}} className="markdown-body " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
-                  <MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)}
-                    className="" style={{display:"inline-block"}}                              
-                  ></MarkdownToHtml>
+                  <Checkbox className="lineh-15 df mr8 setRadioStyle" value={item.choice_id}>
+                    <span className="fl mr3 lineh-20">{prefix}</span>
+                    <MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)}
+                      className="flex1" style={{display:"inline-block"}}                              
+                    ></MarkdownToHtml>
+                  </Checkbox>
                 </p>
               )
             })
diff --git a/public/react/src/modules/courses/exercise/question/single.js b/public/react/src/modules/courses/exercise/question/single.js
index a879bad74..5156019d4 100644
--- a/public/react/src/modules/courses/exercise/question/single.js
+++ b/public/react/src/modules/courses/exercise/question/single.js
@@ -40,18 +40,18 @@ class single extends Component{
     let isJudge = questionType.question_type == 2
     return(
       <div className="pl30 pr30 singleDisplay">
-        <Radio.Group disabled={ user_exercise_status == 1 ? true : false } value={questionType.user_answer[0]} onChange={this.changeItem}>
+        <Radio.Group className="with100" disabled={ user_exercise_status == 1 ? true : false } value={questionType.user_answer[0]} onChange={this.changeItem}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
               let prefix = isJudge ?  undefined : `${tagArray[key]}.`
               return(
-                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15 df" : "fl mr40 df"}>
-                  <Radio className="fl lineh-20" value={item.choice_id}>{prefix}</Radio>
-                  {/* <span className="fl lineh-20 mr3 "></span> */}
-                  {/* <span style={{display:"inline-block", 'margin-top': '-1px'}} className="markdown-body fl " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
-                  <MarkdownToHtml content={item.choice_text} selector={'single_' + (this.props.index + 1) + (key + 1)}
-                    className="fl" style={{display:"inline-block", 'margin-top': '-1px'}}                      
-                  ></MarkdownToHtml>
+                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15" : "fl mr40"}>
+                  <Radio className="df lineh-20 setRadioStyle" value={item.choice_id}>
+                    <span className="fl mr3">{prefix}</span>
+                    <MarkdownToHtml content={item.choice_text} selector={'single_' + (this.props.index + 1) + (key + 1)}
+                      className="flex1" style={{display:"inline-block", 'margin-top': '-1px'}}                      
+                    ></MarkdownToHtml>
+                  </Radio>
                 </p>
               )
             })
diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
index c7f773190..ebfd2d51b 100644
--- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
+++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -218,11 +218,19 @@ class Bullsubdirectory extends Component{
 																			<span className="yslduincolorred">*</span>
 																		</div>
 																		<div className="yslduinleft">
+																			<style>{
+																				`
+																					.ant-input{
+																				border-right: none !important;
+																				height: 40px !important;
+																				}
+																		`
+																			}</style>
 																			<Input placeholder="请在此输入标题，最多60个字符" maxLength="60"
 																						 style={{ textAlign: "left",width:"100%",}}
 																						 onInput={this.changeTopicName}
 																						 autoComplete="off"
-																						 suffix={String(addonAfter)+"/60"}
+																						 addonAfter={String(addonAfter)+"/60"}
 																						 value={eduintits}
 																						 className="searchViewAfter"></Input>
 																		</div>
diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js
index f847c87d3..10beb4507 100644
--- a/public/react/src/modules/courses/gradinforms/Eduinforms.js
+++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js
@@ -287,11 +287,19 @@ class Eduinforms extends Component{
 																	<span className="yslduincolorred">*</span>
 																</div>
 																<div className="yslduinleft">
+																	<style>{
+																		`
+																		  .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+																		`
+																	}</style>
 																	<Input placeholder="请在此输入标题，最多60个字符" maxLength={60}
 																				 style={{ textAlign: "left",width:"100%",}}
 																				 onInput={this.changeTopicName}
 																				 autoComplete="off"
-																				 suffix={String(addonAfter)+"/60"}
+																				 addonAfter={String(addonAfter)+"/60"}
 																				 value={eduintits}
 																				 className="searchViewAfter"></Input>
 																</div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index d30944ef0..92a4832db 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -151,16 +151,12 @@ class GraduateTaskItem extends Component{
       coursesId,
       categoryid,
       taskid,
-
+      index,
+      isAdmin
     } = this.props;
 
-      // console.log(discussMessage)
-
-
-
-
     return(
-        <div className="graduateTopicList boardsList">
+        <div className="graduateTopicList boardsList" style={{cursor : isAdmin ? "pointer" : "default" }} onClick={() => window.$(`.taskitem${index} input`).click() }>
           <Modals
             modalsType={Modalstype}
             modalsTopval={Modalstopval}
@@ -193,8 +189,9 @@ class GraduateTaskItem extends Component{
               margin-right: 15px;
             }
           `}</style>
-          { checkBox }
-
+          <span className={`taskitem${index} fl`} style={{"height":"59px"}}>
+            { checkBox }
+          </span>
           {/*
           style={{borderTop:data===undefined?"":data.course_identity<4?'1px solid #EBEBEB':'1px solid transparent'}}
             */}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 42a128719..869295c59 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -375,11 +375,21 @@ class GraduationTasksedit extends Component{
                     <input type="hidden"  id='tasktypes' />
                     <span className={"newcoursestitle"}>（选择确认后，无法修改）</span>
                   </Form.Item>
-
+                  <style>
+                    {
+                      `
+                .yslgraduainputedit .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+                    }
+                  </style>
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" suffix={String(title_num)+"/60"}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter yslgraduainputedit" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)+"/60"}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 7c499430a..fae87fb65 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -377,15 +377,23 @@ class GraduationTasksnew extends Component {
 											   margin-top: 0px;
    											 margin-bottom: 0px;
 											}
+											.yslgts   .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
 											`
 										}
 									</style>
 									<Form.Item label="任务标题" className={"taskname"} >
 										{getFieldDecorator('name', {
 											rules: [{required: true, message: "不能为空"}],
-										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
-															className="searchView searchViewAfter  h40" style={{"width": "100%"}} maxLength="60"
-															suffix={String(title_num)+"/60"}/>)}
+										})(
+
+											<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
+															className="searchView searchViewAfter  h40 yslgts" style={{"width": "100%"}} maxLength="60"
+														 addonAfter={String(title_num)+"/60"}/>
+
+															)}
 									</Form.Item>
 									<input type="hidden" id='nametypes'  />
 								</div>
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 464e01ea0..5f8aec607 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -364,7 +364,7 @@ class GraduationTasks extends Component{
 	}
 
 
-	PaginationTask=(page)=>{
+  PaginationTask=(page)=>{
 
    let {search,order,selectpage,checkAllValue,checkBoxValues}=this.state;
    let selectpagetype=selectpage===page?true:false
@@ -393,7 +393,9 @@ class GraduationTasks extends Component{
 
     this.setState({
       order: e.key,
-      isSpin:true
+      isSpin:true,
+      checkBoxValues:[],
+      checkAllValue:false
     });
 
     let newkey=e.key;
@@ -676,7 +678,7 @@ class GraduationTasks extends Component{
           // }
 
           secondRowLeft={
-						 <div style={{"display":"inline-block", "marginTop": "22px"}}>
+            <div style={{"display":"inline-block", "marginTop": "22px"}}>
               <span>共{all_count}个毕设任务</span>
               <span style={{"marginLeft":"16px"}}>已发布：{this.state.published_count}个</span>
               <span style={{"marginLeft":"16px"}}>未发布：{this.state.unpublished_count}个</span>
@@ -738,7 +740,7 @@ class GraduationTasks extends Component{
               { tasks&&tasks.map((item, index) => {
                 // console.log(item)
                 return (
-                  <div className="mt20 edu-back-white padding02010" key={index}  onClick={()=>this.onItemClick(item)}>
+                  <div className="mt20 edu-back-white pt10 pl30 pr30" key={index} onClick={()=>this.onItemClick(item)}>
                     <div className="clearfix">
                     <GraduateTaskItem
                       discussMessage={item}
@@ -755,6 +757,7 @@ class GraduationTasks extends Component{
                       coursesId={this.props.match.params.coursesId}
                       categoryid={this.props.match.params.Id}
                       workid={item.work_id}
+                      index={index}
                     ></GraduateTaskItem>
                   </div>
                  </div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
index 0c76cd9de..9ba334421 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
@@ -6,7 +6,7 @@ import '../style.css'
 import axios from "axios";
 import GraduateTopicReply from './GraduateTopicReply'
 
-import { ConditionToolTip,MarkdownToHtml } from 'educoder'
+import { ConditionToolTip , MarkdownToHtml , AttachmentList } from 'educoder'
 
 const $=window.$;
 const type={1: "设计",2: "论文", 3: "创作"}
@@ -60,9 +60,10 @@ class GraduateTopicDetailTable extends Component{
             {
               topicInfo && topicInfo.attachment_list.length>0 &&
               <p className="mt30">
-                {
+                {/* {
                   topicInfo.attachment_list.map((item,key)=>{
                     return(
+                      
                       <li className="clearfix mb8" key={key}>
                         <i className="iconfont icon-fujian color-green font-16 mr8 fl"></i>
                         <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
@@ -72,7 +73,8 @@ class GraduateTopicDetailTable extends Component{
                       </li>
                     )
                   })
-                }
+                } */}
+                <AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList>
               </p>
             }
           </div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index dfa5b5b74..7d504090f 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -47,7 +47,7 @@ class GraduateTopicItem extends Component{
           }
         </style>
 
-        <div className="graduateTopicList boardsList mb20">
+        <div className="graduateTopicList boardsList mb20" style={{cursor : isAdmin ? "pointer" : "default" }} onClick={() => window.$(`.topicItem${index} input`).click() }>
           <style>{`
             
             .graduateTopicList .ant-checkbox-input {s
@@ -58,7 +58,7 @@ class GraduateTopicItem extends Component{
                   padding: 17px 30px 20px!important;
               }
           `}</style>
-          { isAdmin ? checkBox : ""}
+          { isAdmin ? <span className={`topicItem${index} fl`} style={{"height":"64px"}}>{checkBox}</span> : ""}
           <div className="clearfix ds pr flex1">
 						<style>{`
             .maxwidth580{
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index 3845721be..329cd169b 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -358,6 +358,17 @@ class GraduateTopicNew extends Component{
                     </Select>
                   )}
                 </Form.Item>
+                <style>
+                  {
+                    `
+                .exercicenewinputysl .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+                  }
+                </style>
                 <Form.Item
                   label="选题名称"
                   className="mt15"
@@ -369,7 +380,7 @@ class GraduateTopicNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={`${String(addonAfter)}/${NAME_COUNT}`} className="searchViewAfter" />
+                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" addonAfter={`${String(addonAfter)}/${NAME_COUNT}`} className="searchViewAfter exercicenewinputysl" />
                   )}
                 </Form.Item>
               </div>
diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js
index 217bc8332..de95bc741 100644
--- a/public/react/src/modules/courses/members/modal/AddStudentModal.js
+++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js
@@ -1,288 +1,288 @@
-import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin, Select, Divider  } from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
-import NoneData from '../../coursesPublic/NoneData'
-import { ConditionToolTip, ThemeContext } from 'educoder'
-import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
-
-const Option = Select.Option;
-const pageCount = 15;
-class AddStudentModal extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      checkBoxValues: [],
-      users: [],
-      hasMore: true,
-      loading: false,
-      courseGroup: '',
-      page: 1,
-      isSpin:false
-    }
-  }
-  fetchMemberList = (arg_page) => {
-    const courseId = this.props.match.params.coursesId    
-    const page = arg_page || this.state.page;
-    const { name, school_name } = this.state
-    let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}`
-    this.setState({ loading: true })
-    axios.get(url)
-    .then((response) => {
-      if (!response.data.users || response.data.users.length == 0) {
-        this.setState({
-          users: page == 1 ? response.data.users : this.state.users,
-          page,
-          loading: false,
-          hasMore: false,
-        })
-      } else {
-        this.setState({
-          users: page == 1 ? response.data.users : this.state.users.concat(response.data.users),
-          page,
-          loading: false,
-          hasMore: response.data.users.length == pageCount
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-  componentDidMount() {
-    
-    
-  }
-  fetchOptions = () => {
-    // add_teacher_popup
-    const courseId = this.props.match.params.coursesId    
-    
-    let url = `/courses/${courseId}/all_course_groups.json`
-    
-    axios.get(url, {
-    })
-    .then((response) => {
-      if (response.data.course_groups && response.data.course_groups.length) {
-        this.setState({
-          course_groups: response.data.course_groups,
-          courseGroup: response.data.course_groups[0].id
-        })
-      } else {
-        // showNotification('')
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
-  }
-  setVisible = (visible) => {
-    if (visible) {
-      this.setState({school_name: this.props.user.user_school})
-      this.fetchMemberList()
-      this.fetchOptions()
-    }
-    this.refs.modalWrapper.setVisible(visible)
-    if (visible == false) {
-      this.setState({
-        checkBoxValues: []
-      })
-    }
-  }
-
-  onSendOk = () => {
-    
-    if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
-      this.props.showNotification('请从列表中先选择用户。')
-      return;
-    }
-    this.setState({
-      isSpin:true
-    })
-    const courseId = this.props.match.params.coursesId   
-    const url = `/courses/${courseId}/add_students_by_search.json`
-    const params = { 
-      "user_ids": this.state.checkBoxValues
-    }
-    const { courseGroup } = this.state
-    if (courseGroup) {
-      params.course_group_id = courseGroup
-    }
-    axios.post(url, params)
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setVisible(false)
-        this.props.showNotification('添加成功')
-        this.props.addStudentSuccess && this.props.addStudentSuccess(params)
-        this.setState({
-          isSpin:false
-        })
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-
-  onOk = () => {
-    this.onSendOk()
-  }
-
-  onCheckBoxChange = (checkBoxValues) => {
-    this.setState({
-      checkBoxValues: checkBoxValues
-    })
-  }
-
-  handleInfiniteOnLoad = () => {
-    this.fetchMemberList(this.state.page + 1)
-  }
-
-  onSearch = () => {
-    this.fetchMemberList(1)
-  }
-  handleCourseGroupChange = (value) => {
-    this.setState({
-      courseGroup: value
-    })
-  }
-  render(){
-    const { users, checkBoxValues, loading, hasMore, name, school_name
-        , courseGroup, course_groups,isSpin  } = this.state
-    const { moduleName } = this.props
-    let theme = this.context;
-    return(
-      <ModalWrapper
-        ref="modalWrapper"
-        width="700px"
-        title={`添加${moduleName}`}
-        {...this.props }
-        onOk={this.onOk}
-        className="addStudentModal courseForm"
-      >
-        <style>
-        {`
-        .demo-loading-container {
-          position: absolute;
-          bottom: 93px;
-          width: 82%;
-          text-align: center;
-        }
-        .df {
-          display: flex;
-          align-items: baseline;
-          margin: 12px 0;
-        }
-        .firstLabel {
-          flex: 0 0 60px;
-        }
-        .df span.label {
-          margin-right: 8px;
-          text-align: right;
-          margin-left: 12px;
-        }
-        .df .ant-input-affix-wrapper {
-          width: 32%;
-        }
-
-        .addTeacherModal label.task-hide {
-          width: 100%;
-        }
-        `}
-        </style>
-        <div className="df">
-          <span className="mr10">姓名:</span>
-          <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}}
-            style={{ width: '221px'}}
-          ></Input>
-          <span className="label" style={{ minWidth: '36px' }}>单位:</span>
-          {/* <Input allowClear placeholder="请输入单位名称" value={school_name} onChange={(e) => {this.setState({school_name: e.target.value})}}
-            style={{ width: '200px'}}>
-          </Input> */}
-          <SchoolSelect 
-            value={school_name}
-            onChange={(value) => {this.setState({school_name: value})}}
-          ></SchoolSelect>
-          <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
-              style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
-          >搜索</a>
-        </div>
-        {/* <Divider /> */}
-        
-        
-        <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
-          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
-          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
-          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'学号'}</label></span>
-          <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
-          <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{''}</label></span>
-          
-        </p>
-        <Spin size="large" spinning={isSpin}>
-        { loading || users.length ? <div>
-          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
-            <InfiniteScroll
-              threshold={10}
-              initialLoad={false}
-              pageStart={0}
-              loadMore={this.handleInfiniteOnLoad}
-              hasMore={!loading && hasMore}
-              useWindow={false}
-            >
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-
-                { users.map( candidate => {
-                  return (
-                    <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} key={candidate.id} disabled={candidate.added}></Checkbox>
-                      <span className="fl with25">
-                        <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
-                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>
-                          { candidate.name ? 
-                            <a href={`/users/${candidate.login}`} target="_blank" style={{"maxWidth":"208px;"}}> 
-                              { candidate.name }
-                            </a> : <span>　</span> }
-                          </label>
-                        </ConditionToolTip>
-                      </span>
-                      <span className="fl with25">
-                        <ConditionToolTip title={candidate.student_id} condition={candidate.student_id && candidate.student_id.length > 12 }>
-                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.student_id || '　'}</label>
-                        </ConditionToolTip>
-                      </span>
-                      <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
-                      <span className="fl with10"><label className="task-hide fl" 
-                        style={{"maxWidth":"48px", color: theme.foreground_select }}>{candidate.added ? '已加入' : ''}</label></span>
-                      
-                    </p>
-                  )
-                }) }
-              </Checkbox.Group>
-              {loading && hasMore && (
-                <div className="demo-loading-container">
-                  <Spin />
-                </div>
-              )}
-              
-            </InfiniteScroll>
-          </div>
-          {course_groups && course_groups.length && <div className="df" style={{ marginTop: '12px' }}  >
-            <span className="mr10" style={{ width: '148px' }}>所选学生分班至(选填):</span>
-            <Select style={{ width: 236 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
-              { course_groups.map((item) => {
-                return <Option value={item.id}>{item.name}</Option>
-              })}
-            </Select>
-          </div>}
-        </div> : <NoneData></NoneData> }
-        </Spin>
-      </ModalWrapper>
-    )
-  }
-}
-
-AddStudentModal.contextType = ThemeContext;
-export default AddStudentModal;
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Select, Divider  } from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+import InfiniteScroll from 'react-infinite-scroller';
+import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
+import NoneData from '../../coursesPublic/NoneData'
+import { ConditionToolTip, ThemeContext } from 'educoder'
+import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
+
+const Option = Select.Option;
+const pageCount = 15;
+class AddStudentModal extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      checkBoxValues: [],
+      users: [],
+      hasMore: true,
+      loading: false,
+      courseGroup: '',
+      page: 1,
+      isSpin:false
+    }
+  }
+  fetchMemberList = (arg_page) => {
+    const courseId = this.props.match.params.coursesId    
+    const page = arg_page || this.state.page;
+    const { name, school_name } = this.state
+    let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}`
+    this.setState({ loading: true })
+    axios.get(url)
+    .then((response) => {
+      if (!response.data.users || response.data.users.length == 0) {
+        this.setState({
+          users: page == 1 ? response.data.users : this.state.users,
+          page,
+          loading: false,
+          hasMore: false,
+        })
+      } else {
+        this.setState({
+          users: page == 1 ? response.data.users : this.state.users.concat(response.data.users),
+          page,
+          loading: false,
+          hasMore: response.data.users.length == pageCount
+        })
+      }
+
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+  componentDidMount() {
+    
+    
+  }
+  fetchOptions = () => {
+    // add_teacher_popup
+    const courseId = this.props.match.params.coursesId    
+    
+    let url = `/courses/${courseId}/all_course_groups.json`
+    
+    axios.get(url, {
+    })
+    .then((response) => {
+      if (response.data.course_groups && response.data.course_groups.length) {
+        this.setState({
+          course_groups: response.data.course_groups,
+          courseGroup: response.data.course_groups[0].id
+        })
+      } else {
+        // showNotification('')
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    });
+  }
+  setVisible = (visible) => {
+    if (visible) {
+      this.setState({school_name: this.props.user.user_school})
+      this.fetchMemberList()
+      this.fetchOptions()
+    }
+    this.refs.modalWrapper.setVisible(visible)
+    if (visible == false) {
+      this.setState({
+        checkBoxValues: []
+      })
+    }
+  }
+
+  onSendOk = () => {
+    
+    if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
+      this.props.showNotification('请从列表中先选择用户。')
+      return;
+    }
+    this.setState({
+      isSpin:true
+    })
+    const courseId = this.props.match.params.coursesId   
+    const url = `/courses/${courseId}/add_students_by_search.json`
+    const params = { 
+      "user_ids": this.state.checkBoxValues
+    }
+    const { courseGroup } = this.state
+    if (courseGroup) {
+      params.course_group_id = courseGroup
+    }
+    axios.post(url, params)
+    .then((response) => {
+      if (response.data.status == 0) {
+        this.setVisible(false)
+        this.props.showNotification('添加成功')
+        this.props.addStudentSuccess && this.props.addStudentSuccess(params)
+        this.setState({
+          isSpin:false
+        })
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+
+  onOk = () => {
+    this.onSendOk()
+  }
+
+  onCheckBoxChange = (checkBoxValues) => {
+    this.setState({
+      checkBoxValues: checkBoxValues
+    })
+  }
+
+  handleInfiniteOnLoad = () => {
+    this.fetchMemberList(this.state.page + 1)
+  }
+
+  onSearch = () => {
+    this.fetchMemberList(1)
+  }
+  handleCourseGroupChange = (value) => {
+    this.setState({
+      courseGroup: value
+    })
+  }
+  render(){
+    const { users, checkBoxValues, loading, hasMore, name, school_name
+        , courseGroup, course_groups,isSpin  } = this.state
+    const { moduleName } = this.props
+    let theme = this.context;
+    return(
+      <ModalWrapper
+        ref="modalWrapper"
+        width="700px"
+        title={`添加${moduleName}`}
+        {...this.props }
+        onOk={this.onOk}
+        className="addStudentModal courseForm"
+      >
+        <style>
+        {`
+        .demo-loading-container {
+          position: absolute;
+          bottom: 93px;
+          width: 82%;
+          text-align: center;
+        }
+        .df {
+          display: flex;
+          align-items: baseline;
+          margin: 12px 0;
+        }
+        .firstLabel {
+          flex: 0 0 60px;
+        }
+        .df span.label {
+          margin-right: 8px;
+          text-align: right;
+          margin-left: 12px;
+        }
+        .df .ant-input-affix-wrapper {
+          width: 32%;
+        }
+
+        .addTeacherModal label.task-hide {
+          width: 100%;
+        }
+        `}
+        </style>
+        <div className="df">
+          <span className="mr10">姓名:</span>
+          <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}}
+            style={{ width: '221px'}}
+          ></Input>
+          <span className="label" style={{ minWidth: '36px' }}>单位:</span>
+          {/* <Input allowClear placeholder="请输入单位名称" value={school_name} onChange={(e) => {this.setState({school_name: e.target.value})}}
+            style={{ width: '200px'}}>
+          </Input> */}
+          <SchoolSelect 
+            value={school_name}
+            onChange={(value) => {this.setState({school_name: value})}}
+          ></SchoolSelect>
+          <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
+              style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
+          >搜索</a>
+        </div>
+        {/* <Divider /> */}
+        
+        
+        <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
+          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
+          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
+          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'学号'}</label></span>
+          <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
+          <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{''}</label></span>
+          
+        </p>
+        <Spin size="large" spinning={isSpin}>
+        { loading || users.length ? <div>
+          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
+            <InfiniteScroll
+              threshold={10}
+              initialLoad={false}
+              pageStart={0}
+              loadMore={this.handleInfiniteOnLoad}
+              hasMore={!loading && hasMore}
+              useWindow={false}
+            >
+              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+
+                { users.map( candidate => {
+                  return (
+                    <p className="clearfix mb7" key={candidate.id}>
+                      <Checkbox className="fl" value={candidate.id} key={candidate.id} disabled={candidate.added}></Checkbox>
+                      <span className="fl with25">
+                        <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
+                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>
+                          { candidate.name ? 
+                            <a href={`/users/${candidate.login}`} target="_blank" style={{"maxWidth":"208px;"}}> 
+                              { candidate.name }
+                            </a> : <span>　</span> }
+                          </label>
+                        </ConditionToolTip>
+                      </span>
+                      <span className="fl with25">
+                        <ConditionToolTip title={candidate.student_id} condition={candidate.student_id && candidate.student_id.length > 12 }>
+                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.student_id || '　'}</label>
+                        </ConditionToolTip>
+                      </span>
+                      <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      <span className="fl with10"><label className="task-hide fl" 
+                        style={{"maxWidth":"48px", color: theme.foreground_select }}>{candidate.added ? '已加入' : ''}</label></span>
+                      
+                    </p>
+                  )
+                }) }
+              </Checkbox.Group>
+              {loading && hasMore && (
+                <div className="demo-loading-container">
+                  <Spin />
+                </div>
+              )}
+              
+            </InfiniteScroll>
+          </div>
+          {course_groups && course_groups.length && <div className="df" style={{ marginTop: '12px' }}  >
+            <span className="mr10" style={{ width: '148px' }}>所选学生分班至(选填):</span>
+            <Select style={{ width: 236 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
+              { course_groups.map((item) => {
+                return <Option value={item.id}>{item.name}</Option>
+              })}
+            </Select>
+          </div>}
+        </div> : <NoneData></NoneData> }
+        </Spin>
+      </ModalWrapper>
+    )
+  }
+}
+
+AddStudentModal.contextType = ThemeContext;
+export default AddStudentModal;
diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js
index 21902a782..b397f7838 100644
--- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js
+++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js
@@ -1,355 +1,355 @@
-import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin, Select, Divider, Icon  } from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
-import { ConditionToolTip, ActionBtn } from 'educoder'
-import NoneData from '../../coursesPublic/NoneData'
-import AddGraduationGroupModal from './AddGraduationGroupModal'
-import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
-
-const Option = Select.Option;
-const pageCount = 15;
-let timeout, currentValue
-class AddTeacherModal extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      school_names: [],
-      checkBoxValues: [],
-      candidates: [],
-      hasMore: true,
-      loading: false,
-      page: 1
-    }
-  }
-  fetchMemberList = (arg_page) => {
-    const courseId = this.props.match.params.coursesId    
-    const page = arg_page || this.state.page;
-    const { name, school_name } = this.state
-    let url = `/courses/${courseId}/search_teacher_candidate.json`
-    this.setState({ loading: true })
-    axios.post(url, {
-      page: page,
-      limit: pageCount,
-      school_name: school_name || '',
-      name: name || ''
-    })
-    .then((response) => {
-      if (!response.data.candidates || response.data.candidates.length == 0) {
-        this.setState({
-          candidates: page == 1 ? response.data.candidates : this.state.candidates,
-          page,
-          loading: false,
-          hasMore: false,
-        })
-      } else {
-        this.setState({
-          candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
-          page,
-          loading: false,
-          hasMore: response.data.candidates.length == pageCount
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-  componentDidMount() {
-    
-    
-  }
-  onAddGraduationGroupOk = () => {
-    this.fetchOptions()
-  }
-  fetchOptions = () => {
-    // add_teacher_popup
-    const courseId = this.props.match.params.coursesId    
-    
-    let url = `/courses/${courseId}/add_teacher_popup.json`
-    
-    axios.get(url, {
-    })
-    .then((response) => {
-
-      if (response.data.school_name) {
-        this.setState({
-          school_name: response.data.school_name
-        }, () => this.fetchMemberList())
-      } else {
-        this.fetchMemberList()
-
-      }
-      if (response.data.graduation_groups) {
-        this.setState({
-          graduation_groups: response.data.graduation_groups
-        })
-      } 
-      if (response.data.course_groups) {
-        this.setState({
-          course_groups: response.data.course_groups
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
-  }
-  setVisible = (visible) => {
-    if (visible) {
-      this.fetchOptions()
-    }
-    this.refs.modalWrapper.setVisible(visible)
-    if (visible == false) {
-      this.setState({
-        checkBoxValues: []
-      })
-    }
-  }
-
-  onSendOk = () => {
-    const courseId = this.props.match.params.coursesId   
-    const url = `/courses/${courseId}/add_teacher.json`
-    if (this.state.checkBoxValues.length == 0) {
-      this.props.showNotification('请先在下面列表中选择要添加教师的成员')
-      return
-    }
-    const params = { 
-      "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
-      // "graduation_group_id": "2",
-      // "course_group_id": "820",
-      "role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM
-    }
-    const { graduationGroup, courseGroup } = this.state
-    if (graduationGroup) {
-      params.graduation_group_id = graduationGroup
-    }
-    if (courseGroup) {
-      params.course_group_id = courseGroup
-    }
-    axios.post(url, params)
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setVisible(false)
-        this.props.showNotification('添加成功')
-        this.props.addTeacherSuccess && this.props.addTeacherSuccess(params)
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-
-  onOk = () => {
-    this.onSendOk()
-  }
-
-  onCheckBoxChange = (checkBoxValues) => {
-    this.setState({
-      checkBoxValues: checkBoxValues
-    })
-  }
-
-  handleInfiniteOnLoad = () => {
-    this.fetchMemberList(this.state.page + 1)
-  }
-
-  onSearch = () => {
-    this.fetchMemberList(1)
-  }
-  handleGradationGroupChange = (value) => {
-    this.setState({
-      graduationGroup: value
-    })
-  }
-  handleCourseGroupChange = (value) => {
-    this.setState({
-      courseGroup: value
-    })
-  }
-  onOrgNameChange = (value) => {
-    // console.log('school_name: ', value)
-    this.setState({ school_name: value })
-  }
-  
-  hasGraduationModule = () => {
-    const { course_modules } = this.props;
-    const result = course_modules && course_modules.filter( item => {
-      return item.type == 'graduation'
-    })
-    return result && result.length > 0
-  }
-
-  render(){
-    const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
-        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
-    const { moduleName } = this.props
-    
-    return(
-      <ModalWrapper
-        ref="modalWrapper"
-        width="700px"
-        title={`添加${moduleName}`}
-        {...this.props }
-        onOk={this.onOk}
-        className="addTeacherModal courseForm"
-      >
-        <AddGraduationGroupModal ref="addGraduationGroupModal"
-          {...this.props} onOk={this.onAddGraduationGroupOk}
-        ></AddGraduationGroupModal>
-        <style>
-        {`
-        .demo-loading-container {
-          position: absolute;
-          bottom: 210px;
-          width: 82%;
-          text-align: center;
-        }
-        .df {
-          display: flex;
-          align-items: baseline;
-          margin: 12px 0;
-        }
-        .firstLabel {
-          flex: 0 0 60px;
-        }
-        .df span.label {
-          margin-right: 8px;
-          text-align: left;
-        }
-        .df .ant-input-affix-wrapper {
-          width: 32%;
-        }
-
-        .addTeacherModal label.task-hide {
-          width: 100%;
-        }
-        `}
-        </style>
-        <div className="df">
-          <span className="firstLabel label" style={{ flex: '0 0 40px' }}>姓名:</span>
-          <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}} 
-              style={{ width: '200px', marginRight: '18px' }}>
-          </Input>
-          <span className="label" style={{ minWidth: '36px', flex: '0 0 40px' }}>单位:</span>
-          <SchoolSelect
-            value={school_name}
-            onChange={this.onOrgNameChange}
-          ></SchoolSelect>
-          {/* <Select allowClear placeholder="请输入单位名称" value={school_name} 
-              style={{ width: '200px'}} showArrow={false}
-              filterOption={false} onSearch={this.onOrgNameSearch}
-              onChange={this.onOrgNameChange} notFoundContent={null}
-              showSearch defaultActiveFirstOption={false}
-          >
-            { school_names && school_names.map((item, index) => {
-              return <Option value={item} key={index}>{item}</Option>
-            })}
-          </Select> */}
-          <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
-              style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
-          >搜索</a>
-        </div>
-        {/* graduation_groups && !!graduation_groups.length  */}
-        
-        
-        <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
-          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
-          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
-          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'昵称'}</label></span>
-          <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
-          <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px"}}>{''}</label></span>
-          
-        </p>
-        { loading || candidates.length ? <div>
-          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
-            <InfiniteScroll
-              threshold={10}
-              initialLoad={false}
-              pageStart={0}
-              loadMore={this.handleInfiniteOnLoad}
-              hasMore={!loading && hasMore}
-              useWindow={false}
-            >
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-
-                { candidates && candidates.map( candidate => {
-                  return (
-                    <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} key={candidate.id}></Checkbox>
-                      <span className="fl with25">
-                      {/* "color":"#4c4c4c" */}
-                        <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
-                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}
-                          >
-                              <a href={`/users/${candidate.login}`} target="_blank" 
-                                style={{}}
-                              >{candidate.name}</a>
-                          </label>
-                        </ConditionToolTip>
-                      </span>
-                      <span className="fl with25">
-                        <ConditionToolTip title={candidate.nickname} condition={candidate.nickname && candidate.nickname.length > 12 }>
-                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname || '　'}</label>
-                        </ConditionToolTip>
-                      </span>
-                      <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
-                      <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{candidate.added ? '已加入' : ''}</label></span>
-                      
-                    </p>
-                  )
-                }) }
-              </Checkbox.Group>
-              {loading && hasMore && (
-                <div className="demo-loading-container">
-                  <Spin />
-                </div>
-              )}
-              
-            </InfiniteScroll>
-          </div>
-        </div>  : <NoneData></NoneData> }
-        <div className="df">
-        { this.hasGraduationModule() && <div className="df" style={{ marginTop: '24px' }}  >
-          <span className="firstLabel label" style={{ flex: '0 0 96px' }}>添加至答辩组:</span>
-          <Select style={{ width: 218, marginRight: '18px' }} onChange={this.handleGradationGroupChange} value={graduationGroup}
-            dropdownRender={menu => (
-              <div>
-                {menu}
-                <Divider style={{ margin: '4px 0' }} />
-                {/* <ActionBtn
-                  onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
-                >添加答辩组</ActionBtn> */}
-                <div style={{ padding: '8px', cursor: 'pointer' }} 
-                    onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
-                >
-                  <Icon type="plus" /> 添加答辩组
-                </div>
-              </div>
-            )}
-          >
-            { graduation_groups && graduation_groups.map((item) => {
-              return <Option value={item.id}>{item.name}</Option>
-            })}
-          </Select>
-        </div>}
-
-        { course_groups && !!course_groups.length && <div className="df">
-          <span className="firstLabel label">管理权限:</span>
-          <Select style={{ width: 218 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
-            { course_groups && course_groups.map((item) => {
-              return <Option value={item.id}>{item.name}</Option>
-            })}
-          </Select>
-        </div> }
-        </div>
-      </ModalWrapper>
-    )
-  }
-}
-export default AddTeacherModal;
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Select, Divider, Icon  } from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+import InfiniteScroll from 'react-infinite-scroller';
+import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
+import { ConditionToolTip, ActionBtn } from 'educoder'
+import NoneData from '../../coursesPublic/NoneData'
+import AddGraduationGroupModal from './AddGraduationGroupModal'
+import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
+
+const Option = Select.Option;
+const pageCount = 15;
+let timeout, currentValue
+class AddTeacherModal extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      school_names: [],
+      checkBoxValues: [],
+      candidates: [],
+      hasMore: true,
+      loading: false,
+      page: 1
+    }
+  }
+  fetchMemberList = (arg_page) => {
+    const courseId = this.props.match.params.coursesId    
+    const page = arg_page || this.state.page;
+    const { name, school_name } = this.state
+    let url = `/courses/${courseId}/search_teacher_candidate.json`
+    this.setState({ loading: true })
+    axios.post(url, {
+      page: page,
+      limit: pageCount,
+      school_name: school_name || '',
+      name: name || ''
+    })
+    .then((response) => {
+      if (!response.data.candidates || response.data.candidates.length == 0) {
+        this.setState({
+          candidates: page == 1 ? response.data.candidates : this.state.candidates,
+          page,
+          loading: false,
+          hasMore: false,
+        })
+      } else {
+        this.setState({
+          candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
+          page,
+          loading: false,
+          hasMore: response.data.candidates.length == pageCount
+        })
+      }
+
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+  componentDidMount() {
+    
+    
+  }
+  onAddGraduationGroupOk = () => {
+    this.fetchOptions()
+  }
+  fetchOptions = () => {
+    // add_teacher_popup
+    const courseId = this.props.match.params.coursesId    
+    
+    let url = `/courses/${courseId}/add_teacher_popup.json`
+    
+    axios.get(url, {
+    })
+    .then((response) => {
+
+      if (response.data.school_name) {
+        this.setState({
+          school_name: response.data.school_name
+        }, () => this.fetchMemberList())
+      } else {
+        this.fetchMemberList()
+
+      }
+      if (response.data.graduation_groups) {
+        this.setState({
+          graduation_groups: response.data.graduation_groups
+        })
+      } 
+      if (response.data.course_groups) {
+        this.setState({
+          course_groups: response.data.course_groups
+        })
+      }
+
+    })
+    .catch(function (error) {
+      console.log(error);
+    });
+  }
+  setVisible = (visible) => {
+    if (visible) {
+      this.fetchOptions()
+    }
+    this.refs.modalWrapper.setVisible(visible)
+    if (visible == false) {
+      this.setState({
+        checkBoxValues: []
+      })
+    }
+  }
+
+  onSendOk = () => {
+    const courseId = this.props.match.params.coursesId   
+    const url = `/courses/${courseId}/add_teacher.json`
+    if (this.state.checkBoxValues.length == 0) {
+      this.props.showNotification('请先在下面列表中选择要添加教师的成员')
+      return
+    }
+    const params = { 
+      "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
+      // "graduation_group_id": "2",
+      // "course_group_id": "820",
+      "role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM
+    }
+    const { graduationGroup, courseGroup } = this.state
+    if (graduationGroup) {
+      params.graduation_group_id = graduationGroup
+    }
+    if (courseGroup) {
+      params.course_group_id = courseGroup
+    }
+    axios.post(url, params)
+    .then((response) => {
+      if (response.data.status == 0) {
+        this.setVisible(false)
+        this.props.showNotification('添加成功')
+        this.props.addTeacherSuccess && this.props.addTeacherSuccess(params)
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+
+  onOk = () => {
+    this.onSendOk()
+  }
+
+  onCheckBoxChange = (checkBoxValues) => {
+    this.setState({
+      checkBoxValues: checkBoxValues
+    })
+  }
+
+  handleInfiniteOnLoad = () => {
+    this.fetchMemberList(this.state.page + 1)
+  }
+
+  onSearch = () => {
+    this.fetchMemberList(1)
+  }
+  handleGradationGroupChange = (value) => {
+    this.setState({
+      graduationGroup: value
+    })
+  }
+  handleCourseGroupChange = (value) => {
+    this.setState({
+      courseGroup: value
+    })
+  }
+  onOrgNameChange = (value) => {
+    // console.log('school_name: ', value)
+    this.setState({ school_name: value })
+  }
+  
+  hasGraduationModule = () => {
+    const { course_modules } = this.props;
+    const result = course_modules && course_modules.filter( item => {
+      return item.type == 'graduation'
+    })
+    return result && result.length > 0
+  }
+
+  render(){
+    const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
+        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
+    const { moduleName } = this.props
+    
+    return(
+      <ModalWrapper
+        ref="modalWrapper"
+        width="700px"
+        title={`添加${moduleName}`}
+        {...this.props }
+        onOk={this.onOk}
+        className="addTeacherModal courseForm"
+      >
+        <AddGraduationGroupModal ref="addGraduationGroupModal"
+          {...this.props} onOk={this.onAddGraduationGroupOk}
+        ></AddGraduationGroupModal>
+        <style>
+        {`
+        .demo-loading-container {
+          position: absolute;
+          bottom: 210px;
+          width: 82%;
+          text-align: center;
+        }
+        .df {
+          display: flex;
+          align-items: baseline;
+          margin: 12px 0;
+        }
+        .firstLabel {
+          flex: 0 0 60px;
+        }
+        .df span.label {
+          margin-right: 8px;
+          text-align: left;
+        }
+        .df .ant-input-affix-wrapper {
+          width: 32%;
+        }
+
+        .addTeacherModal label.task-hide {
+          width: 100%;
+        }
+        `}
+        </style>
+        <div className="df">
+          <span className="firstLabel label" style={{ flex: '0 0 40px' }}>姓名:</span>
+          <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}} 
+              style={{ width: '200px', marginRight: '18px' }}>
+          </Input>
+          <span className="label" style={{ minWidth: '36px', flex: '0 0 40px' }}>单位:</span>
+          <SchoolSelect
+            value={school_name}
+            onChange={this.onOrgNameChange}
+          ></SchoolSelect>
+          {/* <Select allowClear placeholder="请输入单位名称" value={school_name} 
+              style={{ width: '200px'}} showArrow={false}
+              filterOption={false} onSearch={this.onOrgNameSearch}
+              onChange={this.onOrgNameChange} notFoundContent={null}
+              showSearch defaultActiveFirstOption={false}
+          >
+            { school_names && school_names.map((item, index) => {
+              return <Option value={item} key={index}>{item}</Option>
+            })}
+          </Select> */}
+          <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
+              style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
+          >搜索</a>
+        </div>
+        {/* graduation_groups && !!graduation_groups.length  */}
+        
+        
+        <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
+          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
+          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
+          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'昵称'}</label></span>
+          <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
+          <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px"}}>{''}</label></span>
+          
+        </p>
+        { loading || candidates.length ? <div>
+          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
+            <InfiniteScroll
+              threshold={10}
+              initialLoad={false}
+              pageStart={0}
+              loadMore={this.handleInfiniteOnLoad}
+              hasMore={!loading && hasMore}
+              useWindow={false}
+            >
+              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+
+                { candidates && candidates.map( candidate => {
+                  return (
+                    <p className="clearfix mb7" key={candidate.id}>
+                      <Checkbox className="fl" value={candidate.id} key={candidate.id}></Checkbox>
+                      <span className="fl with25">
+                      {/* "color":"#4c4c4c" */}
+                        <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
+                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}
+                          >
+                              <a href={`/users/${candidate.login}`} target="_blank" 
+                                style={{}}
+                              >{candidate.name}</a>
+                          </label>
+                        </ConditionToolTip>
+                      </span>
+                      <span className="fl with25">
+                        <ConditionToolTip title={candidate.nickname} condition={candidate.nickname && candidate.nickname.length > 12 }>
+                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname || '　'}</label>
+                        </ConditionToolTip>
+                      </span>
+                      <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{candidate.added ? '已加入' : ''}</label></span>
+                      
+                    </p>
+                  )
+                }) }
+              </Checkbox.Group>
+              {loading && hasMore && (
+                <div className="demo-loading-container">
+                  <Spin />
+                </div>
+              )}
+              
+            </InfiniteScroll>
+          </div>
+        </div>  : <NoneData></NoneData> }
+        <div className="df">
+        { this.hasGraduationModule() && <div className="df" style={{ marginTop: '24px' }}  >
+          <span className="firstLabel label" style={{ flex: '0 0 96px' }}>添加至答辩组:</span>
+          <Select style={{ width: 218, marginRight: '18px' }} onChange={this.handleGradationGroupChange} value={graduationGroup}
+            dropdownRender={menu => (
+              <div>
+                {menu}
+                <Divider style={{ margin: '4px 0' }} />
+                {/* <ActionBtn
+                  onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
+                >添加答辩组</ActionBtn> */}
+                <div style={{ padding: '8px', cursor: 'pointer' }} 
+                    onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
+                >
+                  <Icon type="plus" /> 添加答辩组
+                </div>
+              </div>
+            )}
+          >
+            { graduation_groups && graduation_groups.map((item) => {
+              return <Option value={item.id}>{item.name}</Option>
+            })}
+          </Select>
+        </div>}
+
+        { course_groups && !!course_groups.length && <div className="df">
+          <span className="firstLabel label">管理权限:</span>
+          <Select style={{ width: 218 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
+            { course_groups && course_groups.map((item) => {
+              return <Option value={item.id}>{item.name}</Option>
+            })}
+          </Select>
+        </div> }
+        </div>
+      </ModalWrapper>
+    )
+  }
+}
+export default AddTeacherModal;
diff --git a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
index 54c0df912..d5e77da9d 100644
--- a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
+++ b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
@@ -13,12 +13,15 @@ class CreateGroupByImportModal extends Component{
   constructor(props){
     super(props);
     this.state={
-      errorTip:undefined
     }
   }
-  
+  fetchMemberList = (arg_page) => {
+  }
+  componentDidMount() {
+    
+    
+  }
   onSendOk = () => {
-
     const courseId = this.props.match.params.coursesId    
     
     let url = `/courses/${courseId}/create_group_by_importing_file.json`
@@ -109,7 +112,7 @@ class CreateGroupByImportModal extends Component{
 
   render(){
     const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
-        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList , errorTip } = this.state
+        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList } = this.state
     const { moduleName } = this.props
     
     const props = {
@@ -129,18 +132,15 @@ class CreateGroupByImportModal extends Component{
         onOk={this.onOk}
         className="createGroupByImport"
       >
-        <Dragger {...props}>
-            <p className="ant-upload-drag-icon">
-                <Icon type="inbox" />
-            </p>
-            <p className="ant-upload-text">点击或拖拽文件到这里上传</p>
-            <p className="ant-upload-hint">
-                单个文件最大150MB
-            </p>
-        </Dragger>
-      <p className="color-red lineh-25 edu-txt-left" style={{height:"25px"}}>
-        <span className={ errorTip ? "" : "none" }>{errorTip}</span>
-      </p>        
+      <Dragger {...props}>
+        <p className="ant-upload-drag-icon">
+          <Icon type="inbox" />
+        </p>
+        <p className="ant-upload-text">点击或拖拽文件到这里上传</p>
+        <p className="ant-upload-hint">
+          单个文件最大150MB
+        </p>
+      </Dragger>
       </ModalWrapper>
     )
   }
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index b87b4e81d..8c68dd4c5 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -44,7 +44,9 @@ class CoursesNew extends Component {
             fetching:false,
             boolxinjian:false,
             checkboxgroup:undefined,
-            checkbofrup:["shixun_homework","common_homework","group_homework","exercise","attachment","course_group","graduation","poll","board"],
+            checkbofrup:[{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"},{module_type:"group_homework",module_name:"分组作业"}
+                ,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"},{module_type:"graduation",module_name:"毕业设计"}
+                ,{module_type:"board",module_name:"讨论"},{module_type:"attachment",module_name:"资源"},{module_type:"course_group",module_name:"分班"}],
             checkbofrups:[],
         }
     }
@@ -78,32 +80,22 @@ class CoursesNew extends Component {
                         is_public: data.is_public === 1 ? true : false,
                         Realnamecertification: data.authentication,
                         Professionalcertification:data.professional_certification,
-
+                        checkbofrups:data.course_modules,
                     });
                     try {
-                        var datasysl=[];
-                        var dataysl2=[];
-                        var dataysl3=[];
-                        var checkbofrup =this.state.checkbofrup;
-                        dataysl2=data.course_module_types;
-                        datasysl=checkbofrup;
-                         for (var k=0;k<datasysl.length;k++){
-                         for (var i=0;i<data.course_module_types.length;i++){
-                            if(datasysl[k]===data.course_module_type[i]){
-                                datasysl.slice(k,1);
-                            }
-                         }
-                         }
-                        dataysl3 = dataysl2.concat(datasysl);
-                       this.setState({
-                           checkboxgroup: dataysl3,
-                       })
+                        if(data.course_modules===undefined||data.course_modules.length===0){
+                            this.setState({
+                                checkbofrups:this.state.checkbofrup,
+                            });
+                        }
                     }catch (e) {
-                      this.setState({
-                          checkboxgroup:this.state.checkbofrup,
-                      })
+                        this.setState({
+                            checkbofrups:this.state.checkbofrup,
+                        });
                     }
 
+
+
                    this.handleSearchschool(data.school);
             }).catch((error) => {
                 console.log(error);
@@ -450,6 +442,7 @@ class CoursesNew extends Component {
                 search: value
             }
         }).then((result)=>{
+            if(result){
 					if (result.data.status===0) {
 						this.setState({
 							searchlistscholl: result.data.school_names,
@@ -461,6 +454,7 @@ class CoursesNew extends Component {
 							})
 						}
 					}
+          }
         }).catch((error)=>{
             console.log(error)
         })
@@ -469,7 +463,7 @@ class CoursesNew extends Component {
 			this.applyForAddOrgForm.setVisible(true)
 		}
     render() {
-        let {datatime,school,searchlistscholl,checkboxgroup} = this.state;
+        let {datatime,school,searchlistscholl,checkbofrups} = this.state;
         const {getFieldDecorator} = this.props.form;
 				const propsWithoutForm = Object.assign({}, this.props)
 				delete propsWithoutForm.form
@@ -699,27 +693,9 @@ class CoursesNew extends Component {
                                           this.props.match.params.coursesId != undefined?
                                             <Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
                                                 {
-                                                    checkboxgroup===undefined?"":checkboxgroup.length===0?"":checkboxgroup.map((item,key)=>{
+                                                    checkbofrups===undefined?"":checkbofrups.length===0?"":checkbofrups.map((item,key)=>{
                                                          return(
-                                                           item ==="shixun_homework"?
-                                                             <Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
-                                                             :item ==="common_homework"?
-                                                             <Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>
-                                                             :item ==="group_homework"?
-                                                               <Checkbox value={"group_homework"} className="fl">分组作业</Checkbox>
-                                                               :item ==="exercise"?
-                                                                 <Checkbox value={"exercise"} className="fl">试卷</Checkbox>
-                                                                 :item ==="attachment"?
-                                                                   <Checkbox value={"attachment"} className="fl">资源</Checkbox>
-                                                                   :item ==="course_group"?
-                                                                     <Checkbox value={"course_group"} className="fl">分班</Checkbox>
-                                                                     :item ==="graduation"?
-                                                                       <Checkbox value={"graduation"} className="fl">毕业设计</Checkbox>
-                                                                       :item ==="poll"?
-                                                                         <Checkbox value={"poll"} className="fl">问卷</Checkbox>
-                                                                         :item ==="board"?
-                                                                         <Checkbox value={"board"} className="fl">讨论</Checkbox>
-                                                                           :""
+                                                             <Checkbox key={key} value={item.module_type} className="fl">{item.module_name}</Checkbox>
                                                         )
                                                     })
                                                 }
@@ -729,16 +705,13 @@ class CoursesNew extends Component {
                                             <Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
                                             <Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>
                                             <Checkbox value={"group_homework"} className="fl">分组作业</Checkbox>
-                                            <Checkbox value={"exercise"} className="fl">试卷</Checkbox>
-                                            <Checkbox value={"attachment"} className="fl">资源</Checkbox>
-                                            <Checkbox value={"course_group"} className="fl">分班</Checkbox>
                                             <Checkbox value={"graduation"} className="fl">毕业设计</Checkbox>
+                                            <Checkbox value={"exercise"} className="fl">试卷</Checkbox>
                                             <Checkbox value={"poll"} className="fl">问卷</Checkbox>
+                                            <Checkbox value={"attachment"} className="fl">资源</Checkbox>
                                             <Checkbox value={"board"} className="fl">讨论</Checkbox>
+                                            <Checkbox value={"course_group"} className="fl">分班</Checkbox>
                                             </Checkbox.Group>
-
-
-
                                         )}
                                     </Form.Item>
                                 </div>
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 7214f46a8..ee1d3b9c7 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -50,7 +50,12 @@ class Goldsubject extends Component {
 			subject_id:"",
 			start_date:"",
 			Whethertocreateanewclassroom:true,
-
+			checkbofrup:[
+				{module_type:"announcement",module_name:"公告栏"},{module_type:"online_learning",module_name:"在线学习"}
+				,{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"}
+				,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"}
+				,{module_type:"attachment",module_name:"资源"},{module_type:"board",module_name:"讨论"},{module_type:"course_group",module_name:"分班"},],
+			checkbofrups:[],
 		}
 	}
 	// disabledEndDate= endValue => {
@@ -139,7 +144,20 @@ class Goldsubject extends Component {
 					course_module_types: data.course_module_types,
 					school:data.school,
 					Whethertocreateanewclassroom:false,
+					checkbofrups:data.course_modules,
 				});
+
+				try {
+					if(data.course_modules===undefined||data.course_modules.length===0){
+						this.setState({
+							checkbofrups:this.state.checkbofrup,
+						});
+					}
+				}catch (e) {
+					this.setState({
+						checkbofrups:this.state.checkbofrup,
+					});
+				}
 				this.handleSearchschool(data.school);
 			}).catch((error) => {
 				console.log(error);
@@ -591,7 +609,7 @@ class Goldsubject extends Component {
 		this.applyForAddOrgForm.setVisible(true)
 	}
 	render() {
-		let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom} = this.state;
+		let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,checkbofrups} = this.state;
 		const {getFieldDecorator} = this.props.form;
 		const propsWithoutForm = Object.assign({}, this.props)
 		delete propsWithoutForm.form
@@ -860,6 +878,25 @@ class Goldsubject extends Component {
 												"announcement","online_learning","shixun_homework","common_homework",
 											],
 										})(
+											this.props.match.params.coursesId != undefined?
+												<Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
+													{
+														checkbofrups===undefined?"":checkbofrups.length===0?"":checkbofrups.map((item,key)=>{
+															return(
+																item.module_type==="announcement"?
+																	<Checkbox value={"announcement"} className="fl" defaultChecked disabled>公告栏</Checkbox>
+																	:
+																	item.module_type==="online_learning"?
+																		<Checkbox value={"online_learning"} className="fl" defaultChecked disabled>在线学习</Checkbox>
+																		:
+																		item.module_type==="graduation"?"":
+																			item.module_type==="group_homework"?"":
+																<Checkbox key={key} value={item.module_type} className="fl">{item.module_name}</Checkbox>
+															)
+														})
+													}
+												</Checkbox.Group>
+												:
 											<Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
 												<Checkbox value={"announcement"} className="fl" defaultChecked disabled>公告栏</Checkbox>
 												<Checkbox value={"online_learning"} className="fl" defaultChecked disabled>在线学习</Checkbox>
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index 7b00fa4a5..a01c142a4 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -288,6 +288,7 @@ class Poll extends Component{
             })
             let{type,StudentList_value}=this.state
             this.InitList(type,StudentList_value,1);
+            this.props.updataleftNavfun();
           }
         }).catch((error)=>{
           console.log(error);
@@ -595,7 +596,7 @@ class Poll extends Component{
                       {...this.state} 
                       courseType={course_types}
                       item={item}
-                      key={key}
+                      index={key}
 											onItemClick={this.onItemClick}
                       checkBox={<Checkbox value={item.id}   key={item.id}  onClick={() => this.onItemClick(item)}></Checkbox>}
                     ></PollListItem>
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index 6a4f9b84e..9e8153e97 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -16,7 +16,7 @@ class PollListItem extends Component{
     super(props);
   }
   render(){
-    let{item,checkBox,courseType}=this.props;
+    let{item,checkBox,courseType,index}=this.props;
     let {coursesId}=this.props.match.params;
     
     const IsAdmin =this.props.isAdmin();
@@ -28,10 +28,10 @@ class PollListItem extends Component{
     let canNotLink = !isAdminOrStudent && item.lock_status == 0
     return(
 
-      <div className="workList_Item polllisthover" style={{padding:"30px"}}  onClick={() => this.props.onItemClick(this.props.item)}>
+      <div className="workList_Item polllisthover" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }}  onClick={() => this.props.onItemClick(this.props.item)}>
         {
           IsAdmin && 
-          <span className="fl mr12">
+          <span className={`pollitem${index} fl mr12`}>
             {checkBox}
           </span>
         }
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 48bc69c79..27194e5e0 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2529,14 +2529,24 @@ class PollNew extends Component {
 
 									</div>
 									{/*suffix={String(addonAfter)}*/}
+									<style>
+										{
+											`
+											.yslpollls   .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+											`
+										}
+									</style>
 									<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
 												 style={{"margin-top": "15px", "text-align": "left"}}
 												 onInput={this.changeTopicName}
 												 readOnly={readOnlys}
 												 autoComplete="off"
-												 suffix={String(addonAfter)+"/60"}
+												 addonAfter={String(addonAfter)+"/60"}
 												 value={this.state.polls_nametest}
-												 className="searchViewAfter"></Input>
+												 className="searchViewAfter yslpollls"></Input>
 
 								</div>
 								<div style={{
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 38ab63a4f..942c06800 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -124,13 +124,19 @@ class ShixunhomeWorkItem extends Component{
     })
   }
 
-  editname = (name,id) => {
+  // 实训详情，阻止冒泡
+  stopPro = (event) => {
+    event.stopPropagation()
+  }
+  
+  editname = (name,id,event) => {
     this.setState({
       ModalsRenametype:true,
       NavmodalValue:name,
       Navmodalname:"重命名",
       url:`/homework_commons/${id}/alter_name.json`
     })
+    event.stopPropagation()
   }
   cannerNavmoda=()=>{
     this.setState({
@@ -157,88 +163,74 @@ class ShixunhomeWorkItem extends Component{
 
     const { checkBox,
       discussMessage,
-      taskid,
+      taskid,index
     } = this.props;
-    //
-
-    // allow_late: true  //是否开启补交
-
-    // homework_id: 9250
-
-    // shixun_identifier: "25ykhpvl"
-
-    //
-    // console.log("this.props.isAdmin");
- 
-
     return(
-        <div className="graduateTopicList boardsList">
-          {this.state.ModalsRenametype===true?
-            <ModalsRename
-              {...this.props}
-              Navmodalnametype={this.state.ModalsRenametype}
-              NavmodalValue={this.state.NavmodalValue}
-              Navmodalname={this.state.Navmodalname}
-              Navname={"作业"}
-              url={this.state.url}
-              cannerNavmoda={()=>this.cannerNavmoda()}
-            />
-            :""}
-
-          <Modals
-            modalsType={Modalstype}
-            modalsTopval={Modalstopval}
-            modalsBottomval={Modalsbottomval}
-            modalCancel={cardsModalcancel}
-            modalSave={cardsModalsavetype}
-            loadtype={loadtype}
-           />
-
-          {visible===true?<Associationmodel
-             modalname={modalname}
-             visible={visible}
-             Cancel={this.Cancel}
-             taskid={taskid}
-             funlist={this.props.funlist}
-           />:""}
-
-
-          <Modal
-            keyboard={false}
-            title="提示"
-            visible={shixunsreplace}
-            closable={false}
-            footer={null}
-          >
-            <div className="task-popup-content">
-              <p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
-            </div>
-            <div className="task-popup-submit clearfix">
-              <a className="task-btn task-btn-orange fr mr51"
-                 onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
-            </div>
-          </Modal>
-          <Modal
-            keyboard={false}
-            title="提示"
-            visible={startshixunCombattype}
-            closable={false}
-            footer={null}
-          >
-            <div className="task-popup-content">
-              <p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
-              </p>
-            </div>
-            <div className="task-popup-submit clearfix">
-              {/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
-              <a className="task-btn task-btn-orange fr mr51" onClick={this.hidestartshixunCombattype}>知道啦</a>
-            </div>
-            {/*<p className="inviteTipbtn with100 fl">*/}
-            {/*<a onClick={this.hidestartshixunCombattype}>知道了</a>*/}
-            {/*</p>*/}
-          </Modal>
-
+      <React.Fragment>
+        {
+          this.state.ModalsRenametype===true?
+          <ModalsRename
+            {...this.props}
+            Navmodalnametype={this.state.ModalsRenametype}
+            NavmodalValue={this.state.NavmodalValue}
+            Navmodalname={this.state.Navmodalname}
+            Navname={"作业"}
+            url={this.state.url}
+            cannerNavmoda={()=>this.cannerNavmoda()}
+          />
+        :""}
+        <Modals
+          modalsType={Modalstype}
+          modalsTopval={Modalstopval}
+          modalsBottomval={Modalsbottomval}
+          modalCancel={cardsModalcancel}
+          modalSave={cardsModalsavetype}
+          loadtype={loadtype}
+        />
+        {visible===true?<Associationmodel
+          modalname={modalname}
+          visible={visible}
+          Cancel={this.Cancel}
+          taskid={taskid}
+          funlist={this.props.funlist}
+        />:""}
+        <Modal
+          keyboard={false}
+          title="提示"
+          visible={shixunsreplace}
+          closable={false}
+          footer={null}
+        >
+          <div className="task-popup-content">
+            <p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
+          </div>
+          <div className="task-popup-submit clearfix">
+            <a className="task-btn task-btn-orange fr mr51"
+                onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
+          </div>
+        </Modal>
+
+        <Modal
+          keyboard={false}
+          title="提示"
+          visible={startshixunCombattype}
+          closable={false}
+          footer={null}
+        >
+          <div className="task-popup-content">
+            <p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
+            </p>
+          </div>
+          <div className="task-popup-submit clearfix">
+            {/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
+            <a className="task-btn task-btn-orange fr mr51" onClick={this.hidestartshixunCombattype}>知道啦</a>
+          </div>
+          {/*<p className="inviteTipbtn with100 fl">*/}
+          {/*<a onClick={this.hidestartshixunCombattype}>知道了</a>*/}
+          {/*</p>*/}
+        </Modal>
 
+        <div className="graduateTopicList boardsList" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.shixunitem${index} input`).click() } >
           <style>{`
             .boardsList .ant-checkbox-wrapper{
                margin-top: -35px;
@@ -284,7 +276,11 @@ class ShixunhomeWorkItem extends Component{
 
           `}</style>
 
-          {this.props.isAdmin?checkBox:""}
+          {this.props.isAdmin?
+            <span className={`shixunitem${index} fl`} style={{"height":"55px"}}>{checkBox}</span>
+            :
+            ""
+          }
 
           <div className="clearfix ds pr pt5 contentSection" >
 						<style>{`
@@ -299,23 +295,23 @@ class ShixunhomeWorkItem extends Component{
 
               {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
               {
-                this.props.isAdmin?<a href={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"}
+                this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"}
                                          title={discussMessage.name}
-                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
-                this.props.isStudent? <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
+                this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
                                             title={discussMessage.name}
-                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
                 this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
 									<span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-                 : <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
+                 : <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
                          title={discussMessage.name}
-                         className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                         className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
 
@@ -383,9 +379,9 @@ class ShixunhomeWorkItem extends Component{
 								`
 							}
 						</style>
-            {this.props.isAdmin?<div className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
-              <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
-								{this.props.isAdminOrCreator()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
+            {this.props.isAdmin?<div onClick={(event)=>this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
+              <Link className="btn colorblue font-16" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>
+								{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               {/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
               <WordsBtn className="btn colorblue  font-16 ml15"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
             </div>:""}
@@ -408,6 +404,7 @@ class ShixunhomeWorkItem extends Component{
 
           </div>
         </div>
+      </React.Fragment>
       )
     }
 }
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 9ff27bf5d..fbebdf4b3 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -587,6 +587,8 @@ class ShixunHomework extends Component{
    let {Coursename,page}=this.state;
     this.setState({
       order: e.key,
+      checkBoxValues:[],
+      checkedtype:false,
       isSpin:true
     });
     let newkey=e.key;
@@ -1029,8 +1031,8 @@ class ShixunHomework extends Component{
         <div className="edu-back-white">
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-            <span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>
-            {/*  <span className="font-18 fl color-dark-21">实训作业</span>*/}
+            {/*<span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>*/}
+              <span className="font-18 fl color-dark-21">实训作业</span>
               <li className="fr">
               {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
                   <span>
@@ -1175,6 +1177,7 @@ class ShixunHomework extends Component{
 										isClassManagement={this.props.isClassManagement()}
                     checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id} key={item.homework_id}></Checkbox>:""}
                     match={this.props.match}
+                    index={index}
                     coursedata={this.props.coursedata}
                     coursupdata={()=>this.homeworkupdatalist(Coursename,page,order)}
                     course_identity={datas.course_identity}
diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index 3214fe5d5..f50ec9d21 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -224,12 +224,15 @@ class MainContentContainer extends Component {
     }
 
 	componentDidUpdate(prevProps, prevState, snapshot) {
-        const { game  } = this.props
+        const { game, challenge  } = this.props
         
 		if (game && prevProps.game 
 				&& prevProps.game.identifier !== game.identifier) {   
 			// 切换关卡时，停止轮训
 			this.oldGameIdentifier = prevProps.game.identifier;
+			this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
+		} else if (challenge && (challenge.pathIndex || prevProps.challenge.pathIndex) && challenge.pathIndex != prevProps.challenge.pathIndex) {
+			this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
 		}
         
     }
@@ -386,8 +389,8 @@ class MainContentContainer extends Component {
 	}
 	
 
-	doFileUpdateRequestOnCodeMirrorBlur = () => {
-		var fileUpdatePromise = this.doFileUpdateRequest(true)
+	doFileUpdateRequestOnCodeMirrorBlur = (props) => {
+		var fileUpdatePromise = this.doFileUpdateRequest(true, undefined, props)
         if (fileUpdatePromise) {
         	fileUpdatePromise.then((resData) => {
         		if (resData.status === -1) { // 保存文件出现异常
@@ -496,7 +499,8 @@ class MainContentContainer extends Component {
 	}
 
 	// forTest true  是评测时触发的file_update
-	doFileUpdateRequest(checkIfCodeChanged, forTest) {
+	doFileUpdateRequest(checkIfCodeChanged, forTest, props) {
+		const _props = props || this.props;
 		const { codeStatus } = this.state;
 		if (!forTest && codeStatus !== UPDATED) {	// 已修改状态才能保存
 			return;
@@ -521,7 +525,7 @@ class MainContentContainer extends Component {
 			})
 			return null;
 		}
-		const { challenge, output_sets, onRunCodeTestFinish, myshixun } = this.props
+		const { challenge, output_sets, onRunCodeTestFinish, myshixun } = _props
 		// var url = `${locationPath}/file_update?path=${encodeURIComponent(challenge.path)}`
 		var url = `/myshixuns/${myshixun.identifier}/update_file.json`
 
diff --git a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 50072c627..d19aa03ec 100644
--- a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -37,6 +37,8 @@ export function ImageLayerOfCommentHOC(options = {}) {
       }
       // jQuery._data( $('.newMain')[0], "events" )
       componentDidMount() {	
+        this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
+
         // commentsDelegateParent #game_left_contents #tab_con_4
         setTimeout(() => {
           $(options.parentSelector || ".commentsDelegateParent")
@@ -60,7 +62,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
           <React.Fragment>
             <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
 
-            <WrappedComponent {...this.props} >
+            <WrappedComponent {...this.props} ref="wrappedComponentRef">
             </WrappedComponent>
           </React.Fragment>
         )
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index f3c4a30da..4470aaec1 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -1,45 +1,45 @@
-.ml350 {
-  margin-left: 40%;
-}
-
-.ml32 {
-  margin-left: 32%;
-}
-
-.square-Item{
-    /*min-height: 324px;*/
-}
-.square-img{
-    min-height: 210px;
-}
-.task-hide{
-  margin-bottom: 0em;
-}
-.backFAFAFA{
-  background:#FAFAFA;
-}
-
-.demo {
-  width: 500px;
-  background-color: #0dcecb;
-  text-align: center;
-  padding:50px;
-}
-.next-loading {
-  margin-bottom: 5px;
-  width:100%;
-}
-
-.next-rating-overlay .next-icon{
-  color: #FFA800!important;
-}
-
-.custom-pagination {
-  display: inline-block;
-  margin-left: 10px;
-}
-
-.ml425{
-  margin-left:42.5%;
-  margin-top:20px;
+.ml350 {
+  margin-left: 40%;
+}
+
+.ml32 {
+  margin-left: 32%;
+}
+
+.square-Item{
+    /*min-height: 324px;*/
+}
+.square-img{
+    min-height: 210px;
+}
+.task-hide{
+  margin-bottom: 0em;
+}
+.backFAFAFA{
+  background:#FAFAFA;
+}
+
+.demo {
+  width: 500px;
+  background-color: #0dcecb;
+  text-align: center;
+  padding:50px;
+}
+.next-loading {
+  margin-bottom: 5px;
+  width:100%;
+}
+
+.next-rating-overlay .next-icon{
+  color: #FFA800!important;
+}
+
+.custom-pagination {
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.ml425{
+  margin-left:42.5%;
+  margin-top:20px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 48e1af926..5a569192c 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -1103,6 +1103,10 @@ class LoginRegisterComponent extends Component {
                                         right: 12px;
                                         height: 20px;
                                     }
+                                      .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
                                     `
                               }
                           </style>
@@ -1112,7 +1116,7 @@ class LoginRegisterComponent extends Component {
                                   autoComplete="new-password"
                                   onClick={this.changeType}
                                   value={this.state.passwords} onChange={this.passwordonChanges}
-                                  suffix={
+                                  addonAfter={
                                       <img className={"mt5"} src={passopens} onClick={(key) => this.Showandhide(key)}>
                                       </img>
                                   }></Input>
diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index cb6941070..27aae8893 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -492,7 +492,17 @@ class AccountBasic extends Component {
             }
           `}</style>
           <div className="title">基本信息</div>
-
+          <style>
+            {
+              `
+                .exercicenewinputysl .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+            }
+          </style>
           <Form onSubmit={this.handleSubmit}>
             <Form.Item
               label="昵称"
@@ -505,12 +515,22 @@ class AccountBasic extends Component {
                   message: '请输入您的昵称',
                 }],
               })(
-                <Input placeholder={`请输入您的昵称，最大限制${MAX_NICKNAME_LENGTH}个字符`} onInput={this.changeNickName} maxLength={MAX_NICKNAME_LENGTH} suffix ={
+                <Input placeholder={`请输入您的昵称，最大限制${MAX_NICKNAME_LENGTH}个字符`} className="exercicenewinputysl" onInput={this.changeNickName} maxLength={MAX_NICKNAME_LENGTH} addonAfter ={
                   <span className="color-grey-6 font-13">{String(nameLength)}/{MAX_NICKNAME_LENGTH}</span>
                 }></Input>
               )}
             </Form.Item>
-
+            <style>
+              {
+                `
+                .yslgraduainputedit .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+              }
+            </style>
             <Form.Item
               label="姓名"
               className="formItemInline"
@@ -523,7 +543,7 @@ class AccountBasic extends Component {
                     validator: this.checkNameLength
                   }],
                 })(
-                  <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} disabled={!showRealName && this.state.forDisable == true } suffix={
+                  <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit"  disabled={!showRealName && this.state.forDisable == true } addonAfter={
                     <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
                           onClick={()=>this.showOrHide(showRealName)}></i>
                   }></Input>
diff --git a/public/react/src/modules/user/usersInfo/InfosBank.js b/public/react/src/modules/user/usersInfo/InfosBank.js
index 8adc7ba50..2abc15220 100644
--- a/public/react/src/modules/user/usersInfo/InfosBank.js
+++ b/public/react/src/modules/user/usersInfo/InfosBank.js
@@ -1,249 +1,249 @@
-import React, { Component } from 'react';
-import {Pagination,Spin,Checkbox,Modal} from 'antd';
-import moment from 'moment';
-import axios from 'axios';
-import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import "./usersInfo.css"
-import Modals from '../../modals/Modals'
-
-const dateFormat ="YYYY-MM-DD HH:mm"
-class InfosBank extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      category:"common",
-      type:"publicly",
-      page:1,
-      per_page:16,
-      sort_by:"updated_at",
-      CoursesId:undefined,
-
-      totalCount:undefined,
-      data:undefined,
-      isSpin:false,
-
-      dialogOpen:false,
-      modalsTopval:undefined,
-      modalsBottomval:undefined,
-      modalSave:undefined
-    }
-  }
-
-  componentDidMount=()=>{
-    this.setState({
-      isSpin:true
-    })
-    let{category,type,page,sort_by,CoursesId}=this.state;
-    this.getCourses(category,type,page,sort_by,CoursesId);
-  }
-
-  getCourses=(category,type,page,sort_by,CoursesId)=>{
-    let url=`/users/${this.props.match.params.username}/question_banks.json`;
-    axios.get((url),{params:{
-      category,
-      type,
-      page,
-      sort_by,
-      per_page:category && page ==1?17:16,
-      course_list_id:CoursesId
-    }}).then((result)=>{
-      if(result){
-        this.setState({
-          totalCount:result.data.count,
-          data:result.data,
-          isSpin:false
-        })
-      }
-    }).catch((error)=>{
-      console.log(error);
-    })
-  }
-
-  //切换种类
-  changeCategory=(cate)=>{
-    this.setState({
-      category:cate,
-      page:1,
-      isSpin:true
-    })
-    let{type,sort_by,CoursesId}=this.state;
-    this.getCourses(cate,type,1,sort_by,CoursesId);
-  }
-  //切换状态
-  changeType=(type)=>{
-    this.setState({
-      type:type,
-      page:1,
-      isSpin:true
-    })
-    let{category,sort_by,CoursesId}=this.state;
-    this.getCourses(category,type,1,sort_by,CoursesId);
-  }
-  //切换页数
-  changePage=(page)=>{
-    this.setState({
-      page,
-      isSpin:true
-    })
-    let{category,type,sort_by,CoursesId}=this.state;
-    this.getCourses(category,type,page,sort_by,CoursesId);
-  }
-
-  // 进入课堂
-  turnToCourses=(url)=>{
-    this.props.history.push(url);
-  }
-
-  // 切换排序方式
-  changeOrder= (sort)=>{
-    this.setState({
-      sort_by:sort,
-      isSpin:true
-    })
-    let{category,type,page,CoursesId}=this.state;
-    this.getCourses(category,type,page,sort,CoursesId);
-  }
-
-  changeCourseListId =(CoursesId)=>{
-    this.setState({
-      CoursesId,
-      isSpin:true
-    })
-    let{category,type,sort,page}=this.state;
-    this.getCourses(category,type,page,sort,CoursesId);
-  }
-
-  //设为公开/删除
-  setPublic=(index)=>{
-    this.setState({
-      dialogOpen:true,
-      modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
-      modalsBottomval:index==1?"公开后不能重设为私有":"",
-      modalSave:()=>this.sureOperation(index)
-    })
-  }
-  // 确定--设为公开/删除
-  sureOperation=()=>{
-
-  }
-
-  //弹框隐藏
-  handleDialogClose=()=>{
-    this.setState({
-      dialogOpen:false
-    })
-  }
-
-  render(){
-    let{
-      category,
-      type,
-      page,
-      data,
-      totalCount,
-      sort_by,
-      isSpin,
-      CoursesId,
-      dialogOpen,
-      modalsTopval,
-      modalsBottomval,modalSave
-    } = this.state;
-    let isStudent = this.props.isStudent();
-    let  is_current=this.props.is_current;
-    return(
-      <div className="educontent">
-        <Modals
-          modalsType={dialogOpen}
-          modalsTopval={modalsTopval}
-          modalsBottomval={modalsBottomval}
-          modalCancel={this.handleDialogClose}
-          modalSave={modalSave}
-        ></Modals>
-        <Spin size="large" spinning={isSpin}>
-        <div className="white-panel edu-back-white pt20 pb20 clearfix ">
-          <li className={type=="publicly" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("publicly")}>{is_current ? "我":"TA"}的题库</a></li>
-          <li className={type=="personal" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("personal")}>公共题库</a></li>
-        </div>
-        <div className="edu-back-white padding20-30 bor-top-greyE">
-          <ul className="clearfix secondNav">
-            <li className={category=="common" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("common")}>普通作业</a></li>
-            <li className={category=="group" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("group")}>分组作业</a></li>
-            <li className={category=="exercise" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("exercise")}>试卷</a></li>
-            <li className={category=="poll" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("poll")}>问卷</a></li>
-          </ul>
-          <div className="edu-txt-left mt10 bankTag">
-          <ul className="inline" id="sourceTag">
-            <li className={ CoursesId ? "" : "active" } onClick={()=>this.changeCourseListId()}>
-              <a href="javascript:void(0)">全部</a>
-            </li>
-            {
-              data && data.course_list && data.course_list.map((item,key)=>{
-                return(
-                  <li className={CoursesId==item.id?"active":""} key={key} onClick={()=>this.changeCourseListId(`${item.id}`)}>
-                    <a href="javascript:void(0)">{item.name}</a>
-                  </li>
-                )
-              })
-            }
-          </ul>
-        </div>
-        </div>
-        <p className="pl25 pr25 clearfix font-12 mb20 mt20">
-          <span className="fl color-grey-9">共参与{totalCount}个题库</span>
-          <div className="fr">
-            <li className="drop_down">
-              <span className="color-grey-9 font-12">{sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
-              <ul className="drop_down_normal">
-                <li onClick={()=>this.changeOrder("updated_at")}>时间最新</li>
-                <li onClick={()=>this.changeOrder("name")}>作业名称</li>
-                <li onClick={()=>this.changeOrder("contributor")}>贡献者</li>
-              </ul>
-            </li>
-          </div>
-        </p>
-        <div className="dataBank_list edu-back-white educontent">
-          {
-            !data || data.question_banks.length==0 && <NoneData></NoneData>
-          }
-          {
-            data && data.question_banks && data.question_banks.map((item,key)=>{
-              return(
-                <div className="dataBank_Item clearfix" key={key}>
-                  <div className="fl dataItemLeft">
-                    <Checkbox value={item.id} key={item.id}></Checkbox>
-                  </div>
-                  <div className="fr dataItemRight bank_item">
-                    <p className="mb10 clearfix">
-                      <span className="dataTitle fl mr80">{item.name}</span>
-                      <a href="javascript:void(0)" data-object="2599" className="bank_send fr">发送</a>
-                      {
-                        item.is_public ==false ?
-                        <a href="javascript:void(0)" onClick={()=>this.setPublic(1)} className="bank_public color-blue_4C fr mr60">设为公开</a>:""
-                      }
-                    </p>
-                    <p className="itembottom clearfix">
-                      <span className="fl bottomspan color-grey-9">{item.quotes_count}次引用</span>
-                      <span className="fl bottomspan color-grey-9">{item.solve_count}次答题</span>
-                      <span className="fl bottomspan color-grey-9">{moment(item.updated_at).format('YYYY-MM-DD HH:mm')}</span>
-                      <span className="fr"><a href="javascript:void(0)" className="bank_delete color-grey-9" onClick={()=>this.setPublic(2)}>删除</a></span>
-                      <span className="bank_list_Tag">{item.course_list_name}</span>
-                    </p>
-                  </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        {
-          totalCount > 15 && 
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
-          </div>
-        }
-        </Spin>
-      </div>
-    )
-  }
-}
+import React, { Component } from 'react';
+import {Pagination,Spin,Checkbox,Modal} from 'antd';
+import moment from 'moment';
+import axios from 'axios';
+import NoneData from '../../courses/coursesPublic/NoneData'
+import {getImageUrl} from 'educoder';
+import "./usersInfo.css"
+import Modals from '../../modals/Modals'
+
+const dateFormat ="YYYY-MM-DD HH:mm"
+class InfosBank extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      category:"common",
+      type:"publicly",
+      page:1,
+      per_page:16,
+      sort_by:"updated_at",
+      CoursesId:undefined,
+
+      totalCount:undefined,
+      data:undefined,
+      isSpin:false,
+
+      dialogOpen:false,
+      modalsTopval:undefined,
+      modalsBottomval:undefined,
+      modalSave:undefined
+    }
+  }
+
+  componentDidMount=()=>{
+    this.setState({
+      isSpin:true
+    })
+    let{category,type,page,sort_by,CoursesId}=this.state;
+    this.getCourses(category,type,page,sort_by,CoursesId);
+  }
+
+  getCourses=(category,type,page,sort_by,CoursesId)=>{
+    let url=`/users/${this.props.match.params.username}/question_banks.json`;
+    axios.get((url),{params:{
+      category,
+      type,
+      page,
+      sort_by,
+      per_page:category && page ==1?17:16,
+      course_list_id:CoursesId
+    }}).then((result)=>{
+      if(result){
+        this.setState({
+          totalCount:result.data.count,
+          data:result.data,
+          isSpin:false
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+  //切换种类
+  changeCategory=(cate)=>{
+    this.setState({
+      category:cate,
+      page:1,
+      isSpin:true
+    })
+    let{type,sort_by,CoursesId}=this.state;
+    this.getCourses(cate,type,1,sort_by,CoursesId);
+  }
+  //切换状态
+  changeType=(type)=>{
+    this.setState({
+      type:type,
+      page:1,
+      isSpin:true
+    })
+    let{category,sort_by,CoursesId}=this.state;
+    this.getCourses(category,type,1,sort_by,CoursesId);
+  }
+  //切换页数
+  changePage=(page)=>{
+    this.setState({
+      page,
+      isSpin:true
+    })
+    let{category,type,sort_by,CoursesId}=this.state;
+    this.getCourses(category,type,page,sort_by,CoursesId);
+  }
+
+  // 进入课堂
+  turnToCourses=(url)=>{
+    this.props.history.push(url);
+  }
+
+  // 切换排序方式
+  changeOrder= (sort)=>{
+    this.setState({
+      sort_by:sort,
+      isSpin:true
+    })
+    let{category,type,page,CoursesId}=this.state;
+    this.getCourses(category,type,page,sort,CoursesId);
+  }
+
+  changeCourseListId =(CoursesId)=>{
+    this.setState({
+      CoursesId,
+      isSpin:true
+    })
+    let{category,type,sort,page}=this.state;
+    this.getCourses(category,type,page,sort,CoursesId);
+  }
+
+  //设为公开/删除
+  setPublic=(index)=>{
+    this.setState({
+      dialogOpen:true,
+      modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
+      modalsBottomval:index==1?"公开后不能重设为私有":"",
+      modalSave:()=>this.sureOperation(index)
+    })
+  }
+  // 确定--设为公开/删除
+  sureOperation=()=>{
+
+  }
+
+  //弹框隐藏
+  handleDialogClose=()=>{
+    this.setState({
+      dialogOpen:false
+    })
+  }
+
+  render(){
+    let{
+      category,
+      type,
+      page,
+      data,
+      totalCount,
+      sort_by,
+      isSpin,
+      CoursesId,
+      dialogOpen,
+      modalsTopval,
+      modalsBottomval,modalSave
+    } = this.state;
+    let isStudent = this.props.isStudent();
+    let  is_current=this.props.is_current;
+    return(
+      <div className="educontent">
+        <Modals
+          modalsType={dialogOpen}
+          modalsTopval={modalsTopval}
+          modalsBottomval={modalsBottomval}
+          modalCancel={this.handleDialogClose}
+          modalSave={modalSave}
+        ></Modals>
+        <Spin size="large" spinning={isSpin}>
+        <div className="white-panel edu-back-white pt20 pb20 clearfix ">
+          <li className={type=="publicly" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("publicly")}>{is_current ? "我":"TA"}的题库</a></li>
+          <li className={type=="personal" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("personal")}>公共题库</a></li>
+        </div>
+        <div className="edu-back-white padding20-30 bor-top-greyE">
+          <ul className="clearfix secondNav">
+            <li className={category=="common" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("common")}>普通作业</a></li>
+            <li className={category=="group" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("group")}>分组作业</a></li>
+            <li className={category=="exercise" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("exercise")}>试卷</a></li>
+            <li className={category=="poll" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("poll")}>问卷</a></li>
+          </ul>
+          <div className="edu-txt-left mt10 bankTag">
+          <ul className="inline" id="sourceTag">
+            <li className={ CoursesId ? "" : "active" } onClick={()=>this.changeCourseListId()}>
+              <a href="javascript:void(0)">全部</a>
+            </li>
+            {
+              data && data.course_list && data.course_list.map((item,key)=>{
+                return(
+                  <li className={CoursesId==item.id?"active":""} key={key} onClick={()=>this.changeCourseListId(`${item.id}`)}>
+                    <a href="javascript:void(0)">{item.name}</a>
+                  </li>
+                )
+              })
+            }
+          </ul>
+        </div>
+        </div>
+        <p className="pl25 pr25 clearfix font-12 mb20 mt20">
+          <span className="fl color-grey-9">共参与{totalCount}个题库</span>
+          <div className="fr">
+            <li className="drop_down">
+              <span className="color-grey-9 font-12">{sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
+              <ul className="drop_down_normal">
+                <li onClick={()=>this.changeOrder("updated_at")}>时间最新</li>
+                <li onClick={()=>this.changeOrder("name")}>作业名称</li>
+                <li onClick={()=>this.changeOrder("contributor")}>贡献者</li>
+              </ul>
+            </li>
+          </div>
+        </p>
+        <div className="dataBank_list edu-back-white educontent">
+          {
+            !data || data.question_banks.length==0 && <NoneData></NoneData>
+          }
+          {
+            data && data.question_banks && data.question_banks.map((item,key)=>{
+              return(
+                <div className="dataBank_Item clearfix" key={key}>
+                  <div className="fl dataItemLeft">
+                    <Checkbox value={item.id} key={item.id}></Checkbox>
+                  </div>
+                  <div className="fr dataItemRight bank_item">
+                    <p className="mb10 clearfix">
+                      <span className="dataTitle fl mr80">{item.name}</span>
+                      <a href="javascript:void(0)" data-object="2599" className="bank_send fr">发送</a>
+                      {
+                        item.is_public ==false ?
+                        <a href="javascript:void(0)" onClick={()=>this.setPublic(1)} className="bank_public color-blue_4C fr mr60">设为公开</a>:""
+                      }
+                    </p>
+                    <p className="itembottom clearfix">
+                      <span className="fl bottomspan color-grey-9">{item.quotes_count}次引用</span>
+                      <span className="fl bottomspan color-grey-9">{item.solve_count}次答题</span>
+                      <span className="fl bottomspan color-grey-9">{moment(item.updated_at).format('YYYY-MM-DD HH:mm')}</span>
+                      <span className="fr"><a href="javascript:void(0)" className="bank_delete color-grey-9" onClick={()=>this.setPublic(2)}>删除</a></span>
+                      <span className="bank_list_Tag">{item.course_list_name}</span>
+                    </p>
+                  </div>
+                </div>
+              )
+            })
+          }
+        </div>
+        {
+          totalCount > 15 && 
+          <div className="mt30 mb50 edu-txt-center">
+            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
+          </div>
+        }
+        </Spin>
+      </div>
+    )
+  }
+}
 export default InfosBank;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 92dd4f1d2..08bea57ed 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -1,115 +1,122 @@
-import React, { Component } from 'react';
-
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
-
-import "./usersInfo.css"
-import "../../courses/css/members.css"
-import "../../courses/css/Courses.css"
-
-import banner from '../../../images/account/infobanner.png'
-
-class InfosBanner extends Component{
-  constructor(props){
-    super(props);
-  }
-  render(){
-    let { 
-      data ,
-      id,
-      login,
-      moduleName,
-      current_user,
-     }=this.props;
-     let  is_current=this.props.is_current;
-     let {username}= this.props.match.params;
-     let {pathname}=this.props.location;
-     moduleName=pathname.split("/")[3];
-    return(
-      <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>
-            <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>
-                }
-              </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>
-                </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>
-                </Tooltip>
-              </p>
-            </div>
-            <div className="fr">
-              <div class="fl headtab mt20">
-                <span>{is_current ? "我":"TA"}的经验值</span>
-                <a style={{"cursor":"default"}}>{data && data.experience}</a>
-              </div> 
-              <div class="fl headtab mt20 pr leftTransform pl20">
-                <span>{is_current ? "我":"TA"}的金币</span>
-                <a style={{"cursor":"default"}}>{data && data.grade}</a>
-              </div> 
-              {
-                is_current ? 
-                <span className="fl mt35 ml60">
-                  {
-                    data && data.attendance_signed ? 
-                    <span className="user_default_btn user_grey_btn font-18">已签到</span>
-                    :
-                    <a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>
-                  }
-                </span> 
-                :
-                <span className="fl mt35 ml60">
-                  <a href={`/messages/${login}/message_detail?target_ids=${id}`} className="user_default_btn user_yellow_btn fl font-18">私信</a>
-                </span>
-              }
-            </div>
-          </div>
-          <div className="userNav">
-            <li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'courses'})}
-                to={`/users/${username}/courses`}>翻转课堂</Link>
-            </li>
-            <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'shixuns'})}
-                to={`/users/${username}/shixuns`}>实训项目</Link>
-            </li>
-            <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
-              <Link 
-                onClick={() => this.setState({moduleName: 'paths'})}
-                to={`/users/${username}/paths`}>实践课程</Link>
-            </li>
-            <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
-              <Link
-                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>
-            {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) 
-            && <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'videos'})}
-                to={`/users/${username}/videos`}>视频</Link>
-            </li>}
-          </div>
-        </div>
-      </div>
-    )
-  }
-}
+import React, { Component } from 'react';
+
+import {Link} from 'react-router-dom';
+import {Tooltip,Menu} from 'antd';
+import {getImageUrl} from 'educoder';
+
+import "./usersInfo.css"
+import "../../courses/css/members.css"
+import "../../courses/css/Courses.css"
+
+import { LinkAfterLogin } from 'educoder'
+
+class InfosBanner extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+    let { 
+      data ,
+      id,
+      login,
+      moduleName,
+      current_user,
+     }=this.props;
+     let  is_current=this.props.is_current;
+     let {username}= this.props.match.params;
+     let {pathname}=this.props.location;
+     moduleName=pathname.split("/")[3];
+    return(
+      <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>
+            <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>
+                }
+              </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>
+                </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>
+                </Tooltip>
+              </p>
+            </div>
+            <div className="fr">
+              <div class="fl headtab mt20">
+                <span>{is_current ? "我":"TA"}的经验值</span>
+                <a style={{"cursor":"default"}}>{data && data.experience}</a>
+              </div> 
+              <div class="fl headtab mt20 pr leftTransform pl20">
+                <span>{is_current ? "我":"TA"}的金币</span>
+                <a style={{"cursor":"default"}}>{data && data.grade}</a>
+              </div> 
+              {
+                is_current ? 
+                <span className="fl mt35 ml60">
+                  {
+                    data && data.attendance_signed ? 
+                    <span className="user_default_btn user_grey_btn font-18">已签到</span>
+                    :
+                    <a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>
+                  }
+                </span> 
+                :
+                <span className="fl mt35 ml60">
+                  <LinkAfterLogin 
+                    {...this.props} 
+                    {...this.state} 
+                    className="user_default_btn user_yellow_btn fl font-18" 
+                    to={`/messages/${login}/message_detail?target_ids=${id}`}
+                  >
+                  私信
+                  </LinkAfterLogin>
+                </span>
+              }
+            </div>
+          </div>
+          <div className="userNav">
+            <li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>
+              <Link
+                onClick={() => this.setState({moduleName: 'courses'})}
+                to={`/users/${username}/courses`}>翻转课堂</Link>
+            </li>
+            <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
+              <Link
+                onClick={() => this.setState({moduleName: 'shixuns'})}
+                to={`/users/${username}/shixuns`}>开发社区</Link>
+            </li>
+            <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
+              <Link 
+                onClick={() => this.setState({moduleName: 'paths'})}
+                to={`/users/${username}/paths`}>实践课程</Link>
+            </li>
+            <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
+              <Link
+                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>
+            {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) 
+            && <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
+              <Link
+                onClick={() => this.setState({moduleName: 'videos'})}
+                to={`/users/${username}/videos`}>视频</Link>
+            </li>}
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
 export default InfosBanner;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index c4c1c77e0..bc401d4d7 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -130,7 +130,7 @@ class InfosCourse extends Component{
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
           }
           {
-            (!data || data.courses.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.courses.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.courses && data.courses.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index cb02ed604..554d8380f 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -152,7 +152,7 @@ class InfosPath extends Component{
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
           }
           {
-            (!data || data.subjects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.subjects.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.subjects && data.subjects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 2018f7b73..5aea5117b 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -125,7 +125,7 @@ class InfosProject extends Component{
             <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4"></Create>:""
           }
           {
-           (!data || data.projects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.projects.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.projects && data.projects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index 94ef3c29b..4799626a9 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -1,14 +1,11 @@
 import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
+
+import { Pagination , Spin } from 'antd';
+
 import NoneData from '../../courses/coursesPublic/NoneData'
 import axios from 'axios';
-import {getImageUrl,setImagesUrl} from 'educoder';
-import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
-import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
+import { setImagesUrl } from 'educoder';
+
 import "./usersInfo.css"
 
 import Create from './publicCreatNew'
@@ -115,7 +112,7 @@ class InfosShixun extends Component{
       totalCount,
       isSpin
     } = this.state;
-    let isStudent = this.props.isStudent();
+    
     let  is_current=this.props.is_current;
     return(
       <div className="educontent">
@@ -157,20 +154,18 @@ class InfosShixun extends Component{
         </div>
         <div className="square-list clearfix">
           {
-            page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
+            page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ? 
             <Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create>:""
           }
           {
-            (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.shixuns.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.shixuns && data.shixuns.map((item,key)=>{
               return(
                 <div className="square-Item" onClick={()=>this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
                   {
-                    item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span>
-											{/*<img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/>*/}
-                    </div>
+                    item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span><img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/></div>
                   }
                   <a href="javascript:void(0)" className="square-img">
                     <img src={setImagesUrl(`${item.image_url}`)}/>
diff --git a/public/react/src/modules/user/usersInfo/banner_out.js b/public/react/src/modules/user/usersInfo/banner_out.js
index 7afcf50fb..986a66cd3 100644
--- a/public/react/src/modules/user/usersInfo/banner_out.js
+++ b/public/react/src/modules/user/usersInfo/banner_out.js
@@ -1,190 +1,190 @@
-import React, { Component } from 'react';
-
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
-
-import "./usersInfo.css"
-import "../../courses/css/members.css"
-import "../../courses/css/Courses.css"
-class banner_out extends Component{
-  constructor(props){
-    super(props);
-  }
-  render(){
-    let { 
-      data ,
-      is_current,
-      is_edit,
-      sign,
-      type,
-      followed,
-      id,
-      login,
-      moduleName,
-      next_gold
-     }=this.props;
-     let {username}= this.props.match.params;
-    return(
-      <div className="user-main-half">
-          <div className="user-headImg"></div>
-          <div className="user-headCon">
-            <div className="pr" style={{"min-height": "465px"}}>
-              <div className="educontent pt80 clearfix edu-txt-center">
-                <div className="inline">
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的经验值</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
-										>{data && data.experience}</a>
-                  </div>
-                  <em className="v-h-line fl"></em>
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的金币</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
-											id="user_code">{data && data.grade}</a>
-                  </div>
-                  <div className="headphoto mt14">
-                    <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/>
-                  </div>
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的粉丝</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
-											id="user_h_fan_count">{data && data.fan_count}</a>
-                  </div>
-                  <em className="v-h-line fl"></em>
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的关注</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
-										>{data && data.follow_count}</a>
-                  </div>
-                  <span className="clearfix"></span>
-                  <span className="myName">{data && data.name}</span>
-                </div>
-              </div>
-              <div className="educontent mt10 clearfix edu-txt-center">
-                <div className="inline">
-                  {
-                    data && is_current == false && data.identity =="学生" ? "" : <span className="mypost fl mr10">{data && data.identity}</span>
-                  }
-                  <a
-										 // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/authentication` :"javascript:void(0)"}
-										 // target="_blank"
-										 className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
-                      <i className={ data && data.authentication ? "iconfont icon-shenfenrenzheng font-13 color-blue":"iconfont icon-shenfenrenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  <a
-										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/professional_certification` :"javascript:void(0)"}
-										// target="_blank"
-										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>
-                      <i className={ data && data.professional_certification ? "iconfont icon-zhiyerenzheng font-13 color-blue":"iconfont icon-zhiyerenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  <a
-										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/change_or_bind?type=phone` :"javascript:void(0)"}
-										// target="_blank"
-										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.phone_binded ?"已手机认证":"未手机认证"}>
-                      <i className={ data && data.phone_binded ? "iconfont icon-shoujirenzheng font-13 color-blue":"iconfont icon-shoujirenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  <a
-										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/my/account` :"javascript:void(0)"}
-										// target="_blank"
-										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.email_binded ?"已邮箱认证":"未邮箱认证"}>
-                      <i className={ data && data.email_binded ? "iconfont icon-youxiangrenzheng font-13 color-blue":"iconfont icon-youxiangrenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  {/* <!--学院管理员身份--> */}
-                  {
-                    data && data.college_identifier &&
-                    <a
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/colleges/${data.college_identifier}/statistics`} target="_blank"
-											className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                      <Tooltip placement='bottom' title="学院管理员">
-                        <i className="iconfont icon-chengyuanguanli font-12 color-blue" data-tip-down="学院管理员"></i>
-                      </Tooltip>
-                    </a>
-                  }
-                </div>
-              </div>
-              <div className="mt15 educontent clearfix edu-txt-center">
-                <p className="mb20" style={{"height": "28px"}}>
-                  {
-                    is_edit && is_current ? 
-                    <input type="text" id="mysign" class="mysign-input" placeholder="请输入您的个性签名" style={{height:"20px"}} value={sign} onInput={this.inputSign} onBlur={this.savemysign}/>
-                    :
-                    is_current ? 
-                    <a className="mysign-span" onClick={this.editmysign} style={{"display": "block"}}>{sign || "这家伙很懒，什么都没留下~"}</a>
-                    :
-                    <span className="mysign-span" style={{"display": "block","cursor":"default"}}>{sign || "这家伙很懒，什么都没留下~"}</span>
-                  }
-                </p>
-                {
-                  is_current ? 
-                  <div className="inline">
-                    {
-                      data && data.attendance_signed ? 
-                      <React.Fragment>
-                        <span className="user_default_btn user_grey_btn mb5">已签到</span>
-                        <p id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
-                      </React.Fragment>
-                      :
-                      <a herf="javascript:void(0);" onClick={this.props.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
-                      // <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
-                    }
-                  </div> 
-                  :
-                  <div className="inline">
-                    <a href="javascript:void(0);" onClick={this.props.followPerson} className="user_default_btn user_watch_btn user_private_btn fl mr20">{followed ? "取消关注":"关注"}</a>
-                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/messages/${login}/message_detail?target_ids=${id}`} className="user_default_btn user_private_btn fl">私信</a>
-                  </div>
-                }
-              </div>
-              <div className="edu-txt-center navInfo">
-                <div className="inline">
-                  <li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>
-                    <Link
-                      onClick={() => this.setState({moduleName: 'courses'})}
-                      to={`/users/${username}/courses`}>课堂</Link>
-                  </li>
-                  <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
-                    <Link
-                      onClick={() => this.setState({moduleName: 'shixuns'})}
-                      to={`/users/${username}/shixuns`}>实训</Link>
-                  </li>
-                  <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
-                    <Link 
-                      onClick={() => this.setState({moduleName: 'paths'})}
-                      to={`/users/${username}/paths`}>实践课程</Link>
-                  </li>
-                  <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
-                 <Link
-                      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>
-
-                  {/*{ data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}*/}
-                  
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-    )
-  }
-}
+import React, { Component } from 'react';
+
+import {Link} from 'react-router-dom';
+import {Tooltip,Menu} from 'antd';
+import {getImageUrl} from 'educoder';
+
+import "./usersInfo.css"
+import "../../courses/css/members.css"
+import "../../courses/css/Courses.css"
+class banner_out extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+    let { 
+      data ,
+      is_current,
+      is_edit,
+      sign,
+      type,
+      followed,
+      id,
+      login,
+      moduleName,
+      next_gold
+     }=this.props;
+     let {username}= this.props.match.params;
+    return(
+      <div className="user-main-half">
+          <div className="user-headImg"></div>
+          <div className="user-headCon">
+            <div className="pr" style={{"min-height": "465px"}}>
+              <div className="educontent pt80 clearfix edu-txt-center">
+                <div className="inline">
+                  <div className="fl headtab">
+                    <span>{is_current ? "我":"TA"}的经验值</span>
+                    <a style={{ cursor: 'default' }}
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
+										>{data && data.experience}</a>
+                  </div>
+                  <em className="v-h-line fl"></em>
+                  <div className="fl headtab">
+                    <span>{is_current ? "我":"TA"}的金币</span>
+                    <a style={{ cursor: 'default' }}
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
+											id="user_code">{data && data.grade}</a>
+                  </div>
+                  <div className="headphoto mt14">
+                    <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/>
+                  </div>
+                  <div className="fl headtab">
+                    <span>{is_current ? "我":"TA"}的粉丝</span>
+                    <a style={{ cursor: 'default' }}
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
+											id="user_h_fan_count">{data && data.fan_count}</a>
+                  </div>
+                  <em className="v-h-line fl"></em>
+                  <div className="fl headtab">
+                    <span>{is_current ? "我":"TA"}的关注</span>
+                    <a style={{ cursor: 'default' }}
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
+										>{data && data.follow_count}</a>
+                  </div>
+                  <span className="clearfix"></span>
+                  <span className="myName">{data && data.name}</span>
+                </div>
+              </div>
+              <div className="educontent mt10 clearfix edu-txt-center">
+                <div className="inline">
+                  {
+                    data && is_current == false && data.identity =="学生" ? "" : <span className="mypost fl mr10">{data && data.identity}</span>
+                  }
+                  <a
+										 // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/authentication` :"javascript:void(0)"}
+										 // target="_blank"
+										 className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
+                    <Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
+                      <i className={ data && data.authentication ? "iconfont icon-shenfenrenzheng font-13 color-blue":"iconfont icon-shenfenrenzheng font-13 color-grey-9"}></i>
+                    </Tooltip>
+                  </a>
+                  <a
+										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/professional_certification` :"javascript:void(0)"}
+										// target="_blank"
+										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
+                    <Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>
+                      <i className={ data && data.professional_certification ? "iconfont icon-zhiyerenzheng font-13 color-blue":"iconfont icon-zhiyerenzheng font-13 color-grey-9"}></i>
+                    </Tooltip>
+                  </a>
+                  <a
+										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/change_or_bind?type=phone` :"javascript:void(0)"}
+										// target="_blank"
+										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
+                    <Tooltip placement='bottom' title={ data && data.phone_binded ?"已手机认证":"未手机认证"}>
+                      <i className={ data && data.phone_binded ? "iconfont icon-shoujirenzheng font-13 color-blue":"iconfont icon-shoujirenzheng font-13 color-grey-9"}></i>
+                    </Tooltip>
+                  </a>
+                  <a
+										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/my/account` :"javascript:void(0)"}
+										// target="_blank"
+										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
+                    <Tooltip placement='bottom' title={ data && data.email_binded ?"已邮箱认证":"未邮箱认证"}>
+                      <i className={ data && data.email_binded ? "iconfont icon-youxiangrenzheng font-13 color-blue":"iconfont icon-youxiangrenzheng font-13 color-grey-9"}></i>
+                    </Tooltip>
+                  </a>
+                  {/* <!--学院管理员身份--> */}
+                  {
+                    data && data.college_identifier &&
+                    <a
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/colleges/${data.college_identifier}/statistics`} target="_blank"
+											className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
+                      <Tooltip placement='bottom' title="学院管理员">
+                        <i className="iconfont icon-chengyuanguanli font-12 color-blue" data-tip-down="学院管理员"></i>
+                      </Tooltip>
+                    </a>
+                  }
+                </div>
+              </div>
+              <div className="mt15 educontent clearfix edu-txt-center">
+                <p className="mb20" style={{"height": "28px"}}>
+                  {
+                    is_edit && is_current ? 
+                    <input type="text" id="mysign" class="mysign-input" placeholder="请输入您的个性签名" style={{height:"20px"}} value={sign} onInput={this.inputSign} onBlur={this.savemysign}/>
+                    :
+                    is_current ? 
+                    <a className="mysign-span" onClick={this.editmysign} style={{"display": "block"}}>{sign || "这家伙很懒，什么都没留下~"}</a>
+                    :
+                    <span className="mysign-span" style={{"display": "block","cursor":"default"}}>{sign || "这家伙很懒，什么都没留下~"}</span>
+                  }
+                </p>
+                {
+                  is_current ? 
+                  <div className="inline">
+                    {
+                      data && data.attendance_signed ? 
+                      <React.Fragment>
+                        <span className="user_default_btn user_grey_btn mb5">已签到</span>
+                        <p id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
+                      </React.Fragment>
+                      :
+                      <a herf="javascript:void(0);" onClick={this.props.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
+                      // <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
+                    }
+                  </div> 
+                  :
+                  <div className="inline">
+                    <a href="javascript:void(0);" onClick={this.props.followPerson} className="user_default_btn user_watch_btn user_private_btn fl mr20">{followed ? "取消关注":"关注"}</a>
+                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/messages/${login}/message_detail?target_ids=${id}`} className="user_default_btn user_private_btn fl">私信</a>
+                  </div>
+                }
+              </div>
+              <div className="edu-txt-center navInfo">
+                <div className="inline">
+                  <li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>
+                    <Link
+                      onClick={() => this.setState({moduleName: 'courses'})}
+                      to={`/users/${username}/courses`}>课堂</Link>
+                  </li>
+                  <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
+                    <Link
+                      onClick={() => this.setState({moduleName: 'shixuns'})}
+                      to={`/users/${username}/shixuns`}>实训</Link>
+                  </li>
+                  <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
+                    <Link 
+                      onClick={() => this.setState({moduleName: 'paths'})}
+                      to={`/users/${username}/paths`}>实践课程</Link>
+                  </li>
+                  <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
+                 <Link
+                      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>
+
+                  {/*{ data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}*/}
+                  
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+    )
+  }
+}
 export default banner_out;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/video/EditVideoModal.js b/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
index fc05cc932..7420d6750 100644
--- a/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
+++ b/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
@@ -63,7 +63,17 @@ function EditVideoModal (props) {
             onOk={onOk}
             onCancel={onCancel}
             className="editVideoModal"
-        >
+        >     <style>
+            {
+                `
+                .exercicenewinputysl .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+            }
+        </style>
             <Form.Item
                 label="视频标题"
                 className="title formItemInline"
@@ -76,8 +86,8 @@ function EditVideoModal (props) {
                         max: MAX_LENGTH, message: '最大限制为30个字符',
                     }],
                 })(
-                    <Input placeholder="" className="titleInput" maxLength={MAX_LENGTH}
-                            suffix={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
+                    <Input placeholder="" className="titleInput exercicenewinputysl" maxLength={MAX_LENGTH}
+                           addonAfter={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
                 )}
             </Form.Item>
         </ModalWrapper>
diff --git a/public/react/src/modules/user/usersInfo/video/VideoUpload.js b/public/react/src/modules/user/usersInfo/video/VideoUpload.js
index 26036529a..8efc308a7 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoUpload.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoUpload.js
@@ -36,13 +36,23 @@ function VideoUpload (props) {
                     <ActionBtn className="" onClick={() => cancelUpload(index, loaded == '100' )}>{loaded == '100' ? "删除" : "取消上传"}</ActionBtn>
                 </div>
             </div>
-            
+          <style>
+            {
+              `
+                .titleInputysl .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+            }
+          </style>
             <div className="courseForm">
                 <span className="titleLabel">标题：</span>
-                <Input placeholder={`标题支持最多${MAX_LENGTH}个字符`} onInput={titleChange} maxLength={MAX_LENGTH} suffix={
+                <Input placeholder={`标题支持最多${MAX_LENGTH}个字符`} onInput={titleChange} maxLength={MAX_LENGTH} addonAfter={
                         <span className="color-grey-6 font-13">{String(title.length)}/{MAX_LENGTH}</span>
                     }
-                    className="titleInput"
+                    className="titleInput titleInputysl"
                 ></Input>
             </div>
         </div>
diff --git a/public/react/src/public-path.js b/public/react/src/public-path.js
new file mode 100644
index 000000000..d154b8ad7
--- /dev/null
+++ b/public/react/src/public-path.js
@@ -0,0 +1,6 @@
+/*global __webpack_public_path__ */
+if (window.location.host == 'pre-newweb.educoder.net') {
+    __webpack_public_path__ = 'http://testali-cdn.educoder.net/react/build/'
+} else if (window.location.host == 'www.educoder.net') {
+    __webpack_public_path__ = 'https://ali-newweb.educoder.net/react/build/'
+}
\ No newline at end of file