Authored by liangxs

Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

... ... @@ -1089,8 +1089,8 @@ class HomeController extends AbstractAction
$this->auditJumpLogin();
// 设置网站标题
$this->setTitle('地址修改');
$this->setNavHeader('地址修改', Helpers::url('/home'), false);
$this->setTitle('选择地址');
$this->setNavHeader('选择地址');
$uid = $this->_uid;
$address = UserModel::getAddressData($uid);
... ...
... ... @@ -200,6 +200,7 @@ class BrandModel
'brandDomain' => $val['brandDomain'],
'brandId' => $val['brandId'],
'name' => $val['searchTerms'],
'searchTime' => $val['searchTime'],
'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
);
}
... ...