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

@@ -20,7 +20,7 @@
     {{/navTitle}}
 </header>
 {{#navBtn}}
-<div class="homebuttom hide {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
+<div class="homebuttom hide {{#if ../boys}} boys{{/if}}{{#if ../girls}} girls{{/if}}{{#if ../kids}} kids{{/if}}{{#if ../lifeStyle}} life-style{{/if}}">
     <ul>
         <li>
             <a href="{{ indexUrl }}">

@@ -15,8 +15,8 @@ use Plugin\Helpers;
 class GirldayController extends HuodongAction
 {
 
-    // const STATIC_FILE = 'http://localhost:2222/1.0.3';
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.3';
+    // const STATIC_FILE = 'http://localhost:2222/1.0.4';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.4';
 
     /**
      * 检测登录状态
@@ -62,6 +62,7 @@ class GirldayController extends HuodongAction
 
         $this->_view->display('index', array(
             'staticTitle' => 'YOHO!BUY有货【春潮新势力】',
+            'staticDesc' => '唤醒潮流，用新陪伴！白色情人节限时2件7折！',
             'staticFile' => self::STATIC_FILE,
             'staticJS' => array(
                 'home.js'
@@ -71,13 +72,13 @@ class GirldayController extends HuodongAction
             'getCouponUrl' => Helpers::url('/cuxiao/girlday/sendCoupon', array('uid' => $this->getLoggedUid())),
             'banner' => array(
                 'img' => 'http://img02.yohoboys.com/staticimg/2016/03/10/10/02b9827b20adc91409b5301f2232dc9144.jpg',
-                '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"}',
             'weixinUrl' => 'http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&mid=201849402&idx=1&sn=c0089812f9769d82e0075f69d771f6e1#rd', // 微信关注地址
             'appUrl' => 'http://www.yohoshow.com/about/index/yohobuyqr', // APP 下载地址
             'shareTitle' => 'YOHO!BUY有货【春潮新势力】火力全开！320元优惠券限时派送中！',
-            'shareDesc' => '换我做主，用新陪伴！白色情人节限时2件7折！',
+            'shareDesc' => '唤醒潮流，用新陪伴！白色情人节限时2件7折！',
             'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/03/10/10/0298ef8fbbb543144af487fbcd6718041b.png',
             'shareLink' => 'http://feature.yoho.cn/0310/0310APPHOME/index.html'
         ));