Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

解决冲突
Conflicts:
	partials/common/environment320_css.html

+{{> layout/writer_header320}}
+<div class="trial-nav">
+    <span class="trial-nav-l trial-nav-active">试用中心</span>
+    <span class="trial-nav-r">我的试用</span>
+</div>
+
+<div class="trial-l-content trial-active-content">
+    {{> channel/banner320}}
+    <div class="home-content">
+        <ul>
+            {{# content}}
+            <li class="content-item channel-{{channelType}} channel-beauty-trial">
+                <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                    <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
+                </a>
+                <h2>
+                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
+                </h2>
+                <h3>
+                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
+                </h3>
+                <div class="trial-product-info">
+                    <span>价格：{{price}}元&nbsp;/&nbsp;</span>
+                    <span>规格：{{size}}ml&nbsp;中样&nbsp;/&nbsp;</span>
+                    <span>数量：{{num}}份</span>
+                </div>
+                <time class="trial-time-{{status}}">
+                    <span>申请时间：{{timeStart}}——{{timeEnd}}</span>
+                    <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span>
+                </time>
+                <div class="trial-submit">
+                    <span>免费申请</span>
+                    <span>{{likeNum}}</span>
+                </div>
+            </li>
+            {{/ content}}
+        </ul>
+        {{> channel/page320}}
+    </div>
+</div>
+<div class="trial-r-content">
+
+</div>
+{{> default/download320}}
+{{> layout/footer320}}
\ No newline at end of file

 {{# devEnvironment}}
-    <link rel="stylesheet" type="text/css" href="http://localhost:8000/assets/css/mobile.css"/>
+    <link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/assets/css/mobile.css"/>
 {{/ devEnvironment}}
 {{# testEnvironment}}
     <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>