add search page

vczero · Dec 12, 2014 · 557582d · 557582d
1 parent 292a65e
commit 557582d
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 43 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,7 +11,8 @@ module.exports = function(grunt){
         			'./lib/main.js',
         			'./lib/directive/**/*.js',
         			'./lib/service/**/*.js',
-        			'./lib/list/**/*.js'
+        			'./lib/list/**/*.js',
+        			'./lib/search/**/*.js'
         		],
         		dest:'./build/main.js'
         	}

diff --git a/build/main.js b/build/main.js
@@ -125,6 +125,24 @@ app.config(['$stateProvider', '$urlRouterProvider',function($stateProvider, $url
         			controller: ''
         		}
         	}
+        })
+
+        .state('search',{
+        	url: '/search/:type',
+        	views:{
+        		header:{
+        			templateUrl: '../html/views/search.html',
+        			controller: 'Search'
+        		},
+        		container:{
+        			templateUrl: '',
+        			controller: ''
+        		},
+        		footer:{
+        			templateUrl: '',
+        			controller: ''
+        		}
+        	}
         });
 }]);
 ;
@@ -263,32 +281,51 @@ app.controller('musicListController', ['$rootScope', 'musicList',function($rootS
 	}
 	musicList.getData($rootScope.keywordsObj.music);
 }]);
-;/*搜索*/
-var SearchController = function($scope, $rootScope, $location, bookList, musicList, movieList){
+;/*负责搜索结果的导向*/
+var Search = function($scope, $rootScope, $location, bookList, musicList, movieList){
 	var path = $location.path();
+	$rootScope.isNoLoaded = false;
+	//跳回列表页
 	$scope.search = function(){
 		var keywords = $scope.keywords;
-		if(path.indexOf('/book') !== -1 || path === '/'){
+		if(path.indexOf('/book') !== -1){
 			if(keywords){
 				$rootScope.keywordsObj.book = keywords;
 			}
-			bookList.getData($rootScope.keywordsObj.book);
+			$location.path('/book');
 
-		}else if(path.indexOf('/music') !== -1 || path === '/music'){
+		}else if(path.indexOf('/music') !== -1){	
 			if(keywords){
 				$rootScope.keywordsObj.music = keywords;
 			}
-			musicList.getData($rootScope.keywordsObj.music);
+			$location.path('/music');
 
-		}else if(path.indexOf('/movie') !== -1 || path === '/movie'){
+		}else if(path.indexOf('/movie') !== -1){
 			if(keywords){
 				$rootScope.keywordsObj.movie = keywords;
 			}
-			movieList.getData($rootScope.keywordsObj.movie);
+			$location.path('/movie');
 		}
 	};
 };
+Search.$inject = ['$scope', '$rootScope', '$location', 'bookList', 'musicList', 'movieList'];
+app.controller('Search', Search);;/*仅负责搜索页面的打开*/
+var SearchController = function($scope, $rootScope, $location){
+	var path = $location.path();	
+	$scope.goToSearch = function(){
+		if(path.indexOf('/book') !== -1 || path === '/'){
+			$location.path('/search/book');
+
+		}else if(path.indexOf('/music') !== -1 || path === '/music'){
+			$location.path('/search/music');
+
+
+		}else if(path.indexOf('/movie') !== -1 || path === '/movie'){
+			$location.path('/search/movie');
+		}
+	};
+
+};
 
-SearchController.$inject = ['$scope', '$rootScope', '$location', 'bookList', 'musicList', 'movieList'];
-
+SearchController.$inject = ['$scope', '$rootScope', '$location'];
 app.controller('SearchController', SearchController);
diff --git a/build/main.min.js b/build/main.min.js
diff --git a/css/main.css b/css/main.css
@@ -10,11 +10,17 @@ input{
 	-webkit-appearance:none;
 	outline:none;
 	border-radius:0;
+	-webkit-tap-highlight-color:rgba(255,255,255,0);
+}
+
+div{
+	-webkit-tap-highlight-color:rgba(255,255,255,0);
 }
 
 
 a{
 	color: #525252;
+	-webkit-tap-highlight-color:rgba(255,255,255,0);
 }
 
 header{
@@ -361,6 +367,12 @@ section .list_item:last-child{
 	color:#000;
 }
 
+@media (max-height:350px) { 
+  footer {
+    display: none;
+  }
+}
+
 
 
 

diff --git a/html/index.html b/html/index.html
@@ -3,7 +3,9 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-		<title>i搜索 i生活</title>
+		<meta name="apple-mobile-web-app-capable" content="yes"/>
+		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
+		<title>爱搜索 爱生活</title>
 		<link rel="stylesheet" type="text/css" href="../css/main.css">
 	</head>
 	<body>

diff --git a/html/views/list_header.html b/html/views/list_header.html
@@ -1,9 +1,9 @@
 
 <header ng-controller="SearchController">
 	<div>
-		<input id="search_input" ng-model="keywords" type="text" placeholder="请输入关键字"/>
+		<input id="search_input" ng-model="keywords" type="text" placeholder="请输入关键字" ng-click="goToSearch()"/>
 	</div>
 	<div>
-		<input type="button" id="search_btn" ng-click="search()" value="搜索"/>
+		<input type="button" id="search_btn" value="搜索"/>
 	</div>
 </header>
diff --git a/html/views/search.html b/html/views/search.html
@@ -0,0 +1,8 @@
+<header ng-controller="Search">
+	<div>
+		<input id="search_input" ng-model="keywords" type="text" placeholder="请输入关键字"/>
+	</div>
+	<div>
+		<input type="button" id="search_btn" ng-click="search()" value="搜索"/>
+	</div>
+</header>
diff --git a/lib/list/searchController.js b/lib/list/searchController.js
diff --git a/lib/main.js b/lib/main.js
@@ -125,5 +125,23 @@ app.config(['$stateProvider', '$urlRouterProvider',function($stateProvider, $url
         			controller: ''
         		}
         	}
+        })
+
+        .state('search',{
+        	url: '/search/:type',
+        	views:{
+        		header:{
+        			templateUrl: '../html/views/search.html',
+        			controller: 'Search'
+        		},
+        		container:{
+        			templateUrl: '',
+        			controller: ''
+        		},
+        		footer:{
+        			templateUrl: '',
+        			controller: ''
+        		}
+        	}
         });
 }]);
