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
.tags
.tags_sorted_by_file
yohobuyP.sublime-project
yohobuyP.sublime-workspace
\ No newline at end of file
yohobuyP.sublime-workspace
framework/
\ No newline at end of file
... ...
... ... @@ -39,7 +39,7 @@ class HelperSearch
}
self::$listNav[0] = array(
'href' => '',
'name' => $cookieChannel
'name' => strtoupper($cookieChannel).'首页'
);
self::$listNav[1] = array(
'href' => '',
... ...