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 @@ @@ -13,9 +13,11 @@
13 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 13 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
14 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 14 <link rel="dns-prefetch" href="//video.yohoboys.com" />
15 {{> common/environment_css}} 15 {{> common/environment_css}}
  16 + {{> common/environment_js}}
16 </head> 17 </head>
17 <body> 18 <body>
18 -{{# emailAddress}} 19 +
  20 +{{^ emailAddress}}
19 <div class="emailBox"> 21 <div class="emailBox">
20 <div class="webLogo"> 22 <div class="webLogo">
21 <a href="/index.html"> 23 <a href="/index.html">
@@ -30,32 +32,22 @@ @@ -30,32 +32,22 @@
30 </div> 32 </div>
31 <p class="black">NewPower Co. All Right Reserved</p> 33 <p class="black">NewPower Co. All Right Reserved</p>
32 </div> 34 </div>
33 -{{> common/environment_js}} 35 +
  36 +
  37 +
34 <script type="text/javascript"> 38 <script type="text/javascript">
35 -seajs.use("jquery",function($)  
36 - {  
37 - $('.cancelBtn').click(function(){  
38 - var email_val = $('#email').val();  
39 - if(email_val.length === 0){  
40 - alert("<?php echo t('请输入邮箱地址！', $this->view->_language);?>");  
41 - return false;  
42 - }  
43 - var search_str = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;  
44 - if(!search_str.test(email_val)){  
45 - alert("<?php echo t('请输入正确的邮箱地址！', $this->view->_language);?>");  
46 - return false;  
47 - }  
48 -  
49 - });  
50 - });  
51 -</script> 39 + seajs.use("./channel/email",function(email)
  40 + {
  41 + email.noEmail();
  42 + });
  43 + </script>
52 {{/ emailAddress}} 44 {{/ emailAddress}}
53 45
54 46
55 -{{^ emailAddress}} 47 +{{# emailAddress}}
56 <div class="emailBox"> 48 <div class="emailBox">
57 <div class="webLogo"> 49 <div class="webLogo">
58 - <a href="/index.html"><img src="{{SITE_STATIC 'images'}}/little_logo.png" alt=""></a> 50 + <a href="/index.html"><img src="{{> common/environment_images}}/little_logo.png" alt=""></a>
59 </div> 51 </div>
60 <h1>取消订阅成功</h1> 52 <h1>取消订阅成功</h1>
61 <div class="cancelForm"> 53 <div class="cancelForm">
@@ -75,50 +67,16 @@ seajs.use("jquery",function($) @@ -75,50 +67,16 @@ seajs.use("jquery",function($)
75 <p class="backYohoBoys"><a class="times" href="#">&lt;&lt; Back YOHO！Girls </a></p> 67 <p class="backYohoBoys"><a class="times" href="#">&lt;&lt; Back YOHO！Girls </a></p>
76 <p class="black">NewPower Co. All Right Reserved</p> 68 <p class="black">NewPower Co. All Right Reserved</p>
77 </div> 69 </div>
78 -{{> common/environment_js}}  
79 -<script type="text/javascript">  
80 - seajs.use("jquery",function($)  
81 - {  
82 - $("input[name='radio']").click(function()  
83 - {  
84 - var index = $("input[name='radio']").index(this);  
85 - if(index==4)  
86 - {  
87 - $("textarea").removeAttr("readonly");  
88 - }  
89 - else  
90 - {  
91 - $("textarea").attr("readonly",true);  
92 - $("textarea").val('');  
93 - }  
94 - });  
95 70
96 - $(".submitEmail").click(function()  
97 - {  
98 - var type = $("input[name='radio']:checked").val();  
99 - var reson = $("textarea").val();  
100 - var email = $(".radioBox").attr("val");  
101 - $.ajax  
102 - ({  
103 - url: '/passport/subscribe/callback',  
104 - data: {"refuse_type":type, "reson":reson, "email":email},  
105 - dataType: "JSON",  
106 - type: "POST",  
107 - success: function(response)  
108 - {  
109 - if (response.code == 200)  
110 - {  
111 - alert("取消订阅成功!");  
112 - history.go(-1);  
113 - }  
114 - else  
115 - {  
116 - alert("取消订阅失败!");  
117 - }  
118 - }  
119 - });  
120 - });  
121 - }); 71 +
  72 +
  73 +
  74 +
  75 +<script type="text/javascript">
  76 + seajs.use("./channel/email",function(email)
  77 + {
  78 + email.hasEmail();
  79 + });
122 </script> 80 </script>
123 {{/ emailAddress}} 81 {{/ emailAddress}}
124 </body> 82 </body>
  1 +{{# WEnvironment}}
  2 + http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util
  3 +{{/ WEnvironment}}
  4 +
  5 +{{^ WEnvironment}}
  6 + http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util
  7 +{{/ WEnvironment}}
  1 +{{# WEnvironment}}
  2 + http://localhost:8000/dist/yohogirls-frontend-web/assets/images
  3 +{{/ WEnvironment}}
  4 +
  5 +{{^ WEnvironment}}
  6 + http://cmsres.test.yoho.cn/res/new/girls/assets/images
  7 +{{/ WEnvironment}}
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script> 6 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
7 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script> 7 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
8 <script type="text/javascript"> 8 <script type="text/javascript">
  9 + alert("WEnvironment不存在");
9 seajs.use("index"); 10 seajs.use("index");
10 </script> 11 </script>
11 {{/ WEnvironment}} 12 {{/ WEnvironment}}
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <span class="text-area"> 6 <span class="text-area">
7 <a class="title" target="_blank" href="{{boyDownloadUrl}}">YOHO!BOYS</a> 7 <a class="title" target="_blank" href="{{boyDownloadUrl}}">YOHO!BOYS</a>
8 <a class="subtitle" target="_blank" href="{{boyDownloadUrl}}">We love to Play &amp; Lean</a> 8 <a class="subtitle" target="_blank" href="{{boyDownloadUrl}}">We love to Play &amp; Lean</a>
9 - <a class="detail" target="_blank" href="{{boyDownloadUrl}}">{{UITexts.default.bottomBoys}}</a> 9 + <a class="detail" target="_blank" href="{{boyDownloadUrl}}">线上周刊，潮流百科生活</a>
10 </span> 10 </span>
11 </div> 11 </div>
12 <span class='split-line'></span> 12 <span class='split-line'></span>
@@ -16,22 +16,22 @@ @@ -16,22 +16,22 @@
16 <span class="text-area"> 16 <span class="text-area">
17 <a class="title" target="_blank" href="{{girlDownloadUrl}}">YOHO!GIRLS</a> 17 <a class="title" target="_blank" href="{{girlDownloadUrl}}">YOHO!GIRLS</a>
18 <a class="subtitle" target="_blank" href="{{girlDownloadUrl}}">No Fashion,No Life</a> 18 <a class="subtitle" target="_blank" href="{{girlDownloadUrl}}">No Fashion,No Life</a>
19 - <a class="detail" target="_blank" href="{{girlDownloadUrl}}">{{UITexts.default.bottomGirls}}</a> 19 + <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
20 </span> 20 </span>
21 </div> 21 </div>
22 </div> 22 </div>
23 <div class="bottom-right"> 23 <div class="bottom-right">
24 <div class="div-right"> 24 <div class="div-right">
25 <span class="span-links"> 25 <span class="span-links">
26 - <a class="links" href="channel/about/index">{{UITexts.default.bottomLinks.aboutus}}</a><a class="line"></a>  
27 - <a class="links" href="./channel/about/contactus">{{UITexts.default.bottomLinks.contactus}}</a><a class="line"></a>  
28 - <a class="links" href="./channel/about/servers">{{UITexts.default.bottomLinks.service}}</a><a class="line"></a>  
29 - <a class="links" href="./channel/about/privacy">{{UITexts.default.bottomLinks.privacy}}</a><a class="line"></a>  
30 - <a class="links" href="./channel/about/feedback">{{UITexts.default.bottomLinks.feedback}}</a><a class="line"></a>  
31 - <a class="links" href="./channel/about/links">{{UITexts.default.bottomLinks.links}}</a> 26 + <a class="links" href="channel/about/index">关于我们</a><a class="line"></a>
  27 + <a class="links" href="./channel/about/contactus">联系我们</a><a class="line"></a>
  28 + <a class="links" href="./channel/about/servers">版权声明</a><a class="line"></a>
  29 + <a class="links" href="./channel/about/privacy">隐私条款</a><a class="line"></a>
  30 + <a class="links" href="./channel/about/feedback">意见反馈</a><a class="line"></a>
  31 + <a class="links" href="./channel/about/links">友情链接</a>
32 </span> 32 </span>
33 <span class="span-right"> 33 <span class="span-right">
34 - {{UITexts.default.right}} 34 + CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
35 </span> 35 </span>
36 </div> 36 </div>
37 </div> 37 </div>
@@ -7,49 +7,25 @@ @@ -7,49 +7,25 @@
7 7
8 <meta name="keywords" content="{{keywords}}" /> 8 <meta name="keywords" content="{{keywords}}" />
9 <meta name="description" content="{{description}}" /> 9 <meta name="description" content="{{description}}" />
10 -  
11 <title>{{title}}</title> 10 <title>{{title}}</title>
12 -  
13 <meta name="author" content="yohogirls.com" /> 11 <meta name="author" content="yohogirls.com" />
14 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 12 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
15 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 13 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
16 <link rel="dns-prefetch" href="//img01.yohoboys.com" /> 14 <link rel="dns-prefetch" href="//img01.yohoboys.com" />
17 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 15 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
18 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 16 <link rel="dns-prefetch" href="//video.yohoboys.com" />
19 - <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" /> 17 + {{> common/environment_css}}
20 </head> 18 </head>
21 <body> 19 <body>
22 <!--开头的集团导航--> 20 <!--开头的集团导航-->
23 <div class="enterprise-header-content"> 21 <div class="enterprise-header-content">
24 <ul class="enterprise-header"> 22 <ul class="enterprise-header">
25 -<<<<<<< .merge_file_a05040  
26 - <li class="item first enterprise-yoho"><span>{{UITexts.default.enterprise.yoho-en}}</span><a href="http://www.yoho.cn" target="_blank">  
27 - {{UITexts.default.enterprise.yoho-cn}}  
28 - </a></li>  
29 - <li class="item enterprise-youhuo"><span>{{UITexts.default.enterprise.yohobuy-en}}</span><a href="http://www.yohobuy.com" target="_blank">  
30 - {{UITexts.default.enterprise.yohobuy-cn}}  
31 - </a></li>  
32 - <li class="item enterprise-boys"><span>{{UITexts.default.enterprise.yohoboys-en}}</span><a href="http://www.yohoboys.com">  
33 - {{UITexts.default.enterprise.yohoboys-cn}}  
34 - </a></li>  
35 - <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">  
36 - {{UITexts.default.enterprise.yohogirls-cn}}  
37 - </a></li>  
38 - <li class="item enterprise-show"><span>{{UITexts.default.enterprise.yohoshow-en}}</span><a href="http://www.yohoshow.com" target="_blank">  
39 - {{UITexts.default.enterprise.yohoshow-cn}}  
40 - </a></li>  
41 - <li class="item enterprise-yohood"><span>{{UITexts.default.enterprise.yohood-en}}</span><a href="http://www.yohood.cn" target="_blank">  
42 - {{UITexts.default.enterprise.yohood-cn}}  
43 - </a></li>  
44 -=======  
45 <li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li> 23 <li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
46 <li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li> 24 <li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
47 <li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li> 25 <li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
48 <li class="item enterprise-girls item-choosen"><span style="color:#000;">YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 26 <li class="item enterprise-girls item-choosen"><span style="color:#000;">YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
49 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 27 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
50 -  
51 <li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li> 28 <li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
52 ->>>>>>> .merge_file_a12168  
53 <li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li> 29 <li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
54 30
55 </ul> 31 </ul>
@@ -62,8 +38,8 @@ @@ -62,8 +38,8 @@
62 <div class="menubar"> 38 <div class="menubar">
63 <div class="menu-item menu-item-fashion"> 39 <div class="menu-item menu-item-fashion">
64 <span class=" menu-link-fashion fashion-choosen menu-link-channel "> 40 <span class=" menu-link-fashion fashion-choosen menu-link-channel ">
65 - <a class="text">{{UITexts.default.menu.fashion-en}}</a>  
66 - <a class="hover-text">{{UITexts.default.menu.fashion-cn}}</a> 41 + <a class="text">fashion</a>
  42 + <a class="hover-text">时尚</a>
67 <a class="menu" href="/fashion/index.html"></a> 43 <a class="menu" href="/fashion/index.html"></a>
68 <div class="submenu submenu-fashion"> 44 <div class="submenu submenu-fashion">
69 <div class="submenu-loading"></div> 45 <div class="submenu-loading"></div>
@@ -77,8 +53,8 @@ @@ -77,8 +53,8 @@
77 <div class="menu-item menu-item-sports"> 53 <div class="menu-item menu-item-sports">
78 <span class="menu-link-channel menu-link-beauty beauty-choosen"> 54 <span class="menu-link-channel menu-link-beauty beauty-choosen">
79 55
80 - <a class="text">{{UITexts.default.menu.beauty-en}}</a>  
81 - <a class="hover-text">{{UITexts.default.menu.beauty-cn}}</a> 56 + <a class="text">beauty</a>
  57 + <a class="hover-text">美丽</a>
82 <a class="menu" href="/beauty/index.html"></a> 58 <a class="menu" href="/beauty/index.html"></a>
83 <div class="submenu submenu-beauty"> 59 <div class="submenu submenu-beauty">
84 <div class="submenu-loading"></div> 60 <div class="submenu-loading"></div>
@@ -90,8 +66,8 @@ @@ -90,8 +66,8 @@
90 66
91 <div class="menu-item menu-item-lifestyle"> 67 <div class="menu-item menu-item-lifestyle">
92 <span class="menu-link-channel menu-link-sport sports-choosen"> 68 <span class="menu-link-channel menu-link-sport sports-choosen">
93 - <a class="text">{{UITexts.default.menu.sport-en}}</a>  
94 - <a class="hover-text">{{UITexts.default.menu.sport-cn}}</a> 69 + <a class="text">sports</a>
  70 + <a class="hover-text">运动</a>
95 <a class="menu" href="/sports/index.html"></a> 71 <a class="menu" href="/sports/index.html"></a>
96 <div class="submenu submenu-sport"> 72 <div class="submenu submenu-sport">
97 <div class="submenu-loading"></div> 73 <div class="submenu-loading"></div>
@@ -102,8 +78,8 @@ @@ -102,8 +78,8 @@
102 </div> 78 </div>
103 <div class="menu-item menu-item-map"> 79 <div class="menu-item menu-item-map">
104 <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen"> 80 <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
105 - <a class="text">{{UITexts.default.menu.lifestyle-en}}</a>  
106 - <a class="hover-text">{{UITexts.default.menu.lifestyle-cn}}</a> 81 + <a class="text">lifestyle</a>
  82 + <a class="hover-text">生活</a>
107 <a class="menu" href="/lifestyle/index.html"></a> 83 <a class="menu" href="/lifestyle/index.html"></a>
108 <div class="submenu submenu-lifestyle"> 84 <div class="submenu submenu-lifestyle">
109 <!--<span class="arrow"></span>--> 85 <!--<span class="arrow"></span>-->
@@ -114,8 +90,8 @@ @@ -114,8 +90,8 @@
114 </div> 90 </div>
115 <div class="menu-item menu-item-map"> 91 <div class="menu-item menu-item-map">
116 <span class="menu-link-channel menu-link-video video-choosen"> 92 <span class="menu-link-channel menu-link-video video-choosen">
117 - <a class="text">{{UITexts.default.menu.video-en}}</a>  
118 - <a class="hover-text">{{UITexts.default.menu.video-cn}}</a> 93 + <a class="text">video</a>
  94 + <a class="hover-text">视频</a>
119 <a class="menu" href="/video/index.html"></a> 95 <a class="menu" href="/video/index.html"></a>
120 <div class="submenu submenu-video"> 96 <div class="submenu submenu-video">
121 <div class="left-menu"> 97 <div class="left-menu">
@@ -132,8 +108,8 @@ @@ -132,8 +108,8 @@
132 </div> 108 </div>
133 <div class="menu-item menu-item-map"> 109 <div class="menu-item menu-item-map">
134 <span class="menu-link-channel menu-link-magazine magazine-choosen "> 110 <span class="menu-link-channel menu-link-magazine magazine-choosen ">
135 - <a class="text" style="text-align:left;">{{UITexts.default.menu.magazine-en}}</a>  
136 - <a class="hover-text">{{UITexts.default.menu.magazine-cn}}</a> 111 + <a class="text" style="text-align:left;">magazine</a>
  112 + <a class="hover-text">杂志</a>
137 <a class="menu" href="/magazine/index.html"></a> 113 <a class="menu" href="/magazine/index.html"></a>
138 </span> 114 </span>
139 </div> 115 </div>
@@ -278,8 +254,4 @@ @@ -278,8 +254,4 @@
278 </div> 254 </div>
279 </div> 255 </div>
280 </div> 256 </div>
281 -  
282 -  
283 - {{# scrollToContent}}  
284 <input type="hidden" id="scrollToContent"/> 257 <input type="hidden" id="scrollToContent"/>
285 - {{/ scrollToContent}}