fe / YOHOBUYWAP · Commits

Go to a project

Authored by Lynnic
Commit 22923c1ca5e0e40977451e743b1217661dfeb556 2 parents 06cb9b44 dec4d567

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 7 changed files with 55 additions and 15 deletions
... ... @@ -399,10 +399,8 @@ class AbstractAction extends Controller_Abstract
$header['lifeStyle'] = true;
break;
}
$this->_view->assign('pageHeader', $header);
}
/**
* 设置网站导航底部信息
*
... ...
... ... @@ -82,22 +82,22 @@ headerNavHammer.on('tap', function(e) {
}
});
formHammer = new Hammer(document.getElementById('img-form'));
if (document.getElementById('img-form') !== null) {
formHammer = new Hammer(document.getElementById('img-form'));
formHammer.on('tap', function(e) {
if ($(e.target).hasClass('upload-img-remove')) {
$uploadImgList.html('');
imgStr = '';
setTimeout(function() {
$imgAdd.show();
}, 50);
formHammer.on('tap', function(e) {
if ($(e.target).hasClass('upload-img-remove')) {
$uploadImgList.html('');
imgStr = '';
setTimeout(function() {
$imgAdd.show();
}, 50);
}
});
}
});
}
// 点赞与取消点赞
// suggestContentHammer = new Hammer(document.getElementById('suggest-content'));
$likeBtn.bind('click', function() {
var id = $(this).closest('.suggest-item').attr('data-id'),
$that = $(this);
... ...
... ... @@ -78,4 +78,31 @@
color: #b0b0b0;
padding-right: pxToRem(32px);
}
}
.systemUpdate{
width: 100%;
height: 90rem / $pxConvertRem;
overflow: hidden;
line-height: 90rem / $pxConvertRem;
display: none;
@include background-image(linear-gradient(#323232, #414141));
.systemHeader{
width: 85%;
height: 100%;
overflow: hidden;
font-size: 60em / $pxConvertRem;
color:#fff;
float: left;
text-align: center;
}
span{
width: 14%;
height: 100%;
overflow: hidden;
float: left;
text-align: center;
font-size: 80em / $pxConvertRem;
font-weight: bold;
color: #fff;
}
}
\ No newline at end of file
... ...
... ... @@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
//发表意见
.create-new-suggest {
display: block;
display: inline-block;
color: #444;
width: 100%;
height: pxToRem(88px);
... ...
... ... @@ -43,4 +43,10 @@
<link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
</head>
<body {{#if isPassportPage}}class=passport-body{{/if}}>
{{#if systemUpdate}}
<div class="systemUpdate">
<a href="systemUpdate" class="systemHeader">YOHO!BUY关于系统升级的公告</a>
<span>X</span>
</div>
{{/if}}
{{> layout/page_header}}
\ No newline at end of file
... ...
... ... @@ -33,5 +33,14 @@ class IndexController extends AbstractAction
'pageFooter' => true,
));
}
/**
* 设置升级公告路由
*
*/
public function systemUpdate()
{
$this->_view->display('systemUpdate','');
}
}
... ...