Authored by 2586703@qq.com

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

... ... @@ -20,6 +20,7 @@ class Controller_Activity extends Controller_Abstract
{
$topics = Facade_Activity::getActivityTopic();
$currentday = $this->_request->query('currentday', '');
$currentday = is_numeric($currentday) ? $currentday : 0;
$list = array();
$planList = array();
$topicIds = array();
... ...
... ... @@ -4,6 +4,10 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale = 1.0, maximum-scale=1.0, minimum-scale=1.0,user-scalable = no" />
<title>YO'HOOD | 全球潮流新品嘉年华</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="Cache-Control" content="no-siteapp"/>
<meta name="renderer" content="webkit">
<link rel="dns-prefetch" href="<?php echo SITE_RES;?>">
<link rel="stylesheet" href="<?php echo SITE_RES;?>/css/index.css"/>
<link rel="stylesheet" href="<?php echo SITE_RES;?>/css/emoji.css"/>
</head>
... ...
... ... @@ -34,7 +34,7 @@
$noAllow = array('default/index');
?>
<?php if(!in_array($url, $noAllow)):?>
<a class="back-btn iconfont" href="<?php echo $this->view->callback;?>">&#xe60f;</a>
<a class="back-btn iconfont" href="/default/index">&#xe60f;</a>
<?php endif;?>
&#xe60b;
</h1>
... ...