Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -75,7 +75,7 @@ function ChangeRolePop({ member_roles = [], record, courseId, onChangeRoleSucces
                 </Checkbox.Group>
             }
             >
-            <WordsBtn style={'blue'}>修改角色</WordsBtn>
+            <WordsBtn style={'blue'} style2={props.style}>修改角色</WordsBtn>
         </Popconfirm>
     )
 }

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

@@ -134,7 +134,7 @@ function CourseGroupListTable(props) {
                     {isAdmin && <WordsBtn style2={{ marginRight: '12px' }} data-clipboard-text={record.invite_code} 
                         className={`copyBtn_${record.id}`} style={''}>复制邀请码</WordsBtn>    }  
                     {isStudent && <WordsBtn style2={{ marginRight: '12px' }} onClick={() => addToDir(record)} style={''}>加入分班</WordsBtn>}        
-                    <WordsBtn style2={{ marginRight: '12px' }} onClick={() => onGoDetail(record)} style={''}>查看</WordsBtn>              
+                    <WordsBtn  onClick={() => onGoDetail(record)} style={''}>查看</WordsBtn>              
                 </React.Fragment>
             }
         })

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

@@ -148,8 +148,9 @@ const buildColumns = (that,isParent) => {
       render: (text, record) => {
         return (
           <React.Fragment>
-            <WordsBtn style2={{ marginRight: '12px' }} onClick={() => that.onDelete(record)} style={'grey'}>删除学生</WordsBtn>              
+            <WordsBtn  onClick={() => that.onDelete(record)} style={'grey'}>删除学生</WordsBtn>              
             {record.member_roles && record.member_roles.length && <ChangeRolePop
+              style={{ marginLeft: '12px' }}
               courseId={courseId}
               record={record}
               member_roles={record.member_roles}