Merge branch 'test' into develop

@@ -34,7 +34,7 @@
                     <div class="trial-submit">
                         {{# isOver}}<b class="apply-link apply-link-over">活动已结束</b>{{/ isOver}}
                         {{^ isOver}}<a class="apply-link" href="{{link}}">免费申请</a>{{/ isOver}}
-                        <span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{cid}}">&#xe600;<b>{{#if likeNum}}{{likeNum}}{{/if}}</b></span>
+                        <span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{id}}">&#xe600;<b>{{#if likeNum}}{{likeNum}}{{/if}}</b></span>
                     </div>
                 </div>
             </li>

 {{> layout/header_jian}}
+{{# testEnvironment}}
+<link rel="stylesheet" href="http://cmsres.test.yoho.cn/res/new/girls/css/yohood.css"/>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ testEnvironment}}
+{{# prevEnvironment}}
+<link rel="stylesheet" href="http://res.previewboys.yoho.cn/res/new/girls/css/yohood.css"/>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ prevEnvironment}}
+{{# prodEnvironment}}
+<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.css"/>
+<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
+<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ prodEnvironment}}
 {{> channel/banner_top}}
 
 <div class="content clearfix">

 {{> layout/header_fan}}
+{{# testEnvironment}}
+<link rel="stylesheet" href="http://cmsres.test.yoho.cn/res/new/girls/css/yohood.css"/>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ testEnvironment}}
+{{# prevEnvironment}}
+<link rel="stylesheet" href="http://res.previewboys.yoho.cn/res/new/girls/css/yohood.css"/>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ prevEnvironment}}
+{{# prodEnvironment}}
+<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.css"/>
+<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
+<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ prodEnvironment}}
 {{> channel/banner_top}}
 
 <div class="content clearfix">
@@ -50,7 +74,7 @@
         </div>
         {{/if}}
     </div>
-    <div class="content-yohood-right">
+    <div class="content-yohood-right" style="position: relative;">
         {{# yohood}}
         <div class="advert-without-border">
             <a href="{{link}}" target="_blank"><img

 {{> layout/header_jian}}
+{{# testEnvironment}}
+<link rel="stylesheet" href="http://cmsres.test.yoho.cn/res/new/girls/css/yohood.css"/>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ testEnvironment}}
+{{# prevEnvironment}}
+<link rel="stylesheet" href="http://res.previewboys.yoho.cn/res/new/girls/css/yohood.css"/>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ prevEnvironment}}
+{{# prodEnvironment}}
+<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.css"/>
+<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
+<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.js"></script>
+<script type="text/javascript">
+    seajs.use("js/yohood");
+</script>
+{{/ prodEnvironment}}
 {{> channel/banner_top}}
 
 <div class="content clearfix">

+{{# banner}}
+<div class="scrollPic-content">
+    {{# bannerLength}}
+    <a class="arrow arrow-left" href="javascript:;" onclick="YOHODCLICK('banner','web','bannerTopPrevNext')"></a>
+    <a class="arrow arrow-right" href="javascript:;" onclick="YOHODCLICK('banner','web','bannerTopPrevNext')"></a>
+    {{/ bannerLength}}
+    <div class="swiper-container-banner {{# bannerLength}}swiper-container{{/ bannerLength}}" style="cursor: -webkit-grab;">
+        <div class="swiper-wrapper" style="width: 1080px; height: 507px;background-color: rgb(255, 255, 255);">
+            {{# data}}
+            <div class="swiper-slide" style="width: 992px; height: 504px; background: url(http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/loading.gif) 50% 50% no-repeat;">
+                <a href="{{link}}" target="_blank" title="{{alt}}" onclick="YOHODCLICK('banner','web','bannerTop')">
+                    <img src="{{img}}" alt="{{alt}}">
+                </a>
+            </div>
+            {{/ data}}
+        </div>
+    </div>
+</div>
+{{/ banner}}
\ No newline at end of file

@@ -6,7 +6,7 @@
     <a class="end-btn" href="javascript:;">活动已结束</a>
     {{/if}}
     {{# like}}
-    <a class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{cid}}" href="javascript:;">
+    <a class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{id}}" href="javascript:;">
         <span class="iconfont">&#xe600;</span>
         <b>{{#if likeNum}}{{likeNum}}{{/if}}</b>
     </a>