Authored by whb

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -34,4 +34,5 @@ web-static/npm-debug.log @@ -34,4 +34,5 @@ web-static/npm-debug.log
34 .tags 34 .tags
35 .tags_sorted_by_file 35 .tags_sorted_by_file
36 yohobuyP.sublime-project 36 yohobuyP.sublime-project
37 -yohobuyP.sublime-workspace  
  37 +yohobuyP.sublime-workspace
  38 +framework/
@@ -39,7 +39,7 @@ class HelperSearch @@ -39,7 +39,7 @@ class HelperSearch
39 } 39 }
40 self::$listNav[0] = array( 40 self::$listNav[0] = array(
41 'href' => '', 41 'href' => '',
42 - 'name' => $cookieChannel 42 + 'name' => strtoupper($cookieChannel).'首页'
43 ); 43 );
44 self::$listNav[1] = array( 44 self::$listNav[1] = array(
45 'href' => '', 45 'href' => '',