Skip to content

Commit

Permalink
images
Browse files Browse the repository at this point in the history
  • Loading branch information
monkeyWangs committed Mar 17, 2017
1 parent 13059d2 commit 3ce872b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 31 deletions.
Binary file added favicon.ico
Binary file not shown.
Binary file added images/douban.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/common/moviesDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
overflow: hidden;
text-align: center;
float: left;
height: 140px;
a{
img{
margin-bottom: 10px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/moving.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="hello">
<div class="moving">
<div class="tit">
<h1>电影票 - {{city}}</h1>
<div id="" class="locat">
Expand All @@ -15,7 +15,7 @@
<div class="hd">
<h2>影院上映</h2>
<ul class="tab-hd clearfix">
<li class="on">即将上映</li>
<li class="on">正在上映</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -94,7 +94,7 @@

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style rel="stylesheet/less" lang="less">
.hello {
.moving {
margin-bottom: 20px;
p {
color: red;
Expand Down
9 changes: 0 additions & 9 deletions src/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,6 @@
}, {
title: 'Top250',
url: '/top250'
}, {
title: '口碑榜',
url: ''
}, {
title: '北美票房榜',
url: ''
}, {
title: '新片榜',
url: ''
}]
}
},
Expand Down
7 changes: 6 additions & 1 deletion store/moving/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const actions = {
*/
getUpcoming({commit, state}){
utils.get('/movie/coming_soon', {city: state.city,start: state.upcomBody.start+1}).then(res => {

if(state.upcomBody.subjects && state.upcomBody.subjects.length){
res.subjects = state.upcomBody.subjects.concat(res.subjects);
commit('PAGE_LOAD', {pageload: false})
Expand All @@ -60,6 +60,11 @@ export const actions = {
commit('MOVING_LOADING', {loading: false});
})
},
/**
* 获取搜索列表
* @param commit
* @param state
*/
getSearchList({commit, state}){
console.log(state.searchText)
utils.get('/movie/search', {q: state.searchText}).then(res => {
Expand Down
34 changes: 16 additions & 18 deletions store/moving/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,30 @@ import {getters} from './getters'
import {actions} from './actions'
import {mutations} from './mutations'
const state = {
title: 'doubanMovie',
movingList: {
title: 'doubanMovie', // App 标题
movingList: { //正在上映列表
subjects: []
},
searchList: {
searchList: { // 搜索列表
subjects: []
},
searchText: '',
loadingMoving: true,
loadingUpComing: true,
searchLoading: true,
pageload: false,
upcomBody: {
start: 0,
pageload: false
searchText: '', //搜索内容
loadingMoving: true, //正在上映是否显示loading
loadingUpComing: true, //即将上映是否显示loading
searchLoading: true, //搜索列表是否显示loading
pageload: false, //是否正在加载分页
upcomBody: { //即将上映的电影列表
start: 0
},
loadingDetail: true,
upcomBody: {},
ranking250: {},
city: '杭州',
movieDetail: {
loadingDetail: true, //电影详情是否显示loading
ranking250: {}, // top 250列表
city: '杭州', //当前城市 默认'杭州'
movieDetail: { //电影详情
rating: {},
images: {}
},
id:'',
start:0,
id:'', //电影ID
start:0, //top 250分页起点
movieComment: {} //电影短评
}

Expand Down

0 comments on commit 3ce872b

Please sign in to comment.