diff --git a/lib/search/Search.js b/lib/search/Search.js
@@ -0,0 +1,29 @@
+/*负责搜索结果的导向*/
+var Search = function($scope, $rootScope, $location, bookList, musicList, movieList){
+	var path = $location.path();
+	$rootScope.isNoLoaded = false;
+	//跳回列表页
+	$scope.search = function(){
+		var keywords = $scope.keywords;
+		if(path.indexOf('/book') !== -1){
+			if(keywords){
+				$rootScope.keywordsObj.book = keywords;
+			}
+			$location.path('/book');
+
+		}else if(path.indexOf('/music') !== -1){	
+			if(keywords){
+				$rootScope.keywordsObj.music = keywords;
+			}
+			$location.path('/music');
+
+		}else if(path.indexOf('/movie') !== -1){
+			if(keywords){
+				$rootScope.keywordsObj.movie = keywords;
+			}
+			$location.path('/movie');
+		}
+	};
+};
+Search.$inject = ['$scope', '$rootScope', '$location', 'bookList', 'musicList', 'movieList'];
+app.controller('Search', Search);
diff --git a/lib/search/searchController.js b/lib/search/searchController.js
@@ -0,0 +1,20 @@
+/*仅负责搜索页面的打开*/
+var SearchController = function($scope, $rootScope, $location){
+	var path = $location.path();	
+	$scope.goToSearch = function(){
+		if(path.indexOf('/book') !== -1 || path === '/'){
+			$location.path('/search/book');
+
+		}else if(path.indexOf('/music') !== -1 || path === '/music'){
+			$location.path('/search/music');
+
+
+		}else if(path.indexOf('/movie') !== -1 || path === '/movie'){
+			$location.path('/search/movie');
+		}
+	};
+
+};
+
+SearchController.$inject = ['$scope', '$rootScope', '$location'];
+app.controller('SearchController', SearchController);