Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
Showing
5 changed files
with
52 additions
and
23 deletions
static/js/home/fresh-list.js
0 → 100644
@@ -29,31 +29,37 @@ | @@ -29,31 +29,37 @@ | ||
29 | 微信分享至朋友圈 | 29 | 微信分享至朋友圈 |
30 | </p> | 30 | </p> |
31 | </div> | 31 | </div> |
32 | - <div class="tip hide fail"> | ||
33 | - <div class="title"> | ||
34 | - 领取失败<br> | ||
35 | - 请刷新重新领取 | ||
36 | - </div> | ||
37 | - <div class="desc"> | ||
38 | - 如多次领取失败,请联系客服人员<br> | ||
39 | - 带来不便敬请谅解 | 32 | + <div class="tip-wrap hide"> |
33 | + <div class="tip hide fail"> | ||
34 | + <div class="title"> | ||
35 | + 领取失败<br> | ||
36 | + 请刷新重新领取 | ||
37 | + </div> | ||
38 | + <div class="desc"> | ||
39 | + 如多次领取失败,请联系客服人员<br> | ||
40 | + 带来不便敬请谅解 | ||
41 | + </div> | ||
42 | + <a class="button" href=""> | ||
43 | + 刷新 | ||
44 | + </a> | ||
40 | </div> | 45 | </div> |
41 | - <a class="button" href=""> | ||
42 | - 刷新 | ||
43 | - </a> | ||
44 | </div> | 46 | </div> |
45 | - <div class="tip hide geted"> | ||
46 | - <div class="title"> | ||
47 | - 你已领取过优惠券 | ||
48 | - </div> | ||
49 | - <div class="sub-title"> | ||
50 | - 快去分享给更多<br> | ||
51 | - 喜爱<span class="title">潮流</span>的小伙伴吧! | 47 | + |
48 | + <div class="tip-wrap hide"> | ||
49 | + <div class="tip hide geted"> | ||
50 | + <div class="title"> | ||
51 | + 你已领取过优惠券 | ||
52 | + </div> | ||
53 | + <div class="sub-title"> | ||
54 | + 快去分享给更多<br> | ||
55 | + 喜爱<span class="title">潮流</span>的小伙伴吧! | ||
56 | + </div> | ||
57 | + <a class="button close" href=""> | ||
58 | + 返回 | ||
59 | + </a> | ||
52 | </div> | 60 | </div> |
53 | - <a class="button close" href=""> | ||
54 | - 返回 | ||
55 | - </a> | ||
56 | </div> | 61 | </div> |
62 | + | ||
57 | {{#if isApp}} | 63 | {{#if isApp}} |
58 | <input type="hidden" value="{{getCouponUrl}}" id="getCouponUrl"> | 64 | <input type="hidden" value="{{getCouponUrl}}" id="getCouponUrl"> |
59 | {{/if}} | 65 | {{/if}} |
@@ -9,8 +9,8 @@ use Plugin\Helpers; | @@ -9,8 +9,8 @@ use Plugin\Helpers; | ||
9 | */ | 9 | */ |
10 | class XinshiliController extends HuodongAction | 10 | class XinshiliController extends HuodongAction |
11 | { | 11 | { |
12 | - // const STATIC_FILE = 'http://localhost:2222/1.0.4'; | ||
13 | - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.4'; | 12 | + // const STATIC_FILE = 'http://localhost:2222/1.0.5'; |
13 | + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.5'; | ||
14 | 14 | ||
15 | /** | 15 | /** |
16 | * 检测登录状态 | 16 | * 检测登录状态 |
-
Please register or login to post a comment