Skip to content

Commit

Permalink
Merge pull request #17 from syntou/master
Browse files Browse the repository at this point in the history
add body
  • Loading branch information
hamono authored Jan 30, 2020
2 parents 02274c2 + b4ae7da commit 9a83818
Show file tree
Hide file tree
Showing 28 changed files with 285 additions and 0 deletions.
Binary file added src/views/Body/BaiNianJi/Left/Down/Down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/views/Body/BaiNianJi/Left/Down/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import * as React from "react";
import * as style from "./style.scss";
import img from "./Down.png";
export default function Down(){

return <div className={style.a}>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>拜年祭单品</a>
</div>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>拜年祭单品</a>
</div>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>拜年祭单品</a>
</div>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>拜年祭单品</a>
</div>


</div>
}
19 changes: 19 additions & 0 deletions src/views/Body/BaiNianJi/Left/Down/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.a{
display: flex;

}
.c{display:flex;
flex-direction:column;
margin-right: 10px;
}
.d{
display: flex;
font-size: x-small;
color:gray;

}
.b{
font-size: large;
display: flex;
color: black;
}
Binary file added src/views/Body/BaiNianJi/Left/Up/Up2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/views/Body/BaiNianJi/Left/Up/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import * as React from "react";
import * as style from "./style.scss";
import img from "./Up2.png";

export default function Up(){

return <div >
<a href="#" > <img src={img}/></a>
<a href="#" className={style.a}> 2020拜年祭</a>
</div>
}
4 changes: 4 additions & 0 deletions src/views/Body/BaiNianJi/Left/Up/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.a{
font-size: large;
color: black;
}
14 changes: 14 additions & 0 deletions src/views/Body/BaiNianJi/Left/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as React from "react";
import * as style from "./style.scss";
import Up from "./Up";
import Down from "./Down";

export default function Left(){

return <div className={style.a}>
<Up />

<Down />

</div>
}
7 changes: 7 additions & 0 deletions src/views/Body/BaiNianJi/Left/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.a{
height: 270px;
display: flex;
flex-direction:column;


}
Binary file added src/views/Body/BaiNianJi/Right/Right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/views/Body/BaiNianJi/Right/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import * as React from "react";
import * as style from "./style.scss";
import img from "./Right.png";




export default function Right(){
return <div className={style.a}>


<a href="#"className={style.b}> <img src={img}/></a>

</div>

}
10 changes: 10 additions & 0 deletions src/views/Body/BaiNianJi/Right/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.a{
float:right;
width:13%;
display: flex;

}
.b{
height:210px;
}

14 changes: 14 additions & 0 deletions src/views/Body/BaiNianJi/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as React from "react";
import * as style from "./style.scss";
import Left from "./Left";
import Right from "./Right";

export default function TuiGuang(){

return <div className={style.a}>
<Left />

<Right />

</div>
}
8 changes: 8 additions & 0 deletions src/views/Body/BaiNianJi/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.a{
height: 270px;
display: flex;

align-items: center;


}
Binary file added src/views/Body/TuiGuang/Left/Down/Down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/views/Body/TuiGuang/Left/Down/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import * as React from "react";
import * as style from "./style.scss";
import img from "./Down.png";
export default function Down(){

return <div className={style.a}>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>这是标题</a>
<a href="#" className={style.d}>up up主名字</a></div>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>这是标题</a>
<a href="#" className={style.d}>up up主名字</a></div>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>这是标题</a>
<a href="#" className={style.d}>up up主名字</a></div>
<div className={style.c}>
<a href="#" className={style.d}>
<img src={img}/></a> <a href="#" className={style.b}>这是标题</a>
<a href="#" className={style.d}>up up主名字</a></div>


</div>
}
19 changes: 19 additions & 0 deletions src/views/Body/TuiGuang/Left/Down/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.a{
display: flex;

}
.c{display:flex;
flex-direction:column;
margin-right: 10px;
}
.d{
display: flex;
font-size: x-small;
color:gray;

}
.b{
font-size: large;
display: flex;
color: black;
}
Binary file added src/views/Body/TuiGuang/Left/Up/Up1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/views/Body/TuiGuang/Left/Up/Up2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/views/Body/TuiGuang/Left/Up/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as React from "react";
import * as style from "./style.scss";
import img from "./Up2.png";
import rpg from "./Up1.png";
export default function Up(){

return <div >
<a href="#" > <img src={img}/></a>
<a href="#" > <img src={rpg}/></a>
<a href="#" className={style.c}>实时热点</a>
<a href="#" > <img src={rpg}/></a>
<a href="#" className={style.c}>实时热点</a>
</div>
}
3 changes: 3 additions & 0 deletions src/views/Body/TuiGuang/Left/Up/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.c{
color: darken($color: #000000, $amount: 0);
}
14 changes: 14 additions & 0 deletions src/views/Body/TuiGuang/Left/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as React from "react";
import * as style from "./style.scss";
import Up from "./Up";
import Down from "./Down";

export default function Left(){

return <div className={style.a}>
<Up />

<Down />

</div>
}
7 changes: 7 additions & 0 deletions src/views/Body/TuiGuang/Left/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.a{
height: 270px;
display: flex;
flex-direction:column;


}
Binary file added src/views/Body/TuiGuang/Right/Right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/views/Body/TuiGuang/Right/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import * as React from "react";
import * as style from "./style.scss";
import img from "./Right.png";




export default function Left(){
return <div className={style.a}>

<div className={style.b}> <a href="#">在线列表</a></div>
<a href="#"className={style.c}> <img src={img}/></a>

</div>

}
21 changes: 21 additions & 0 deletions src/views/Body/TuiGuang/Right/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.a{
float:right;
width:13%;
display: flex;
flex-direction:column;

justify-content: space-between;

}

.b{
text-align: center;

height: 20px;
width:270px;
background-color: rgb(240, 236, 236);
margin-bottom: 10px;
}
.c{
height: 200px;
}
14 changes: 14 additions & 0 deletions src/views/Body/TuiGuang/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as React from "react";
import * as style from "./style.scss";
import Left from "./Left";
import Right from "./Right";

export default function TuiGuang(){

return <div className={style.a}>
<Left />

<Right />

</div>
}
8 changes: 8 additions & 0 deletions src/views/Body/TuiGuang/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.a{
height: 270px;
display: flex;
justify-content: space-between;
align-items: center;

width: 80%;
}
14 changes: 14 additions & 0 deletions src/views/Body/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
import * as React from "react";
import * as style from "./style.scss";
<<<<<<< HEAD
import DianShiJu from "./DianShiJu";
import TuiGuang from "./TuiGuang";
import BaiNianJi from "./BaiNianJi";
import Top from "./Top"
=======
import First from "./First";
import Top from "./Top";
import Second from "./Second";
>>>>>>> 1578e0b41d9a951fbb51d4a48186315561be698f

export default function Body() {
return <div className={style.a}>
<Top />
<<<<<<< HEAD
<TuiGuang />
<BaiNianJi />
<DianShiJu />

=======
<First />
<Second />
>>>>>>> 1578e0b41d9a951fbb51d4a48186315561be698f
</div>
}

0 comments on commit 9a83818

Please sign in to comment.