From cfc789c3d59a57692448a8f13ed886521639fa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 11 Sep 2019 08:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=AE=9E=E8=AE=ADmodels?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/NewShixunModel.js   | 96 ++++++++++++-------
 .../courses/coursesPublic/Newshixunmodel.css  | 47 ++++++++-
 2 files changed, 108 insertions(+), 35 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 3c6b736f6..2294684a7 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import { Modal,Checkbox,Select,Input,Tooltip,Spin,Icon,Drawer,Dropdown,Menu,} from "antd";
+import { Modal,Checkbox,Select,Input,Tooltip,Spin,Icon,Drawer,Dropdown,Menu,Breadcrumb,Pagination,Button} from "antd";
 import axios from'axios';
 import './Newshixunmodel.css';
 const Search = Input.Search;
@@ -15,11 +15,6 @@ class NewShixunModel extends Component{
 
 		// let {Searchvalue,type,hometypepvisible,shixunmodallist,newshixunmodallist,}=this.state;
 		// let {visible,patheditarry}=this.props;
-		const menu = (
-			<Menu>
-				<Menu.Item></Menu.Item>
-			</Menu>
-		);
 
 		const menus = (
 			<Menu>
@@ -90,35 +85,34 @@ class NewShixunModel extends Component{
 
 									<span className="fl color-grey-9 mr20">已选   <span className={"color-blue"}>6</span>   个实训</span>
 									<span className="fl color-grey-9 mr20">共   <span className={"color-blue"}>5</span>  个实训</span>
-									<Dropdown overlay={menu} visible={true}>
-										<span className="fl color-grey-9 pointer mr30">
-											<a>学习人数</a>
-											<sapn className="relativef ml5 " onClick={()=>this.updatedlist(sort_by)}>
-												<i className={"iconfont icon-sanjiaoxing-up font-12 topsj color-blue"}></i>
-												<i className={"iconfont icon-sanjiaoxing-down font-12 yslbottomsj"}></i>
-											</sapn>
-										</span>
-									</Dropdown>
+
+									<span className="fl color-grey-9 pointer mr30">
+										<a className={" color-grey-6"}>学习人数</a>
+										<sapn className="relativef ml5 " onClick={()=>this.updatedlist(sort_by)}>
+											<i className={"iconfont icon-sanjiaoxing-up font-12 ntopsj  color-grey-9 color-blue"}></i>
+											<i className={"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj  color-grey-9"}></i>
+										</sapn>
+									</span>
 
 									<Dropdown overlay={menus}>
-										<a className="ant-dropdown-link" href="#">
-											难度<Icon type="down" />
+										<a className="ant-dropdown-link  color-grey-6">
+											难度<Icon type="down" className={"color-grey-6"}/>
 										</a>
 									</Dropdown>
 								</p>
 
 								<p className="font-12 alltopiscright ml25 fr">
-									<span className="fr mr30 topcsactive pointer">我的实训</span>
-									<span className="fr mr30 topcsactive pointer color-blue">全部实训</span>
+									<span className="fr mr30 topcsactive pointer color-grey-3">我的实训</span>
+									<span className="fr mr30 topcsactive pointer color-grey-3 color-blue">全部实训</span>
 								</p>
 
 							</div>
 
-							<div className="mt20 edu-back-white pd1323 relativef">
+							<div className="mt20 edu-back-white pd20 relativef newshixunlist">
 								<div className="clearfix">
 									<div className="item-body">
-										<div className="clearfix ds pr pt10 contentSection">
-											<a title={""} className="ml10 fl mt3 font-16  color-dark maxwidth900">
+										<div className="clearfix ds pr contentSection">
+											<a title={""} className="ml30 fl font-16  color-dark maxwidth900">
 												移动云启 ——JAVA面向对象
 											</a>
 
@@ -131,24 +125,58 @@ class NewShixunModel extends Component{
 												已被广泛应用于移动及桌面应用程序、Web应用程序、分布式系统和嵌入式系统应用程序等各个领域的软件开发中。
 											</p>
 
-											<p className="color-grey panel-lightgrey mt16 fl">
-													<span className={"topicswidth600"}>
-														<span className="topsics135 color-grey9 mr50">13123</span>
-														<span className="mr50 color-grey9">213次引用</span>
-														<span className="mr50 color-grey9">312次答题</span>
-														<span className="mr50 color-grey9">123</span>
-													</span>
-
-												  <span className={"topsicrelative topsicinline"} title={"123123"}>
-														<div className={"topicsbtn topsicsmax550"}>123123</div>
-													</span>
-											</p>
+											<div className={"newshixunpd030"}>
+												<div className="xuxianpro"></div>
+											</div>
+
+											<p className="color-grey panel-lightgrey fl ml30">
+												<style>
+													{`
+														.ant-breadcrumb-separator{
+														   color: #D7D7D7 !important;
+														}
+														.panel-lightgrey, .panel-lightgrey span{
+															   color: #999 !important;
+														}
+													`}
+												</style>
+												<Breadcrumb separator="|">
+													<Breadcrumb.Item>Home</Breadcrumb.Item>
+													<Breadcrumb.Item>Application Center</Breadcrumb.Item>
+													<Breadcrumb.Item>Application List</Breadcrumb.Item>
+													<Breadcrumb.Item>An Application</Breadcrumb.Item>
+													<Breadcrumb.Item>An Application</Breadcrumb.Item>
+
+												</Breadcrumb>
 
+											</p>
+											<Dropdown overlay={menus}>
+												<a className="ant-dropdown-link fl ml30 newshixunfont12  color-blue" >
+													难度<Icon className={"color-blue"} type="down" />
+												</a>
+											</Dropdown>
 
 										</div>
 									</div>
 								</div>
 							</div>
+
+							<div className={" edu-txt-center pd303010"}>
+								<Pagination
+									showQuickJumper
+									defaultCurrent={1}
+									pageSize={15}
+									// total={datas===undefined?"":datas.task_count}
+									// current={page}
+									// onChange={this.PaginationCourse}
+								/>
+							</div>
+
+							<div className={" edu-txt-center padding20-30"}>
+								<Button className={"mr20 newshixunmode"}>取消</Button>
+								<Button className={"newshixunmode"} type="primary">确定</Button>
+							</div>
+
 						</div>
 
 					</div>
diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
index ec06b1f4b..0d785e9c7 100644
--- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
+++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
@@ -147,11 +147,56 @@
     font-size: 14px;
     font-weight: 400;
     color: #999999;
-    margin-top: 20px;
+    margin-top: 15px;
+    margin-left: 30px;
 }
 
 .newshixunmodelbotfont{
     font-size:12px;
     font-weight:400;
     color:rgba(102,102,102,1);
+    margin-top: 15px;
+    margin-left: 30px;
+}
+
+.newshixunlist{
+    max-height:227px;
+}
+
+.xuxianpro {
+    height: 20px;
+    border-bottom: 1px dashed;
+    border-color: #eaeaea;
+    margin-bottom: 18px;
+}
+
+.newshixunpd030{
+    padding: 0px 30px;
+}
+
+.pd303010{
+    padding: 30px 30px 10px;
+}
+
+.newshixunfont12{
+    font-size: 12px;
+    color: rgba(76,172,255,1);
+    line-height: 21px;
+}
+
+.newshixunmode{
+    width: 100px;
+    height: 38px;
+    border-radius: 3px;
+    border: 1px solid rgba(191,191,191,1);
+}
+
+.ntopsj {
+    position: absolute;
+    top: -4px;
+}
+
+.nyslbottomsj {
+    position: absolute;
+    bottom: -6px;
 }
\ No newline at end of file