Merge branch 'develop/wap' into beta/wap

@@ -6,6 +6,7 @@
 var $ = require('jquery'),
 var $ = require('jquery'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
+    noticeScroll = require('../plugin/notice-scroll'),
     $mobileWrap = $('.mobile-wrap'),
     $mobileWrap = $('.mobile-wrap'),
     $overlay = $('.overlay'),
     $overlay = $('.overlay'),
     $sideNav = $('.side-nav'),
     $sideNav = $('.side-nav'),
@@ -24,6 +25,7 @@ var start = 0,
     isen = true;
     isen = true;
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
+noticeScroll('.notice', $('.notice').data('time') * 1000);
 
 
 $('.nav-btn').on('touchstart', function() {
 $('.nav-btn').on('touchstart', function() {
     $sideNav.css('pointer-events', 'none');
     $sideNav.css('pointer-events', 'none');

@@ -3,7 +3,9 @@
  * @author: bikai<kai.bi@yoho.cn>
  * @author: bikai<kai.bi@yoho.cn>
  * @date: 2015/11/12
  * @date: 2015/11/12
  */
  */
-var $ = require('jquery');
+var $ = require('jquery'),
+    noticeScroll = require('../plugin/notice-scroll');
+
 var $userAvatar = $('.user-avatar'),
 var $userAvatar = $('.user-avatar'),
     $listItem = $('.list-item');
     $listItem = $('.list-item');
 var myImage = new Image(),
 var myImage = new Image(),
@@ -19,6 +21,8 @@ myImage.onload = function() {
     $userAvatar.css('background-image', 'url(' + avatar + ')');
     $userAvatar.css('background-image', 'url(' + avatar + ')');
 };
 };
 
 
+noticeScroll('.notice', $('.notice').data('time') * 1000);
+
 $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
 $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
     $listItem.removeClass('highlight');
     $listItem.removeClass('highlight');
     $(this).addClass('highlight');
     $(this).addClass('highlight');

+/**
+ * 公告栏目滚动
+ * bikai kai.bi@yoho.cn
+ */
+
+var $ = require('jquery');
+
+function noticeScroll(selecter, time) {
+    var $notice = $(selecter),
+        $noticeItem = $notice.find('.notice-item'),
+        count = $noticeItem.length,
+        i = 1;
+
+    selecter = selecter || '.notice';
+    time = time || 3000;
+
+    if (count > 1) {
+        setInterval(function() {
+            if (i >= count) {
+                i = 0;
+            }
+            $noticeItem.fadeOut();
+            $notice.find('.item-' + i).fadeIn();
+            i++;
+        }, time);
+    }
+}
+
+module.exports = noticeScroll;

@@ -17,6 +17,7 @@
 @import "hot-category";
 @import "hot-category";
 @import "home-header";
 @import "home-header";
 @import "thumb-row";
 @import "thumb-row";
+@import "notice";
 
 
 .mobile-container{
 .mobile-container{
     width: 100%;
     width: 100%;

+.notice-wrap {
+    .trend {
+        position: relative;
+        box-sizing: border-box;
+        float: left;
+        width: 170px;
+        height: 72px;
+        background: resolve('img/trend.png') no-repeat center center;
+        background-size: 90%;
+        background-color: #fff;
+
+        &:after {
+            content: '';
+            position: absolute;
+            right: 0;
+            top: 16px;
+            width: 1px;
+            height: 40px;
+            background: #eee;
+        }
+    }
+
+    .notice {
+        box-sizing: border-box;
+        float: left;
+        padding: 0 30px;
+        background: #fff;
+        width: 470px;
+        height: 72px;
+        overflow: hidden;
+
+        .notice-item {
+            display: block;
+            width: 100%;
+            font-size: 24px;
+            line-height: 72px;
+            color: #444;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+
+        .notice-icon {
+            display: inline-block;
+            margin-right: 10px;
+            width: 28px;
+            height: 28px;
+            background: url("/me/index/volume.png");
+            vertical-align: middle;
+        }
+
+        span.notice-icon {
+            background-repeat: no-repeat !important;
+        }
+    }
+}

@@ -33,6 +33,16 @@
                 <p>浏览记录</p>
                 <p>浏览记录</p>
             </a>
             </a>
         </div>
         </div>
+        {{#if notice.open}}
+        <div class="notice" data-time="{{notice.time}}">
+            {{#notice.list}}
+            <a class="notice-item item-{{@index}}" href="{{url}}">
+                <span class="notice-icon"></span>
+                {{title}}
+            </a>
+            {{/notice.list}}
+        </div>
+        {{/if}}
         <div class="my-order">
         <div class="my-order">
             <a class="order-title"  href="/home/orders">
             <a class="order-title"  href="/home/orders">
                 我的订单
                 我的订单

@@ -7,6 +7,10 @@
     {{# iconsEnter}}
     {{# iconsEnter}}
         {{> home/icons_enter}}
         {{> home/icons_enter}}
     {{/ iconsEnter}}
     {{/ iconsEnter}}
+    {{! 首页公告}}
+    {{# notice}}
+        {{> home/notice}}
+    {{/ notice}}
     {{! 中间banner}}
     {{! 中间banner}}
     {{# banner}}
     {{# banner}}
         {{> home/banner}}
         {{> home/banner}}

+{{#if notice.open}}
+<div class="notice-wrap clearfix">
+    <div class="trend">
+    </div>
+    <div class="notice" data-time="{{notice.time}}">
+        {{#notice.list}}
+        <a class="notice-item item-{{@index}}" href="{{url}}">
+            <span class="notice-icon"></span>
+            {{title}}
+        </a>
+        {{/notice.list}}
+    </div>
+</div>
+{{/if}}

@@ -71,7 +71,7 @@ class GirldayController extends HuodongAction
             'getCouponUrl' => Helpers::url('/cuxiao/girlday/sendCoupon', array('uid' => $this->getLoggedUid())),
             'getCouponUrl' => Helpers::url('/cuxiao/girlday/sendCoupon', array('uid' => $this->getLoggedUid())),
             'banner' => array(
             'banner' => array(
                 'img' => '',
                 'img' => '',
-                'url' => 'http://feature.yoho.cn/0310/0310APPHOME/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"YOHO!BUY有货【春潮新势力】", "url":"http://feature.yoho.cn/0310/0310APPHOME/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"382"},"param":{"share_id":"382"}}'
+                'url' => 'http://feature.yoho.cn/0310/0310APPHOME/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"YOHO!BUY有货【春潮新势力】", "url":"http://feature.yoho.cn/0310/0310APPHOME/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"382"},"param":{"share_id":"382"}}}'
             ),
             ),
             'selectUrl' => 'http://m.yohobuy.com/home/coupons?openby:yohobuy={"action":"go.coupon"}',
             'selectUrl' => 'http://m.yohobuy.com/home/coupons?openby:yohobuy={"action":"go.coupon"}',
             'weixinUrl' => 'http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&mid=201849402&idx=1&sn=c0089812f9769d82e0075f69d771f6e1#rd', // 微信关注地址
             'weixinUrl' => 'http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&mid=201849402&idx=1&sn=c0089812f9769d82e0075f69d771f6e1#rd', // 微信关注地址

@@ -2,6 +2,7 @@
 
 
 use Action\AbstractAction;
 use Action\AbstractAction;
 use Plugin\Helpers;
 use Plugin\Helpers;
+// use Index\UserModel as UserModel;
 
 
 /**
 /**
  * 男生首页
  * 男生首页
@@ -29,12 +30,21 @@ class BoysController extends AbstractAction
         // 显示底部TAB
         // 显示底部TAB
         $this->setNavFooterTab();
         $this->setNavFooterTab();
 
 
+        $content = Index\HomeModel::getBoysFloor();
+        // $content[] = array(
+        //     'notice' => array(
+        //         'open' => true,
+        //         'list' => UserModel::getNoticeData(),
+        //         'time' => 3,
+        //     )
+        // );
+
         // 渲染模板并输出
         // 渲染模板并输出
         $this->_view->display('index', array(
         $this->_view->display('index', array(
             'boysHomePage' => true,
             'boysHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
             'maybeLike' => true,
             'maybeLike' => true,
-            'content' => Index\HomeModel::getBoysFloor(),
+            'content' => $content,
             'pageFooter' => true,
             'pageFooter' => true,
         ));
         ));
     }
     }

@@ -51,7 +51,7 @@ class HomeController extends AbstractAction
             'myIndexPage' => true,
             'myIndexPage' => true,
             'showDownloadApp' => true,
             'showDownloadApp' => true,
             'navHome' => true,
             'navHome' => true,
-            // 'notice' => UserModel::getNoticeData(),
+            'notice' => UserModel::getNoticeData(),
             'pageFooter' => true,
             'pageFooter' => true,
             'cartUrl' => Helpers::url('/cart/index/index', null),
             'cartUrl' => Helpers::url('/cart/index/index', null),
             'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),
             'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),