Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5
Showing
2 changed files
with
3 additions
and
2 deletions
@@ -1089,8 +1089,8 @@ class HomeController extends AbstractAction | @@ -1089,8 +1089,8 @@ class HomeController extends AbstractAction | ||
1089 | $this->auditJumpLogin(); | 1089 | $this->auditJumpLogin(); |
1090 | 1090 | ||
1091 | // 设置网站标题 | 1091 | // 设置网站标题 |
1092 | - $this->setTitle('地址修改'); | ||
1093 | - $this->setNavHeader('地址修改', Helpers::url('/home'), false); | 1092 | + $this->setTitle('选择地址'); |
1093 | + $this->setNavHeader('选择地址'); | ||
1094 | 1094 | ||
1095 | $uid = $this->_uid; | 1095 | $uid = $this->_uid; |
1096 | $address = UserModel::getAddressData($uid); | 1096 | $address = UserModel::getAddressData($uid); |
@@ -200,6 +200,7 @@ class BrandModel | @@ -200,6 +200,7 @@ class BrandModel | ||
200 | 'brandDomain' => $val['brandDomain'], | 200 | 'brandDomain' => $val['brandDomain'], |
201 | 'brandId' => $val['brandId'], | 201 | 'brandId' => $val['brandId'], |
202 | 'name' => $val['searchTerms'], | 202 | 'name' => $val['searchTerms'], |
203 | + 'searchTime' => $val['searchTime'], | ||
203 | 'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '', | 204 | 'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '', |
204 | ); | 205 | ); |
205 | } | 206 | } |
-
Please register or login to post a comment