Skip to content

M
mr-julyedu
Commit 90dde704 by wangshuo
Options

no message

parent 8d1f956d
Showing with 144 additions and 109 deletions
build/asset-manifest.json
......@@ -88,9 +88,9 @@
"intelligent-recommend.css": "/mrstaticcss/intelligent-recommend.19b3a957.chunk.css",
"intelligent-recommend.js": "/mrstaticjs/intelligent-recommend.516dee6a.chunk.js",
"intelligent-recommend.js.map": "/mrstaticjs/intelligent-recommend.516dee6a.chunk.js.map",
"main.css": "/mrstaticcss/main.b7994aad.chunk.css",
"main.js": "/mrstaticjs/main.eb917e47.chunk.js",
"main.js.map": "/mrstaticjs/main.eb917e47.chunk.js.map",
"main.css": "/mrstaticcss/main.87b2601f.chunk.css",
"main.js": "/mrstaticjs/main.5dc15b7d.chunk.js",
"main.js.map": "/mrstaticjs/main.5dc15b7d.chunk.js.map",
"ml.css": "/mrstaticcss/ml.15e06c2d.chunk.css",
"ml.js": "/mrstaticjs/ml.77e15191.chunk.js",
"ml.js.map": "/mrstaticjs/ml.77e15191.chunk.js.map",
......@@ -248,7 +248,7 @@
"mrstaticcss/deposit-pay-order.b5ee5089.chunk.css.map": "/mrstaticcss/deposit-pay-order.b5ee5089.chunk.css.map",
"mrstaticcss/detail.13b70f46.chunk.css.map": "/mrstaticcss/detail.13b70f46.chunk.css.map",
"mrstaticcss/intelligent-recommend.19b3a957.chunk.css.map": "/mrstaticcss/intelligent-recommend.19b3a957.chunk.css.map",
"mrstaticcss/main.b7994aad.chunk.css.map": "/mrstaticcss/main.b7994aad.chunk.css.map",
"mrstaticcss/main.87b2601f.chunk.css.map": "/mrstaticcss/main.87b2601f.chunk.css.map",
"mrstaticcss/ml.15e06c2d.chunk.css.map": "/mrstaticcss/ml.15e06c2d.chunk.css.map",
"mrstaticcss/mlShare.0f4048d9.chunk.css.map": "/mrstaticcss/mlShare.0f4048d9.chunk.css.map",
"mrstaticcss/myorders.ecece78a.chunk.css.map": "/mrstaticcss/myorders.ecece78a.chunk.css.map",
......@@ -274,14 +274,14 @@
"mrstaticmedia/iconfont.css": "/mrstaticmedia/iconfont.fa64fbc4.ttf",
"mrstaticmedia/kanjia_cg_icon.png": "/mrstaticmedia/kanjia_cg_icon.81a489ac.png",
"mrstaticmedia/video.scss": "/mrstaticmedia/progress-share-bg.80011994.png",
"precache-manifest.83a9f410c4fa22ec5c6dba39681c99d3.js": "/precache-manifest.83a9f410c4fa22ec5c6dba39681c99d3.js",
"precache-manifest.f10a4887dcd5a6a3fa6731841a4c74fe.js": "/precache-manifest.f10a4887dcd5a6a3fa6731841a4c74fe.js",
"service-worker.js": "/service-worker.js"
},
"entrypoints": [
"mrstaticjs/runtime-main.1f286ea2.js",
"mrstaticcss/51.93a9580a.chunk.css",
"mrstaticjs/51.3594b5c0.chunk.js",
"mrstaticcss/main.b7994aad.chunk.css",
"mrstaticjs/main.eb917e47.chunk.js"
"mrstaticcss/main.87b2601f.chunk.css",
"mrstaticjs/main.5dc15b7d.chunk.js"
]
}
\ No newline at end of file
build/mrstaticcss/main.87b2601f.chunk.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticcss/main.87b2601f.chunk.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticcss/main.b7994aad.chunk.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticcss/main.b7994aad.chunk.css.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/main.eb917e47.chunk.js → build/mrstaticjs/main.5dc15b7d.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/main.5dc15b7d.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/main.eb917e47.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.83a9f410c4fa22ec5c6dba39681c99d3.js → build/precache-manifest.f10a4887dcd5a6a3fa6731841a4c74fe.js
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "4880a1704f2363a58dd664684c7b9fd4",
"revision": "df839a4aa8513c6a0fc2453220646879",
"url": "/index.html"
},
{
......@@ -180,8 +180,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/mrstaticcss/intelligent-recommend.19b3a957.chunk.css"
},
{
"revision": "cb105bd4472b59f1e7e2",
"url": "/mrstaticcss/main.b7994aad.chunk.css"
"revision": "5b7f0243030a60d18537",
"url": "/mrstaticcss/main.87b2601f.chunk.css"
},
{
"revision": "24af764d30d8f8576567",
......@@ -476,8 +476,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/mrstaticjs/intelligent-recommend.516dee6a.chunk.js"
},
{
"revision": "cb105bd4472b59f1e7e2",
"url": "/mrstaticjs/main.eb917e47.chunk.js"
"revision": "5b7f0243030a60d18537",
"url": "/mrstaticjs/main.5dc15b7d.chunk.js"
},
{
"revision": "24af764d30d8f8576567",
......
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts(
"/precache-manifest.83a9f410c4fa22ec5c6dba39681c99d3.js"
"/precache-manifest.f10a4887dcd5a6a3fa6731841a4c74fe.js"
);
self.addEventListener('message', (event) => {
......
src/components/Index/index.scss
......@@ -201,21 +201,24 @@
.teacher{
padding: 15px 15px 40px 15px;
.cont{
font-size: 18px;
padding: 10px 0;
font-size: 16px;
color: #000000;
font-weight: 400;
padding: 6px 0 10px 0;
}
.teabox{
// width: 167px;
.tealist{
display: flex;
height: 167px;
// height: 147px;
border-bottom: 1px solid #F3F4F8;
.pic{
width: 30%;
img{
margin-top: 10%;
width: 90%;
height: 80%;
margin-top: 15%;
width: 89px;
height: 103px;
border-radius: 6px;
}
......@@ -242,18 +245,33 @@
}
}
.desc{
height:90px;
height:70px;
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 5;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
margin-top: 8px;
margin-bottom: 8px;
color: $color_999;
}
&:hover {
// height:200px;
height: auto;
.desc{
height: auto !important;
// word-break: break-all;
text-overflow: clip;
overflow: visible;
display: inline;
// margin-bottom: 8px;
}
}
}
}
.consult{
height: 41px;
......@@ -275,104 +293,115 @@ align-items: center;
}
}
}
.scroll-box2 {
padding: 20px 15px 60px 15px;
width: 100%;
overflow: auto;
position: relative;
margin-top: 15px;
.scroll-list {
height: 207px;
margin: 5px 0;
display: flex;
overflow: hidden;
position: absolute;
padding: 5px;
.scroll-item {
display: inline-block;
width: 153px;
height: 100%;
margin-right: 20px;
box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.1);
background-color: $bg_fff;
border-radius: 5px;
div{
margin-top: 55px;
margin-left: 17px;
margin-right: 16px;
h2{
font-weight: 600;
line-height: 20px;
}
p{
.teaching{
.cont{
font-size: 16px;
color: #000000;
font-weight: 400;
padding: 10px 0;
padding: 15px 0px 0 15px;
}
.scroll-box2 {
padding: 0px 15px 60px 15px;
width: 100%;
overflow: auto;
position: relative;
margin-top: 15px;
.scroll-list {
height: 207px;
margin: 5px 0;
display: flex;
overflow: hidden;
position: absolute;
padding: 5px;
.scroll-item {
display: inline-block;
width: 153px;
height: 100%;
margin-right: 20px;
box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.1);
background-color: $bg_fff;
border-radius: 5px;
div{
margin-top: 55px;
margin-left: 17px;
margin-right: 16px;
h2{
font-weight: 600;
line-height: 20px;
color: #525C65;
}
}
}
li:nth-child(1){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/sanbaiduomingai.png');
background-size:cover;
}
li:nth-child(2){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/sanbaiduowanaixueyuan.png');
background-size:cover;
div{
p:nth-of-type(1){
display: flex;
justify-content: space-between;
}
h2:nth-of-type(2){
margin-top: 20px;
p{
line-height: 20px;
color: #525C65;
}
}
p:nth-of-type(2){
span:nth-child(2){
margin-left: 10px;
}
li:nth-child(1){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/sanbaiduomingai.png');
background-size:cover;
}
li:nth-child(2){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/sanbaiduowanaixueyuan.png');
background-size:cover;
div{
p:nth-of-type(1){
display: flex;
justify-content: space-between;
}
h2:nth-of-type(2){
margin-top: 20px;
}
p:nth-of-type(2){
span:nth-child(2){
margin-left: 10px;
}
}
}
}
}
li:nth-child(3){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/shierweibalabala.png');
background-size:cover;
div{
p{
display: flex;
justify-content: space-between;
li:nth-child(3){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/shierweibalabala.png');
background-size:cover;
div{
p{
display: flex;
justify-content: space-between;
}
}
}
}
li:nth-child(4){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/wubaijiabalabala.png');
background-size:cover;
}
li:nth-child(5){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/shuangyunbalabala.png');
background-size:cover;
p:nth-of-type(2){
margin-top: 10px;
li:nth-child(4){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/wubaijiabalabala.png');
background-size:cover;
}
li:nth-child(5){
background-image: url('https://julyedu-img.oss-cn-beijing.aliyuncs.com/shuangyunbalabala.png');
background-size:cover;
p:nth-of-type(2){
margin-top: 10px;
}
}
}
}
::-webkit-scrollbar {
display: none;
}
/*
横向滚动
*/
.scroll-box2 {
height: 307px;
}
}
::-webkit-scrollbar {
display: none;
}
/*
横向滚动
*/
.scroll-box2 {
height: 307px;
}
......
src/components/Index/teaching/index.js
......@@ -28,7 +28,10 @@ class Teaching extends Component {
render() {
return (
<div className="teaching"><p className="cont">360 教学&就业服务</p>
<div className="scroll-box2">
<ul className="scroll-list">
<li className="scroll-item">
<div>
......@@ -77,7 +80,7 @@ class Teaching extends Component {
</li>
</ul>
</div>
</div>
)
}
}
......
src/components/Index/tercher/index.js
......@@ -10,15 +10,16 @@ class TeacherList extends Component {
this.state = {
data:[],
}
}
componentDidMount() {
http.get(`${API.home}/m/mobTeachers`).then((res) => {
if (res.data.code === 200) {
this.setState({
data:res.data.data
});
console.log(this.state.data)
} else {
Toast.info(res.data.msg, 2)
}
......@@ -39,10 +40,11 @@ class TeacherList extends Component {
<div className="detail">
<h2 className="name"><b>{item.teacher_name}</b></h2>
<p><span className="title">{item.title}</span></p>
<p className="desc">{item.desc}</p>
<p className="desc">{item.desc} </p>
</div>
</div>
})}
</div>
<div className="consult">
<a href="http://q.url.cn/s/Vbkup6m?_type=wpa">咨询更多师资信息</a>
......
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