Merge branch 'feature/zhujian/0726/qwLiving' into 'master'

Feature/zhujian/0726/qw living

See merge request !88

src/modules/course-manage/components/AddLiveBasic.jsx

@@ -106,6 +106,7 @@ class AddLiveBasic extends React.Component {
           <span className='label'>
           <span className='label'>
             <span className='require'>*</span>课程名称：
             <span className='require'>*</span>课程名称：
           </span>
           </span>
+          <div id="courseName" style={{display:"inline-block"}}>
           <Input
           <Input
           className={_.find(this.props.exItems,(item)=>{return item === "courseName"})?"err":""}
           className={_.find(this.props.exItems,(item)=>{return item === "courseName"})?"err":""}
             value={courseName}
             value={courseName}
@@ -117,6 +118,7 @@ class AddLiveBasic extends React.Component {
             }}
             }}
           />
           />
           </div>
           </div>
+        </div>
         <div className='course-cover'>
         <div className='course-cover'>
           <span className='label'>封面图：</span>
           <span className='label'>封面图：</span>
 
 
@@ -146,6 +148,7 @@ class AddLiveBasic extends React.Component {
           <span className='label'>
           <span className='label'>
             <span className='require'>*</span>课程分类：
             <span className='require'>*</span>课程分类：
           </span>
           </span>
+          <div id="categoryId" style={{display:"inline-block"}}>
           <CourseCatalogSelect
           <CourseCatalogSelect
             className={_.find(this.props.exItems,(item)=>{return item === "categoryId"})?"err":""}
             className={_.find(this.props.exItems,(item)=>{return item === "categoryId"})?"err":""}
             value={categoryId}
             value={categoryId}
@@ -154,6 +157,7 @@ class AddLiveBasic extends React.Component {
             }}
             }}
           />
           />
           </div>
           </div>
+        </div>
         {showSelectFileModal && (
         {showSelectFileModal && (
           <SelectPrepareFileModal
           <SelectPrepareFileModal
             key='basic'
             key='basic'

src/modules/course-manage/components/LiveCourseList.jsx

@@ -248,7 +248,7 @@ class LiveCourseList extends React.Component {
         },
         },
         {
         {
           title: '课件管理',
           title: '课件管理',
-          width: '8%',
+          width: '75px',
           key: 'courseware',
           key: 'courseware',
           dataIndex: 'courseware',
           dataIndex: 'courseware',
           render: (val, item) => {
           render: (val, item) => {