do merge develop code to version 0.0.8

 {
   "name": "yohobuy",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -5,6 +5,7 @@
             <form id="search-form" action={{url}} method="get">
                 <i class="search-icon iconfont">&#xe60f;</i>
                 <input type="text" placeholder="搜索商品" name="query">
+                <input type="hidden" name="from" value="search">
                 <i class="clear-input iconfont hide">&#xe626;</i>
                 <button id="search" class="search" type="submit">搜索</button>
             </form>

@@ -3,7 +3,7 @@
         <div id="search-input" class="search-input">
             <form id="search-form" action={{url}} method="get">
                 <i class="search-icon iconfont">&#xe60f;</i>
-                <input type="text" value={{default}} name="query">
+                <input type="text" value="{{default}}" name="query">
                 <i class="clear-input iconfont hide">&#xe61a;</i>
                 <button id="search" class="search" type="submit">搜索</button>
             </form>

@@ -141,14 +141,14 @@ class SearchController extends AbstractAction
         }
         // 搜索其它内容
         else {
-            if ($haveQuery) {
-                $data['goodList']['search']['default'] = $query;
+            $from = $this->get('from');
+            if ($haveQuery || $from) {
+                $data['goodList']['search']['default'] = empty($query) ? false : $query;
                 $data['goodList']['search']['url'] = Helpers::url('', null, 'search');
             }
             $this->setTitle('搜索');
             $this->setNavHeader('搜索', true, SITE_MAIN);
         }
-
         // 右下角的购物车链接
         $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
         

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "0.0.7"
+application.version = "0.0.8"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "0.0.7"
+application.version = "0.0.8"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "0.0.7"
+application.version = "0.0.8"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "0.0.7"
+application.version = "0.0.8"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"