Skip to content

Commit

Permalink
项目更新1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
lookwe committed Mar 5, 2019
1 parent 6e65a2b commit 2f8a299
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 16 deletions.
Binary file removed src/assets/banner/b2.jpg
Binary file not shown.
Binary file removed src/assets/banner/b3.jpg
Binary file not shown.
Binary file removed src/assets/imgage/login-bg1.jpg
Binary file not shown.
Binary file removed src/assets/imgage/login-bg2.jpg
Binary file not shown.
Binary file removed src/assets/imgage/login-bg3.jpg
Binary file not shown.
Binary file removed src/assets/imgage/register-bg.jpg
Binary file not shown.
12 changes: 6 additions & 6 deletions src/components/Swiper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
<div class="silder">
<swiper :options="swiperOption" >
<swiper-slide>
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_1540351085b6c4e718aa521fc616df0429472b10f7.jpg" alt="">
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_1540351085b6c4e718aa521fc616df0429472b10f7.jpg">
</swiper-slide>
<swiper-slide >
<img src="@/assets/banner/b2.jpg" alt="">
<img src="http://feifei.ink/static/img/b2.62f5f7f.jpg">
</swiper-slide>
<swiper-slide>
<img src="@/assets/banner/b3.jpg" alt="">
<img src="http://feifei.ink/static/img/b3.ecfe70f.jpg">
</swiper-slide>
<swiper-slide>
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_154038645548ca3213997492c4a66ec08d27b4aafd.jpg" alt="">
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_154038645548ca3213997492c4a66ec08d27b4aafd.jpg">
</swiper-slide>
<swiper-slide>
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_153991807148d40eafaa4c6cdd21d464ac46373a1c.jpg" alt="">
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_153991807148d40eafaa4c6cdd21d464ac46373a1c.jpg">
</swiper-slide>
<swiper-slide>
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_1551235627e88cf969cc9d50aeac62dd538480d354.jpg" alt="">
<img src="http://business.cdn.qianqian.com/qianqian/pic/bos_client_1551235627e88cf969cc9d50aeac62dd538480d354.jpg">
</swiper-slide>
<div class="swiper-pagination" slot="pagination"></div>
</swiper>
Expand Down
5 changes: 4 additions & 1 deletion src/components/musicList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="info">
<div class="line1">
<span class="name">{{item.title}}</span>
<i class="iconfont icon-sq" style="font-size: 23px;color: #E03229"></i>
<img src='../assets/imgage/sq.png' width="14px"/>
</div>
<span class="author">{{item.author}}</span>
</div>
Expand Down Expand Up @@ -309,6 +309,9 @@ export default {
min-height: 20px;
}
.th-songlist-item .info .line1 img{
margin-top: -1rem;
}
.th-songlist .th-songlist-item .info .name {
max-width: 88%;
text-overflow: ellipsis;
Expand Down
7 changes: 5 additions & 2 deletions src/components/userLikeSongs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<div class="info">
<div class="line1">
<span class="name">{{item.title}}</span>
<img src='../assets/imgage/sq.png' width="14px"/>
<i></i>
</div>
<span class="author">{{item.author}}</span>
Expand Down Expand Up @@ -183,15 +184,17 @@ export default {
}
.th-songlist .th-songlist-item .info .line1 {
min-height: 20px;
}
.line1 img{
margin-top: -1rem;
}
.th-songlist .th-songlist-item .info .name {
max-width: 88%;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
display: inline-block;
font-size: 15.5px;
font-size: 14.5px;
color: #333;
}
.th-songlist .th-songlist-item .info .author {
Expand Down
2 changes: 1 addition & 1 deletion src/init.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default {
watch:{
$route(to,from){
if(from.name === 'login'){
if(this.cutter==='register'){
if(this.cutter === 'register' && from.name !== 'register'){
this.$router.push({name:'user'})
//失效
delete this.cutter
Expand Down
6 changes: 3 additions & 3 deletions src/page/logn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
userPassword:false,
winHeight:0,
bcgImg:[
require('@/assets/imgage/login-bg1.jpg'),
require('@/assets/imgage/login-bg2.jpg'),
require('@/assets/imgage/login-bg3.jpg'),
'http://feifei.ink/static/img/login-bg1.ee100e6.jpg',
'http://feifei.ink/static/img/login-bg2.27df159.jpg',
'http://feifei.ink/static/img/login-bg3.5eff1b8.jpg',
],
formData:{
name:'',
Expand Down
4 changes: 3 additions & 1 deletion src/page/search/search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,9 @@ export default {
height: 100%;
}
.input—search_list ul li{
text-overflow: ellipsis;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width: 89%;
padding: 0 20px;
Expand All @@ -381,6 +382,7 @@ export default {
}
.input—search_list ul li span{
padding-right: 15px;
}
.input—search_list ul li .type{
color: #999;
Expand Down
5 changes: 3 additions & 2 deletions src/page/user/register.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="register" :style="longBoxStyle">
<div class="top-img">
<img v-lazy="topImg">
<i class="el-icon-arrow-left" @click="$router.go('-1')"></i>
<i class="el-icon-arrow-left" @click="$router.push({path:'/login'})"></i>
</div>
<div class="form-box">
<div class="form-input user-phone">
Expand Down Expand Up @@ -41,7 +41,7 @@ export default {
name:'register',
data(){
return {
topImg: require('@/assets/imgage/register-bg.jpg'),
topImg:'http://feifei.ink/static/img/register-bg.8721172.jpg',
userName:false,
userPassword:false,
userPhone:false,
Expand Down Expand Up @@ -140,6 +140,7 @@ export default {
this.formData,
error => {
if (error === null){
sessionStorage.user = this.formData.name
this.showMsg(`注册成功,名称:${this.formData.name} 来试试登录吧`,'success')
this.$router.push({path:'/login'})
}else {
Expand Down

0 comments on commit 2f8a299

Please sign in to comment.