Skip to content

提首页修改代码 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glt18 wants to merge 14 commits into
base: master
Choose a base branch
from
Open

提首页修改代码 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d620af
Merge pull request #39 from MoNorth/master
susantong Dec 15, 2016
981ccdb
修改
glt18 Jan 20, 2017
fe638fe
修改
glt18 Jan 20, 2017
0811b20
修改
glt18 Jan 20, 2017
f694083
修改
glt18 Jan 20, 2017
b57ea32
修改
glt18 Jan 20, 2017
8e113a2
修改
glt18 Jan 20, 2017
d82cd07
修改
glt18 Jan 20, 2017
3ab90a1
修改
glt18 Jan 20, 2017
83d0cdc
修改
glt18 Jan 20, 2017
d705505
数据获取
glt18 Jan 20, 2017
3c2b00f
修改
glt18 Jan 20, 2017
3ef8cd6
分类图标
glt18 Jan 20, 2017
2c28514
博主头像
glt18 Jan 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<template>
<div id="app">
<myheader></myheader>

<div id="content">
<classification :empty="data.empty" :baseHeight="true"></classification>

<router-view name="index"></router-view>
</div>

<myfooter :class="data.className"></myfooter>
<backtop></backtop>
</div>
Expand All @@ -17,8 +14,8 @@
import myHeader from './components/public/myHeader.vue'
import myFooter from './components/public/myFooter.vue'
import Backtop from './components/public/Backtop.vue'
import Classification from './components/public/Loading.vue'

import Classification from './components/index/Index.vue'
import Loading from './components/public/Loading.vue'

let data = {
className : "qqq",
Expand All @@ -31,7 +28,8 @@ export default {
myheader : myHeader,
myfooter : myFooter,
backtop : Backtop,
classification : Classification
classification : Classification,
loading: Loading
},
data () {
return {
Expand All @@ -45,9 +43,9 @@ setTimeout(() => data.empty = true, 5000)
</script>

<style>
#content{
width: 200px;
height: 100px;
#app{
min-width: 970px;
/*background-color: #E9E9E9;*/
}

</style>
70 changes: 24 additions & 46 deletions src/components/index/Classification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,28 @@

<template>
<div class="classification">
<p>话题分类</p>
<span>换一批</span>
<!-- <router-link tag="span" to="#">换一批</router-link> -->
<router-link tag="p" to="/classification">话题分类</router-link>
<router-link tag="span" to="/classification">换一批</router-link>
<ul>
<li v-for="classify in data.classifies">
<!-- <div><router-link src="../../static/images/classify.png"></router-link></div> -->
<!-- <router-link tag="span" to="#">{{classify.name}}</router-link> -->
<!-- <router-link tag="p" to="#">{{classify.intro}}</router-link> -->
<div><img src="../../static/images/classify.png"></div>
<div><img :src="classify.imgurl"></div>
<span>{{classify.name}}</span>
<p>{{classify.intro}}</p>
</li>

</ul>
</div>
</template>

<script>
<script>
import getCGI from '../../getCGI/Classification'

let data = {
classifies : [
{
name : '运动',
intro : '哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡',
imgurl : '',
addurl : ''
},
{
name : '娱乐',
intro : '哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡',
imgurl : '',
addurl : '/entertainment'
},
{
name : '健身',
intro : '哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡',
imgurl : '',
addurl : '/exercise'
},
{
name : '养生',
intro : '哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡',
imgurl : '',
addurl : '/health'
},
{
name : '阅读',
intro : '哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡哇卡卡卡卡',
imgurl : '',
addurl : '/read'
}
]
classifies : [],
empty: false
}
getCGI(data)

export default {
name: 'classification',
data() {
Expand All @@ -73,16 +44,21 @@
@hovercolor: #00BDCC;
@font-size: 14px;
width: 20%;
background-color: #F4F4F4;
min-width: 270px;
min-width: 210px;
height: 400px;
overflow: hidden;
background-color: #fff;
margin-bottom: 10px;
>p {
cursor: pointer;
color: @color - 20;
font-size: @font-size + 5;
font-weight: bolder;
padding-left: 2%;
margin-right: 3%;
margin-right: 40%;
line-height: 40px;
float: left;
margin-bottom: 0;
&:hover{
border-left: 3px solid #00BBCB;
}
Expand All @@ -95,21 +71,23 @@
}
ul {
clear: both;
margin-top: -10px;
display: block;
list-style-type: none;
padding: 0;
height: 100%;
overflow: hidden;
li {
clear: both;
padding: 2%;
margin-bottom: 10px;
padding: 10px 2%;
div {
width: 15%;
height: 43px;
line-height: 43px;
float: left;
margin-right: 3%;
img {
height: 43px;
height: 35px;
}
}
span {
Expand Down
198 changes: 8 additions & 190 deletions src/components/index/Hotblogger.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,195 +22,12 @@
</div>
</template>
<script>
import getCGI from '../../getCGI/Hotblogger'
let data = {
bloggerClasses : [
{
name : '发帖巨人',
active : true,
bloggers : [
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
}
]
},
{
name : '神评侠',
active : false,
bloggers : [
{
name : '喜羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '喜羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '喜羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '喜羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '喜羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
}
]
},
{
name : '人气队长',
active : false,
bloggers : [
{
name : '懒羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '懒羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '懒羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '懒羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '懒羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
}
]
}
],
thisbloggerClass :
{
name : '发帖巨人',
active : true,
bloggers : [
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
},
{
name : '美羊羊',
classify : '运动',
imgurl : '',
bloggerurl : '#',
articlenum : 3,
fansnum : 30
}
]
}
bloggerClasses : [],
thisbloggerClass : {}
}
getCGI(data)
export default {
name: 'hotblogger',
data() {
Expand Down Expand Up @@ -238,10 +55,12 @@
@color: #00BDCC;
@fontColor: #9C9E9D;
@font-size: 14px;
width: 25%;
height: 355px;
width: 20%;
height: 340px;
overflow: hidden;
border-top: 1px solid #E7E7E7;
min-width: 210px;
background-color: #fff;
.bloggerClasses {
padding: 0;
.bloggerClasses_li {
Expand Down Expand Up @@ -272,7 +91,6 @@
clear: both;
padding: 2%;
div {
/*width: 20%;*/
height: 40px;
line-height: 40px;
text-align: center;
Expand Down
Loading