Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -346,18 +346,28 @@ class NewShixunModel extends Component{
 
 				<Drawer
 					placement="bottom"
-					closable={false}
+					closable={true}
 					destroyOnClose={true}
+					onClose={()=>this.props.hideNewShixunModelType()}
 					visible={this.props.NewShixunModelType}
 					height={'100%'}
 				>
 					<Spin spinning={this.state.isspinning}>
-					<div className={"clearfix educontent pr"}>
+					<div className={"clearfix educontent pr mb100"}>
 
 						<div className={"square-list clearfix"}>
 
 							<div className="newshixunheadersear">
 								<div style={{height:"53px"}}></div>
+								<style>
+									{
+										`
+										.ant-input, .ant-input .ant-input-suffix{
+   											background-color: #fff !important;
+										}
+										`
+									}
+								</style>
 								<Search
 									style={{ width: "800px"}}
 									className="packinput"
@@ -378,8 +388,8 @@ class NewShixunModel extends Component{
 									<span className="fl color-grey-9 pointer mr30">
 										<a className={" color-grey-6"} onClick={()=>this.updatedlist(order)}>学习人数</a>
 										<sapn className="relativef ml5 " >
-											<i className={order==="desc"?"iconfont icon-sanjiaoxing-up font-12 ntopsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-up font-12 ntopsj  color-grey-9"}></i>
+											<i className={order==="asc"?"iconfont icon-sanjiaoxing-up font-12 ntopsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-up font-12 ntopsj  color-grey-9"}></i>
-											<i className={order==="asc"?"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj  color-grey-9"}></i>
+											<i className={order==="desc"?"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj  color-grey-9"}></i>
 										</sapn>
 									</span>
 
@@ -397,8 +407,8 @@ class NewShixunModel extends Component{
 								</div>
 
 								<div className="font-12 alltopiscright ml25 fr">
-									<span className={"fr pointer color-grey-3"}  onClick={()=>this.props.hideNewShixunModelType()}>返回</span>
+									{/*<span className={"fr pointer color-grey-3"}  onClick={()=>this.props.hideNewShixunModelType()}>返回</span>*/}
-									<span className={type==="mine"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的实训</span>
+									<span className={type==="mine"?"fr topcsactive pointer color-grey-3 color-blue":"fr pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的实训</span>
 									<span className={type==="all"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"}  onClick={()=>this.belongto("all")}>全部实训</span>
 								</div>
 
@@ -511,15 +521,21 @@ class NewShixunModel extends Component{
 								:shixun_list.length===0? <NoneData></NoneData>:""
 							}
 
-							{
+
-								shixun_list===undefined?"":shixun_list.length===0?"":<div className={" edu-txt-center padding20-30"}>
-								<Button className={"mr20 newshixunmode"} onClick={()=>this.props.hideNewShixunModelType()}>取消</Button>
-								<Button className={"newshixunmode"} type="primary" onClick={()=>this.savecouseShixunModal()} loading={this.state.hometypepvisible}>确定</Button>
-							</div>}
 
 						</div>
 
 					</div>
+
+						<div className="clearfix bor-bottom-greyE edu-back-white orderingbox newshixunbottombtn"
+
+						>
+							{
+								shixun_list===undefined?"":shixun_list.length===0?"":<div className={" edu-txt-center padding13-30"}>
+									<Button className={"mr20 newshixunmode"} onClick={()=>this.props.hideNewShixunModelType()}>取消</Button>
+									<Button className={"newshixunmode mr70"} type="primary" onClick={()=>this.savecouseShixunModal()} loading={this.state.hometypepvisible}>确定</Button>
+								</div>}
+						</div>
 					</Spin>
 				</Drawer>
 			</div>

public/react/src/modules/courses/coursesPublic/Newshixunmodel.css

@@ -195,7 +195,7 @@
     width: 100px;
     height: 38px;
     border-radius: 3px;
-    border: 1px solid rgba(191,191,191,1);
+    /*border: 1px solid rgba(191,191,191,1);*/
 }
 
 .ntopsj {
@@ -248,3 +248,22 @@
     color: #4CACFF;
 }
 
+.newshixunbottombtn{
+    position: fixed;
+    z-index: 1000;
+    bottom: 0px;
+    width: 100%;
+    height: 63px;
+    background: rgba(255,255,255,1);
+    box-shadow: 0px -4px 4px 0px rgba(0,0,0,0.05);
+}
+
+
+.mb100{
+    margin-bottom: 100px !important;
+}
+
+.padding13-30 {
+    padding: 13px 30px;
+    box-sizing: border-box;
+}