Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
Showing
5 changed files
with
31 additions
and
2 deletions
static/js/home/fresh-list.js
0 → 100644
@@ -29,6 +29,7 @@ | @@ -29,6 +29,7 @@ | ||
29 | 微信分享至朋友圈 | 29 | 微信分享至朋友圈 |
30 | </p> | 30 | </p> |
31 | </div> | 31 | </div> |
32 | + <div class="tip-wrap hide"> | ||
32 | <div class="tip hide fail"> | 33 | <div class="tip hide fail"> |
33 | <div class="title"> | 34 | <div class="title"> |
34 | 领取失败<br> | 35 | 领取失败<br> |
@@ -42,6 +43,9 @@ | @@ -42,6 +43,9 @@ | ||
42 | 刷新 | 43 | 刷新 |
43 | </a> | 44 | </a> |
44 | </div> | 45 | </div> |
46 | + </div> | ||
47 | + | ||
48 | + <div class="tip-wrap hide"> | ||
45 | <div class="tip hide geted"> | 49 | <div class="tip hide geted"> |
46 | <div class="title"> | 50 | <div class="title"> |
47 | 你已领取过优惠券 | 51 | 你已领取过优惠券 |
@@ -54,6 +58,8 @@ | @@ -54,6 +58,8 @@ | ||
54 | 返回 | 58 | 返回 |
55 | </a> | 59 | </a> |
56 | </div> | 60 | </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