Skip to content

B
biz.qingxiao.com
Commit fdf0076f authored by baixian's avatar baixian
Browse files
Options

bug修改

parents 551c84a1 012b7c67
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 19 deletions
index.html
View file @ fdf0076f
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="dist/main.js?1574825757558" charset="utf-8"></script> <script src="dist/main.js?1574827384999" charset="utf-8"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/pages/coursegather/detail/CourseDetail.js
View file @ fdf0076f
...@@ -234,6 +234,8 @@ class CourseDetailForm extends React.Component { ...@@ -234,6 +234,8 @@ class CourseDetailForm extends React.Component {
choosePoster, choosePoster,
materiaListTotal, materiaListTotal,
toChangePsd, toChangePsd,
screenIsBig,
collapsed,
} = this.props; } = this.props;
const formItemModalLineLayout = { const formItemModalLineLayout = {
labelCol: { labelCol: {
...@@ -389,10 +391,18 @@ class CourseDetailForm extends React.Component { ...@@ -389,10 +391,18 @@ class CourseDetailForm extends React.Component {
editorUploadAudio={this.courseUploadAudio} editorUploadAudio={this.courseUploadAudio}
/> />
</FormItem> </FormItem>
<FormItem {...formItemModalLineLayout}> <div
<Button loading={editLoading} type="primary" htmlType="submit" style={{ marginRight: 20 }}>保存</Button> className={pageStyle.submitBtnBox}
<Button style={{ marginRight: 20 }}>预览</Button> style={{
</FormItem> left: screenIsBig ? (!collapsed ? '224px' : '104px') : 0, // eslint-disable-line
width: screenIsBig ? (`calc(100% - ${!collapsed ? '244px' : '124px'})`) : '100%', // eslint-disable-line
}}
>
<FormItem {...formItemModalLineLayout} style={{ marginBottom: 0 }}>
<Button loading={editLoading} type="primary" htmlType="submit" style={{ marginRight: 20 }}>保存</Button>
<Button style={{ marginRight: 20 }}>预览</Button>
</FormItem>
</div>
</Form> </Form>
</div> </div>
); );
...@@ -412,6 +422,10 @@ function mapStateToProps(state) { ...@@ -412,6 +422,10 @@ function mapStateToProps(state) {
queryParams, queryParams,
materiaListTotal, materiaListTotal,
} = state.coursegatherdetail; } = state.coursegatherdetail;
const {
screenIsBig,
collapsed,
} = state.webapp;
return { return {
addCourseObj, addCourseObj,
editLoading, editLoading,
...@@ -419,6 +433,8 @@ function mapStateToProps(state) { ...@@ -419,6 +433,8 @@ function mapStateToProps(state) {
materiaList, materiaList,
queryParams, queryParams,
materiaListTotal, materiaListTotal,
screenIsBig,
collapsed,
}; };
} }
export default connect(mapStateToProps)(CourseDetail); export default connect(mapStateToProps)(CourseDetail);
......
src/pages/coursegather/detail/CourseDetail.less
View file @ fdf0076f
.container { .container {
background-color: #fff; background-color: #fff;
padding:0 20px; padding:0 20px;
padding-bottom: 100px;
} }
.modalform { .modalform {
margin-top: 20px; margin-top: 20px;
...@@ -205,3 +206,13 @@ ...@@ -205,3 +206,13 @@
} }
} }
} }
.submitBtnBox {
position: fixed;
bottom: 0;
background-color: #fff;
padding: 20px 20px 14px 20px;
width: 100%;
box-shadow:1px -6px 6px 0px rgba(0, 0, 0, 0.04);
transition: 0.2s left;
transition: 0.1s width;
}
\ No newline at end of file
src/pages/onlineclasses/singleclass/CourseDetail.js
View file @ fdf0076f
...@@ -302,6 +302,8 @@ class CourseDetailForm extends React.Component { ...@@ -302,6 +302,8 @@ class CourseDetailForm extends React.Component {
info, info,
toChangePsd, toChangePsd,
choosePoster, choosePoster,
collapsed,
screenIsBig,
} = this.props; } = this.props;
const formItemModalLineLayout = { const formItemModalLineLayout = {
labelCol: { labelCol: {
...@@ -323,7 +325,6 @@ class CourseDetailForm extends React.Component { ...@@ -323,7 +325,6 @@ class CourseDetailForm extends React.Component {
}; };
const { textLength } = this.state; const { textLength } = this.state;
const { title } = addCourseObj; const { title } = addCourseObj;
console.log(addCourseObj, 'addCourseObj');
const selectBefore = ( const selectBefore = (
<div>{title.length + textLength}/40</div> <div>{title.length + textLength}/40</div>
); );
...@@ -478,11 +479,19 @@ class CourseDetailForm extends React.Component { ...@@ -478,11 +479,19 @@ class CourseDetailForm extends React.Component {
editorUploadAudio={this.courseUploadAudio} editorUploadAudio={this.courseUploadAudio}
/> />
</FormItem> </FormItem>
<FormItem {...formItemModalLineLayout}> <div
<Button loading={editLoading} type="primary" htmlType="submit" style={{ marginRight: 20 }}>保存</Button> className={pageStyle.submitBtnBox}
<Button style={{ marginRight: 20 }}>预览</Button> style={{
<Button onClick={this.toUploadCourseware}>上传课件</Button> left: screenIsBig ? (!collapsed ? '224px' : '104px') : 0, // eslint-disable-line
</FormItem> width: screenIsBig ? (`calc(100% - ${!collapsed ? '244px' : '124px'})`) : '100%', // eslint-disable-line
}}
>
<FormItem {...formItemModalLineLayout} style={{ marginBottom: 0 }}>
<Button loading={editLoading} type="primary" htmlType="submit" style={{ marginRight: 20 }}>保存</Button>
{/* <Button style={{ marginRight: 20 }}>预览</Button> */}
<Button onClick={this.toUploadCourseware}>上传课件</Button>
</FormItem>
</div>
</Form> </Form>
<MaterialModal <MaterialModal
visible={materialVisible} visible={materialVisible}
...@@ -520,6 +529,7 @@ function mapStateToProps(state) { ...@@ -520,6 +529,7 @@ function mapStateToProps(state) {
const { const {
info, info,
} = state.uploadcourseware; } = state.uploadcourseware;
const { collapsed, screenIsBig } = state.webapp;
return { return {
addCourseObj, addCourseObj,
editLoading, editLoading,
...@@ -529,6 +539,8 @@ function mapStateToProps(state) { ...@@ -529,6 +539,8 @@ function mapStateToProps(state) {
materiaListTotal, materiaListTotal,
coursewareInfo, coursewareInfo,
info, info,
collapsed,
screenIsBig,
}; };
} }
export default connect(mapStateToProps)(CourseDetail); export default connect(mapStateToProps)(CourseDetail);
......
src/pages/onlineclasses/singleclass/CourseDetail.less
View file @ fdf0076f
.container { .container {
background-color: #fff; background-color: #fff;
padding:0 20px; padding:0 20px;
padding-bottom: 100px;
} }
.modalform { .modalform {
margin-top: 20px; margin-top: 20px;
...@@ -205,3 +206,13 @@ ...@@ -205,3 +206,13 @@
} }
} }
} }
.submitBtnBox {
position: fixed;
bottom: 0;
background-color: #fff;
padding: 20px 20px 14px 20px;
width: 100%;
box-shadow:1px -6px 6px 0px rgba(0, 0, 0, 0.04);
transition: 0.2s left;
transition: 0.1s width;
}
\ No newline at end of file
src/pages/onlineclasses/singleclass/singleDetail.js
View file @ fdf0076f
...@@ -300,23 +300,23 @@ class singleDetailForm extends React.Component { ...@@ -300,23 +300,23 @@ class singleDetailForm extends React.Component {
<Radio.Group onChange={this.posterChange} value={this.state.choosedPoster || addCourseObj.poster}> <Radio.Group onChange={this.posterChange} value={this.state.choosedPoster || addCourseObj.poster}>
<Row className={`${pageStyle.posterSetBox} posterSetBox`}> <Row className={`${pageStyle.posterSetBox} posterSetBox`}>
<Col span={6} style={{ marginBottom: '10px' }}> <Col span={6} style={{ marginBottom: '10px' }}>
<Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="clock-test/member/12186/2019-11-26/f766995d6957b3ff91c983d97514986b.jpg"> <Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="qingxiao/biz/image/course/poster/1.png">
<img className={pageStyle.posterImg} src="https://cdn.img.shangjiadao.cn/clock-test/member/12186/2019-11-26/f766995d6957b3ff91c983d97514986b.jpg" alt="" /> <img className={pageStyle.posterImg} src={`${__IMGCDN__}course/poster/1.png`} alt="" />
</Radio> </Radio>
</Col> </Col>
<Col span={6} style={{ marginBottom: '10px' }}> <Col span={6} style={{ marginBottom: '10px' }}>
<Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="clock-test/member/12186/2019-11-26/b8d7da24f8bd0a1efa23e0cab68efc64.jpg"> <Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="qingxiao/biz/image/course/poster/2.png">
<img className={pageStyle.posterImg} src="https://cdn.img.shangjiadao.cn/clock-test/member/12186/2019-11-26/b8d7da24f8bd0a1efa23e0cab68efc64.jpg" alt="" /> <img className={pageStyle.posterImg} src={`${__IMGCDN__}course/poster/2.png`} alt="" />
</Radio> </Radio>
</Col> </Col>
<Col span={6} style={{ marginBottom: '10px' }} > <Col span={6} style={{ marginBottom: '10px' }} >
<Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="clock-test/member/12186/2019-11-26/0b6647b87af063e90288286cda9c7a1d.jpg"> <Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="qingxiao/biz/image/course/poster/3.png">
<img className={pageStyle.posterImg} src="https://cdn.img.shangjiadao.cn/clock-test/member/12186/2019-11-26/0b6647b87af063e90288286cda9c7a1d.jpg" alt="" /> <img className={pageStyle.posterImg} src={`${__IMGCDN__}course/poster/3.png`} alt="" />
</Radio> </Radio>
</Col> </Col>
<Col span={6} style={{ marginBottom: '10px' }} > <Col span={6} style={{ marginBottom: '10px' }} >
<Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="clock-test/member/12186/2019-11-26/dcedfa5eb225dbb7f05ae729ae05a5d7.jpg"> <Radio id="1" style={{ display: 'flex', alignItems: 'flex-start' }} value="qingxiao/biz/image/course/poster/4.png">
<img className={pageStyle.posterImg} src="https://cdn.img.shangjiadao.cn/clock-test/member/12186/2019-11-26/dcedfa5eb225dbb7f05ae729ae05a5d7.jpg" alt="" /> <img className={pageStyle.posterImg} src={`${__IMGCDN__}course/poster/4.png`} alt="" />
</Radio> </Radio>
</Col> </Col>
</Row> </Row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment