ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 4aef813603138c46778ff2c0ec630fde2fa6158f 2 parents f0efb454 68db4be5

Merge branch 'develop' into test

Inline Side-by-side
Showing 6 changed files with 59 additions and 114 deletions
... ... @@ -13,9 +13,11 @@
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
{{> common/environment_css}}
{{> common/environment_js}}
</head>
<body>
{{# emailAddress}}
{{^ emailAddress}}
<div class="emailBox">
<div class="webLogo">
<a href="/index.html">
... ... @@ -30,32 +32,22 @@
</div>
<p class="black">NewPower Co. All Right Reserved</p>
</div>
{{> common/environment_js}}
<script type="text/javascript">
seajs.use("jquery",function($)
{
$('.cancelBtn').click(function(){
var email_val = $('#email').val();
if(email_val.length === 0){
alert("<?php echo t('请输入邮箱地址！', $this->view->_language);?>");
return false;
}
var search_str = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;
if(!search_str.test(email_val)){
alert("<?php echo t('请输入正确的邮箱地址！', $this->view->_language);?>");
return false;
}
});
});
</script>
seajs.use("./channel/email",function(email)
{
email.noEmail();
});
</script>
{{/ emailAddress}}
{{^ emailAddress}}
{{# emailAddress}}
<div class="emailBox">
<div class="webLogo">
<a href="/index.html"><img src="{{SITE_STATIC 'images'}}/little_logo.png" alt=""></a>
<a href="/index.html"><img src="{{> common/environment_images}}/little_logo.png" alt=""></a>
</div>
<h1>取消订阅成功</h1>
<div class="cancelForm">
... ... @@ -75,50 +67,16 @@ seajs.use("jquery",function($)
<p class="backYohoBoys"><a class="times" href="#">&lt;&lt; Back YOHO！Girls </a></p>
<p class="black">NewPower Co. All Right Reserved</p>
</div>
{{> common/environment_js}}
<script type="text/javascript">
seajs.use("jquery",function($)
{
$("input[name='radio']").click(function()
{
var index = $("input[name='radio']").index(this);
if(index==4)
{
$("textarea").removeAttr("readonly");
}
else
{
$("textarea").attr("readonly",true);
$("textarea").val('');
}
});
$(".submitEmail").click(function()
{
var type = $("input[name='radio']:checked").val();
var reson = $("textarea").val();
var email = $(".radioBox").attr("val");
$.ajax
({
url: '/passport/subscribe/callback',
data: {"refuse_type":type, "reson":reson, "email":email},
dataType: "JSON",
type: "POST",
success: function(response)
{
if (response.code == 200)
{
alert("取消订阅成功!");
history.go(-1);
}
else
{
alert("取消订阅失败!");
}
}
});
});
});
<script type="text/javascript">
seajs.use("./channel/email",function(email)
{
email.hasEmail();
});
</script>
{{/ emailAddress}}
</body>
... ...
{{# WEnvironment}}
http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util
{{/ WEnvironment}}
{{^ WEnvironment}}
http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util
{{/ WEnvironment}}
\ No newline at end of file
... ...
{{# WEnvironment}}
http://localhost:8000/dist/yohogirls-frontend-web/assets/images
{{/ WEnvironment}}
{{^ WEnvironment}}
http://cmsres.test.yoho.cn/res/new/girls/assets/images
{{/ WEnvironment}}
\ No newline at end of file
... ...
... ... @@ -6,6 +6,7 @@
<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/index.js"></script>
<script type="text/javascript">
alert("WEnvironment不存在");
seajs.use("index");
</script>
{{/ WEnvironment}}
\ No newline at end of file
... ...
... ... @@ -6,7 +6,7 @@
<span class="text-area">
<a class="title" target="_blank" href="{{boyDownloadUrl}}">YOHO!BOYS</a>
<a class="subtitle" target="_blank" href="{{boyDownloadUrl}}">We love to Play &amp; Lean</a>
<a class="detail" target="_blank" href="{{boyDownloadUrl}}">{{UITexts.default.bottomBoys}}</a>
<a class="detail" target="_blank" href="{{boyDownloadUrl}}">线上周刊，潮流百科生活</a>
</span>
</div>
<span class='split-line'></span>
... ... @@ -16,22 +16,22 @@
<span class="text-area">
<a class="title" target="_blank" href="{{girlDownloadUrl}}">YOHO!GIRLS</a>
<a class="subtitle" target="_blank" href="{{girlDownloadUrl}}">No Fashion,No Life</a>
<a class="detail" target="_blank" href="{{girlDownloadUrl}}">{{UITexts.default.bottomGirls}}</a>
<a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
</span>
</div>
</div>
<div class="bottom-right">
<div class="div-right">
<span class="span-links">
<a class="links" href="channel/about/index">{{UITexts.default.bottomLinks.aboutus}}</a><a class="line"></a>
<a class="links" href="./channel/about/contactus">{{UITexts.default.bottomLinks.contactus}}</a><a class="line"></a>
<a class="links" href="./channel/about/servers">{{UITexts.default.bottomLinks.service}}</a><a class="line"></a>
<a class="links" href="./channel/about/privacy">{{UITexts.default.bottomLinks.privacy}}</a><a class="line"></a>
<a class="links" href="./channel/about/feedback">{{UITexts.default.bottomLinks.feedback}}</a><a class="line"></a>
<a class="links" href="./channel/about/links">{{UITexts.default.bottomLinks.links}}</a>
<a class="links" href="channel/about/index">关于我们</a><a class="line"></a>
<a class="links" href="./channel/about/contactus">联系我们</a><a class="line"></a>
<a class="links" href="./channel/about/servers">版权声明</a><a class="line"></a>
<a class="links" href="./channel/about/privacy">隐私条款</a><a class="line"></a>
<a class="links" href="./channel/about/feedback">意见反馈</a><a class="line"></a>
<a class="links" href="./channel/about/links">友情链接</a>
</span>
<span class="span-right">
{{UITexts.default.right}}
CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
</span>
</div>
</div>
... ...
... ... @@ -7,49 +7,25 @@
<meta name="keywords" content="{{keywords}}" />
<meta name="description" content="{{description}}" />
<title>{{title}}</title>
<meta name="author" content="yohogirls.com" />
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
<meta property="wb:webmaster" content="5ffc4cd75e724a17" />
<link rel="dns-prefetch" href="//img01.yohoboys.com" />
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
{{> common/environment_css}}
</head>
<body>
<!--开头的集团导航-->
<div class="enterprise-header-content">
<ul class="enterprise-header">
<<<<<<< .merge_file_a05040
<li class="item first enterprise-yoho"><span>{{UITexts.default.enterprise.yoho-en}}</span><a href="http://www.yoho.cn" target="_blank">
{{UITexts.default.enterprise.yoho-cn}}
</a></li>
<li class="item enterprise-youhuo"><span>{{UITexts.default.enterprise.yohobuy-en}}</span><a href="http://www.yohobuy.com" target="_blank">
{{UITexts.default.enterprise.yohobuy-cn}}
</a></li>
<li class="item enterprise-boys"><span>{{UITexts.default.enterprise.yohoboys-en}}</span><a href="http://www.yohoboys.com">
{{UITexts.default.enterprise.yohoboys-cn}}
</a></li>
<li class="item enterprise-girls item-choosen"><span style="color:#000;">{{UITexts.default.enterprise.yohogirls-cn}}</span><a href="http://www.yohogirls.com" target="_blank">
{{UITexts.default.enterprise.yohogirls-cn}}
</a></li>
<li class="item enterprise-show"><span>{{UITexts.default.enterprise.yohoshow-en}}</span><a href="http://www.yohoshow.com" target="_blank">
{{UITexts.default.enterprise.yohoshow-cn}}
</a></li>
<li class="item enterprise-yohood"><span>{{UITexts.default.enterprise.yohood-en}}</span><a href="http://www.yohood.cn" target="_blank">
{{UITexts.default.enterprise.yohood-cn}}
</a></li>
=======
<li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
<li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span style="color:#000;">YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
>>>>>>> .merge_file_a12168
<li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
</ul>
... ... @@ -62,8 +38,8 @@
<div class="menubar">
<div class="menu-item menu-item-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">{{UITexts.default.menu.fashion-en}}</a>
<a class="hover-text">{{UITexts.default.menu.fashion-cn}}</a>
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
<a class="menu" href="/fashion/index.html"></a>
<div class="submenu submenu-fashion">
<div class="submenu-loading"></div>
... ... @@ -77,8 +53,8 @@
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">{{UITexts.default.menu.beauty-en}}</a>
<a class="hover-text">{{UITexts.default.menu.beauty-cn}}</a>
<a class="text">beauty</a>
<a class="hover-text">美丽</a>
<a class="menu" href="/beauty/index.html"></a>
<div class="submenu submenu-beauty">
<div class="submenu-loading"></div>
... ... @@ -90,8 +66,8 @@
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sport sports-choosen">
<a class="text">{{UITexts.default.menu.sport-en}}</a>
<a class="hover-text">{{UITexts.default.menu.sport-cn}}</a>
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sport">
<div class="submenu-loading"></div>
... ... @@ -102,8 +78,8 @@
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">{{UITexts.default.menu.lifestyle-en}}</a>
<a class="hover-text">{{UITexts.default.menu.lifestyle-cn}}</a>
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
<a class="menu" href="/lifestyle/index.html"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
... ... @@ -114,8 +90,8 @@
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">{{UITexts.default.menu.video-en}}</a>
<a class="hover-text">{{UITexts.default.menu.video-cn}}</a>
<a class="text">video</a>
<a class="hover-text">视频</a>
<a class="menu" href="/video/index.html"></a>
<div class="submenu submenu-video">
<div class="left-menu">
... ... @@ -132,8 +108,8 @@
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-magazine magazine-choosen ">
<a class="text" style="text-align:left;">{{UITexts.default.menu.magazine-en}}</a>
<a class="hover-text">{{UITexts.default.menu.magazine-cn}}</a>
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">杂志</a>
<a class="menu" href="/magazine/index.html"></a>
</span>
</div>
... ... @@ -278,8 +254,4 @@
</div>
</div>
</div>
{{# scrollToContent}}
<input type="hidden" id="scrollToContent"/>
{{/ scrollToContent}}
... ...