Authored by happyhour7@163.com

Merge branch 'develop' into test

... ... @@ -21,8 +21,8 @@
<div class="emailBox">
<div class="webLogo">
<a href="/index.html">
<img src="{{> common/environment_images}}/logo_girl.png" alt="">
</a>
<img src="{{> common/environment_images}}/logo_girl.png" alt="">
</a>
</div>
<h1>取消订阅</h1>
<p>请输入您的电子邮件地址,以取消订阅YOHO!Girls</p>
... ... @@ -36,7 +36,7 @@
<script type="text/javascript">
seajs.use("/js/channel/email",function(email)
seajs.use("/js/channel/subscribe",function(email)
{
email.noEmail();
});
... ... @@ -73,7 +73,7 @@
<script type="text/javascript">
seajs.use("js/channel/email",function(email)
seajs.use("js/channel/subscribe",function(email)
{
email.hasEmail();
});
... ...
... ... @@ -17,7 +17,7 @@
<link rel="dns-prefetch" href="//video.yohoboys.com" />
{{> common/environment_css}}
</head>
{{^ isFinish}}
<body>
<div class="emailBox">
<h1>就要完成了...</h1>
... ... @@ -29,15 +29,15 @@
<a class="CheckEmail" href="{{emailServer}}">Check my email</a>
</div>
</div>
{{/ isFinish}}
{{# isFinish}}
<div class="emailBox">
<div class="webLogo">
<a href="/index.html">
<img src="<?php echo SITE_IMG; ?>/logo_girl.png" alt="">
<img src="{{> common/environment_images}}/logo_girl.png" alt="">
</a>
</div>
<h1>您已订阅!</h1>
... ... @@ -52,7 +52,7 @@
<p class="black">NewPower Co. All Right Reserved</p>
</div>
{{/ isFinish}}
</body>
... ...
... ... @@ -7,7 +7,7 @@
<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://cmsres.test.yoho.cn/res/new/boys/images/loading.gif) 50% 50% no-repeat;">
<a href="{{link}}" target="_blank" title="''">
<a href="{{link}}" target="_blank" title="{{alt}}">
<img src="{{img}}" alt="{{alt}}">
</a>
</div>
... ...