Authored by hf

Merge branch 'master' into beta

@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 29
30 .coupon-bottom { 30 .coupon-bottom {
31 height: 10.825rem; 31 height: 10.825rem;
32 - background: url(../images/bottom-bg.png) no-repeat bottom center; 32 + background: url(../../img/final/bottom-bg.png) no-repeat bottom center;
33 background-size: 100% 100%; 33 background-size: 100% 100%;
34 } 34 }
35 35
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 right: 0; 74 right: 0;
75 bottom: 0; 75 bottom: 0;
76 left: 0; 76 left: 0;
77 - background: url(../images/share.png) center top no-repeat; 77 + background: url(../../img/final/share.png) center top no-repeat;
78 -webkit-background-size: 100%; 78 -webkit-background-size: 100%;
79 -moz-background-size: 100%; 79 -moz-background-size: 100%;
80 background-size: 100%; 80 background-size: 100%;
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 right: 0; 87 right: 0;
88 bottom: 0; 88 bottom: 0;
89 left: 0; 89 left: 0;
90 - background: rgba(0,0,0,0.4) url(../images/11.png); 90 + background: rgba(0,0,0,0.4) url(../../img/final/11.png);
91 background-repeat: no-repeat; 91 background-repeat: no-repeat;
92 background-size: 80% auto; 92 background-size: 80% auto;
93 background-position: center center; 93 background-position: center center;
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)"> 9 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)">
10 <meta name="apple-mobile-web-app-capable" content="yes"> 10 <meta name="apple-mobile-web-app-capable" content="yes">
11 <meta name="apple-mobile-web-app-status-bar-style" content="grey"> 11 <meta name="apple-mobile-web-app-status-bar-style" content="grey">
12 - <link rel="stylesheet" href="{{imgUrl}}/cuxiao/css/final/index.css"> 12 + <link rel="stylesheet" href="{{imgUrl}}/cuxiao/css/final/sale.css">
13 <script> 13 <script>
14 (function(doc, win) { 14 (function(doc, win) {
15 var docEl = doc.documentElement; 15 var docEl = doc.documentElement;
@@ -99,114 +99,4 @@ @@ -99,114 +99,4 @@
99 {{/if}} 99 {{/if}}
100 {{> layout/analysis}} 100 {{> layout/analysis}}
101 </body> 101 </body>
102 -</html><!DOCTYPE html>  
103 -<html>  
104 -<head>  
105 - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">  
106 - <meta charset="utf-8">  
107 - <title>{{staticTitle}}</title>  
108 - <meta name="apple-mobile-web-app-title" content="SUMMER SALE">  
109 - <meta name="format-detection" content="telephone=no">  
110 - <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)">  
111 - <meta name="apple-mobile-web-app-capable" content="yes">  
112 - <meta name="apple-mobile-web-app-status-bar-style" content="grey">  
113 - <link rel="stylesheet" href="{{imgUrl}}/cuxiao/css/christmas/index4.css">  
114 - <script>  
115 - (function(doc, win) {  
116 - var docEl = doc.documentElement;  
117 - (function() {  
118 - var clientWidth = docEl.clientWidth;  
119 - if (!clientWidth) {  
120 - return;  
121 - }  
122 - docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';  
123 - }());  
124 - })(document, window);  
125 - </script>  
126 -</head>  
127 -<body class="keBody">  
128 -<div class="coupon-christmas" show="{{showPopupFlag}}">  
129 - <div class="coupon-top">  
130 - <img src="{{imgUrl}}/cuxiao/img/final/top-bg.png" alt="">  
131 - <a class="go-check" href="{{myCouponUrl}}"></a>  
132 - <a class="share-btn" href="javascript:;"></a>  
133 - </div>  
134 - <div class="coupon-bottom">  
135 - <div class="coupon-banner">  
136 - <a href="{{bannerUrl_1}}">  
137 - <img src="{{imgUrl}}/cuxiao/img/final/banner01.png" alt="">  
138 - </a>  
139 - <a href="{{bannerUrl_2}}">  
140 - <img src="{{imgUrl}}/cuxiao/img/final/banner02.png" alt="">  
141 - </a>  
142 - <a href="{{bannerUrl_3}}">  
143 - <img src="{{imgUrl}}/cuxiao/img/final/banner03.png" alt="">  
144 - </a>  
145 - <a href="{{bannerUrl_4}}">  
146 - <img src="{{imgUrl}}/cuxiao/img/final/banner04.png" alt="">  
147 - </a>  
148 - </div>  
149 - <div class="bottom-btn">  
150 - <a class="follow-yoho" href="http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&amp;mid=201849402&amp;idx=1&amp;sn=c0089812f9769d82e0075f69d771f6e1#rd"></a>  
151 - <a class="download-yoho" href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho&amp;g_f=995445"></a>  
152 - </div>  
153 -  
154 - </div>  
155 - <div class="coupon-ft">  
156 - <img src="{{imgUrl}}/cuxiao/img/final/14.png">  
157 - </div>  
158 -</div>  
159 -<div class="modal"></div>  
160 -<div class="dialog-box geted">  
161 - <div class="dialog-inner">  
162 - <img src="{{imgUrl}}/cuxiao/img/final/geted.png" alt=""/>  
163 - <span class="dialog-close"></span>  
164 - </div>  
165 -</div>  
166 -  
167 -<div class="dialog-box fail">  
168 - <div class="dialog-inner">  
169 - <img src="{{imgUrl}}/cuxiao/img/final/fail.png" alt=""/>  
170 - <span class="refresh-btn"></span>  
171 - </div>  
172 -</div>  
173 -<input id="shareLink" type="hidden" value="{{shareLink}}">  
174 -<input id="shareImg" type="hidden" value="{{shareImg}}">  
175 -<input id="shareTitle" type="hidden" value="{{shareTitle}}">  
176 -<input id="shareDesc" type="hidden" value="{{shareDesc}}">  
177 -<script type="text/javascript" src="{{imgUrl}}/cuxiao/js/jquery.min.js"></script>  
178 -<script>  
179 - //提示分享  
180 - $('.share-btn').click(function () {  
181 - $('.modal').fadeIn();  
182 - });  
183 - //关闭提示分享  
184 - $('.modal').click(function () {  
185 - $(this).fadeOut();  
186 - });  
187 -  
188 - //提示已领过券  
189 - if ($('.coupon-christmas').attr('show') === '1') {  
190 - $('.dialog-box.geted').show();  
191 - }  
192 - //提示领券失败  
193 - else if ($('.coupon-christmas').attr('show') === '2') {  
194 - $('.dialog-box.fail').show();  
195 - }  
196 -  
197 - //关闭提示  
198 - $('.dialog-close').click(function(){  
199 - $(this).parents('.dialog-box').fadeOut();  
200 - });  
201 - //刷新页面  
202 - $('.refresh-btn').click(function() {  
203 - location.reload();  
204 - });  
205 -</script>  
206 -{{#if weixinShare}}  
207 -<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>  
208 -<script type="text/javascript" charset="utf-8" src="{{jsUrl}}/cuxiao/js/share.weixin.js"></script>  
209 -{{/if}}  
210 -{{> layout/analysis}}  
211 -</body>  
212 </html> 102 </html>