ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit ad10b261bd7c75d2597f7880ff590f99357cb815 1 parent 3ab83134

修正BUG5437

Inline Side-by-side
Showing 3 changed files with 30 additions and 35 deletions
@@ -18,31 +18,9 @@ @@ -18,31 +18,9 @@
18 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 18 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
19 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 19 <link rel="dns-prefetch" href="//video.yohoboys.com" />
20 {{> common/environment_css}} 20 {{> common/environment_css}}
21 -</head>  
22 -{{^ isFinish}}  
23 -<body>  
24 - <div class="emailBox">  
25 - <h1>就要完成了...</h1>  
26 -  
27 - <p class="mb5">我们需要对您的电子邮件地址进行确认！</p>  
28 - {{^ success}}  
29 - <p class="mb20">发送邮件失败，请返回再次发送。</p>  
30 - {{/ success}}  
31 -  
32 - {{# success}}  
33 - <p class="mb20">完成订阅过程，请点击我们刚刚发给您的电子邮件中的链接。</p>  
34 - {{/ success}}  
35 -  
36 - <p class="black">NewPower Co. All Right Reserved</p>  
37 - <div class="btnGroup clearfix">  
38 - <a class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</a>  
39 - <a class="CheckEmail" href="{{emailServer}}">Check my email</a>  
40 - </div>  
41 - </div>  
42 -{{/ isFinish}}  
43 - 21 +</head><body>
44 22
45 -{{# isFinish}} 23 +{{#if isFinish}}
46 24
47 <div class="emailBox"> 25 <div class="emailBox">
48 <div class="webLogo"> 26 <div class="webLogo">
@@ -61,8 +39,27 @@ @@ -61,8 +39,27 @@
61 <p class="backYohoBoys"><a class="times" href="javascript:history.go(-1)">&lt;&lt; Back YOHO！Girls </a></p> 39 <p class="backYohoBoys"><a class="times" href="javascript:history.go(-1)">&lt;&lt; Back YOHO！Girls </a></p>
62 <p class="black">NewPower Co. All Right Reserved</p> 40 <p class="black">NewPower Co. All Right Reserved</p>
63 </div> 41 </div>
  42 +{{else}}
64 43
65 -{{/ isFinish}} 44 + <div class="emailBox">
  45 + <h1>就要完成了...</h1>
  46 +
  47 + <p class="mb5">我们需要对您的电子邮件地址进行确认！</p>
  48 + {{^ success}}
  49 + <p class="mb20">发送邮件失败，请返回再次发送。</p>
  50 + {{/ success}}
  51 +
  52 + {{# success}}
  53 + <p class="mb20">完成订阅过程，请点击我们刚刚发给您的电子邮件中的链接。</p>
  54 + {{/ success}}
  55 +
  56 + <p class="black">NewPower Co. All Right Reserved</p>
  57 + <div class="btnGroup clearfix">
  58 + <a class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</a>
  59 + <a class="CheckEmail" href="{{emailServer}}">Check my email</a>
  60 + </div>
  61 + </div>
  62 +{{/if}}
66 63
67 </body> 64 </body>
68 65
1 -{{# WEnvironment}}  
2 - http://localhost:8000/dist/yohogirls-frontend-web/assets/images  
3 -{{/ WEnvironment}} 1 +{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}}
4 2
5 -{{^ WEnvironment}}  
6 - http://cmsres.test.yoho.cn/res/new/girls/assets/images  
7 -{{/ WEnvironment}}  
  3 +{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prevEnvironment}}
  4 +{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ testEnvironment}}
  5 +{{# prodEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prodEnvironment}}
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
3 {{/ devEnvironment}} 3 {{/ devEnvironment}}
4 4
5 {{^ prevEnvironment}} 5 {{^ prevEnvironment}}
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> 6 + <script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
  7 + <script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
8 <script type="text/javascript"> 8 <script type="text/javascript">
9 seajs.use("index"); 9 seajs.use("index");
10 </script> 10 </script>
@@ -22,8 +22,8 @@ @@ -22,8 +22,8 @@
22 {{/ testEnvironment}} 22 {{/ testEnvironment}}
23 23
24 {{^ prodEnvironment}} 24 {{^ prodEnvironment}}
25 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>  
26 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script> 25 + <script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
  26 + <script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
27 <script type="text/javascript"> 27 <script type="text/javascript">
28 seajs.use("index"); 28 seajs.use("index");
29 </script> 29 </script>