Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYWAP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
liangxs
2016-05-31 17:53:30 +0800
Commit
14d4e2b2dea0aba75170cf145f5fd0d0f1e0de38
2 parents
3c39c1da
a2b310ba
Merge branch 'release/4.5' of
http://git.yoho.cn/fe/YOHOBUYWAP
into release/4.5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
yohobuy/m.yohobuy.com/application/controllers/Home.php
yohobuy/m.yohobuy.com/application/models/Category/Brand.php
yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @
14d4e2b
...
...
@@ -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
);
...
...
yohobuy/m.yohobuy.com/application/models/Category/Brand.php
View file @
14d4e2b
...
...
@@ -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'
])
:
''
,
);
}
...
...
Please
register
or
login
to post a comment