Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
hf
9 years ago
Commit
1adbcac740b92bce380afb94c20880dc1e77ffa8
2 parents
85dbfd5e
5b5ad8ca
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
static/sass/home/_maybe-like.scss
yohobuy/m.yohobuy.com/application/models/Product/Newsale.php
static/sass/home/_maybe-like.scss
View file @
1adbcac
...
...
@@ -6,16 +6,6 @@
// border-bottom: 1px solid #ccc;
margin-top
:
30rem
/
$pxConvertRem
;
&
:before
{
content
:
''
;
position
:
absolute
;
border-top
:
1px
solid
#ccc
;
left
:
0
;
top
:
80rem
/
$pxConvertRem
;
width
:
640rem
/
$pxConvertRem
;
height
:
0
;
}
.title
{
height
:
104rem
/
$pxConvertRem
;
font-size
:
38rem
/
$pxConvertRem
;
...
...
@@ -36,6 +26,15 @@
height
:
60rem
/
$pxConvertRem
;
padding
:
10rem
/
$pxConvertRem
0
;
background-color
:
#fff
;
&
:before
{
content
:
''
;
position
:
absolute
;
border-top
:
1px
solid
#ccc
;
left
:
0
;
top
:
80rem
/
$pxConvertRem
;
width
:
640rem
/
$pxConvertRem
;
height
:
0
;
}
}
.maybe-like-nav-item
{
...
...
yohobuy/m.yohobuy.com/application/models/Product/Newsale.php
View file @
1adbcac
...
...
@@ -196,11 +196,11 @@ class NewsaleModel
if
(
USE_CACHE
)
{
// 接口调用异常时, 不害怕,从我们的二级缓存(slave)里再取数据.
if
(
empty
(
$result
))
{
$result
=
Cache
::
get
(
CacheConfig
::
KEY_ACTION_PRODUCT_NEWSALE_INDEX_BOYS
,
'slave'
);
$result
=
Cache
::
get
(
$cacheKey
,
'slave'
);
}
// 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
else
{
Cache
::
set
(
CacheConfig
::
KEY_ACTION_PRODUCT_NEWSALE_INDEX_BOYS
,
$result
);
Cache
::
set
(
$cacheKey
,
$result
);
}
}
...
...
Please
register
or
login
to post a comment