Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js

@@ -277,7 +277,7 @@ class CommonWorkAppraiseReply extends Component{
               showModulationtype={this.showModulationtype}
               addSuccess={this.addSuccess} ref={this.editorRef} totalCount={comment_scores.length}
               onReply={this.onReply} placeholder={"请在此输入对本作品的评语，最大限制2000个字符"}
-              showSameScore={isGroup}
+              showSameScore={isGroup && isAdmin}
             ></GraduationTasksappraiseMainEditor> }
           </div>
           {/* ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} */}

public/react/src/modules/courses/members/teacherList.js

@@ -39,15 +39,17 @@ function buildColumns(that) {
     render: (content, item, index) => {
       return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}　</a>
     }
-  },{
+  }
-    title: '用户ID',
+  // ,{
-    width: 120,
+  //   title: '用户ID',
-    dataIndex: 'login',
+  //   width: 120,
-    key: 'login',
+  //   dataIndex: 'login',
-    render: (login, record) => {
+  //   key: 'login',
-      return <span className="overflowHidden1" style={{ maxWidth: '110px'}} title={`${login.length > 8 ? login : ''}`}>{login}</span>
+  //   render: (login, record) => {
-    }
+  //     return <span className="overflowHidden1" style={{ maxWidth: '110px'}} title={`${login.length > 8 ? login : ''}`}>{login}</span>
-  }, {
+  //   }
+  // }
+  , {
     title: '姓名',
     dataIndex: 'name',
     width: 120,