Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHO-ACTIVITY-PHP
·
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
Lynnic
2015-11-25 18:00:44 +0800
Commit
40e854be83166dee80e992872db6f1e5e2079929
2 parents
b99154fa
9f28ea9d
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
4 deletions
static/js/me/index.js
static/sass/me/_home.scss
template/m.yohobuy.com/actions/index/home/index.phtml
template/m.yohobuy.com/actions/product/detail/index.phtml
template/m.yohobuy.com/partials/layout/use.phtml
yohobuy/m.yohobuy.com/application/controllers/Home.php
yohobuy/m.yohobuy.com/application/models/home/Online.php → yohobuy/m.yohobuy.com/application/models/Home/Online.php
static/js/me/index.js
View file @
40e854b
...
...
@@ -9,6 +9,8 @@ var $userAvatar = $('.user-avatar'),
var
myImage
=
new
Image
();
require
(
'../product/recommend-for-you.js'
);
require
(
'../product/suspend-cart.js'
);
myImage
.
src
=
$userAvatar
.
attr
(
'src'
);
myImage
.
onerror
=
function
()
{
$userAvatar
.
attr
(
'src'
,
'http://static.dev.yohobuy.com/img/me/index/user-avatar.png'
);
...
...
static/sass/me/_home.scss
View file @
40e854b
...
...
@@ -28,7 +28,12 @@
}
.username
{
float
:
left
;
padding
:
0
pxToRem
(
16px
);
text-overflow
:
ellipsis
;
overflow
:
hidden
;
white-space
:
nowrap
;
max-width
:
pxToRem
(
290px
);
}
.vip-icon
{
...
...
template/m.yohobuy.com/actions/index/home/index.phtml
View file @
40e854b
...
...
@@ -102,5 +102,8 @@
</div>
{
{>
product/recommend-for-you
}
}
{
{>
product/suspend-cart
}
}
</div>
{
{>
layout/download_app
}
}
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
template/m.yohobuy.com/actions/product/detail/index.phtml
View file @
40e854b
...
...
@@ -125,11 +125,11 @@
{
{#if
numInCart
}
}
<span
class=
"num-tag"
>
{
{numInCart
}
}</span>
{
{/if
}
}
<a
href=
""
class=
"num-incart iconfont"
>
62
c;</a>
<a
href=
"
/shoppingCart
"
class=
"num-incart iconfont"
>
62
c;</a>
{
{#if
goodsInstore
}
}
<a
href=
""
class=
"addto-cart "
>加入购物车</a>
<a
href=
"
/shoppingCart
"
class=
"addto-cart "
>加入购物车</a>
{
{else
}
}
<a
href=
""
class=
"sold-out"
>已售罄</a>
<a
href=
"
javascript:;
"
class=
"sold-out"
>已售罄</a>
{
{/if
}
}
<a
href=
"#"
id=
"likeBtn"
class=
"favorite iconfont {{#isCollect}}liked{{/isCollect}}"
>
605
;</a>
...
...
template/m.yohobuy.com/partials/layout/use.phtml
View file @
40e854b
...
...
@@ -216,6 +216,7 @@
{{#if myIndexPage}}
<script>
seajs.use('js/me/index');
seajs.use('js/index/footer');
</script>
{{/if}}
{{#if orderPage}}
...
...
yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @
40e854b
...
...
@@ -51,6 +51,7 @@ class HomeController extends AbstractAction
$data
=
array
(
'myIndexPage'
=>
true
,
'showDownloadApp'
=>
true
,
'pageFooter'
=>
true
);
$uid
=
$this
->
getUid
();
...
...
@@ -323,7 +324,7 @@ class HomeController extends AbstractAction
$this
->
_view
->
display
(
'online-service'
,
array
(
'onlineServicePage'
=>
true
,
//
'pageFooter' => true,
'pageFooter'
=>
true
,
'service'
=>
$service
));
}
...
...
yohobuy/m.yohobuy.com/application/models/
h
ome/Online.php → yohobuy/m.yohobuy.com/application/models/
H
ome/Online.php
View file @
40e854b
Please
register
or
login
to post a comment