Showing
5 changed files
with
23 additions
and
18 deletions
@@ -18,17 +18,17 @@ class Yohobuy | @@ -18,17 +18,17 @@ class Yohobuy | ||
18 | { | 18 | { |
19 | 19 | ||
20 | // /* 正式环境 */ | 20 | // /* 正式环境 */ |
21 | -// const API_URL = 'http://api2.open.yohobuy.com/'; | ||
22 | -// const API_URL2 = 'http://api.open.yohobuy.com/'; | ||
23 | -// const SERVICE_URL = 'http://service.api.yohobuy.com/'; | ||
24 | -// const YOHOBUY_URL = 'http://www.yohobuy.com/'; | 21 | + const API_URL = 'http://api2.open.yohobuy.com/'; |
22 | + const API_URL2 = 'http://api.open.yohobuy.com/'; | ||
23 | + const SERVICE_URL = 'http://service.api.yohobuy.com/'; | ||
24 | + const YOHOBUY_URL = 'http://www.yohobuy.com/'; | ||
25 | 25 | ||
26 | /* 测试环境 */ | 26 | /* 测试环境 */ |
27 | - const API_URL = 'http://test2.open.yohobuy.com/'; | ||
28 | - const SERVICE_URL = 'http://test.service.api.yohobuy.com/'; | ||
29 | - const YOHOBUY_URL = 'http://www.yohobuy.com/'; | ||
30 | - const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL | ||
31 | - const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL | 27 | + // const API_URL = 'http://test2.open.yohobuy.com/'; |
28 | + // const SERVICE_URL = 'http://test.service.api.yohobuy.com/'; | ||
29 | + // const YOHOBUY_URL = 'http://www.yohobuy.com/'; | ||
30 | + // const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL | ||
31 | + // const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL | ||
32 | 32 | ||
33 | /** | 33 | /** |
34 | * 私钥列表 | 34 | * 私钥列表 |
@@ -29,9 +29,9 @@ function hotrank(page, sort, tabId, notab) { | @@ -29,9 +29,9 @@ function hotrank(page, sort, tabId, notab) { | ||
29 | if (page === 1) { | 29 | if (page === 1) { |
30 | $('.rank-main').remove(); | 30 | $('.rank-main').remove(); |
31 | } | 31 | } |
32 | - if(data === ' '){ | ||
33 | - $('#hotRank').html(noResult) | ||
34 | - }else{ | 32 | + if (data === ' ') { |
33 | + $('#hotRank').html(noResult); | ||
34 | + } else { | ||
35 | $('#hotRank').append(data); | 35 | $('#hotRank').append(data); |
36 | } | 36 | } |
37 | lazyLoad($('img.lazy')); | 37 | lazyLoad($('img.lazy')); |
@@ -3,18 +3,25 @@ | @@ -3,18 +3,25 @@ | ||
3 | <span class="active">未使用</span> | 3 | <span class="active">未使用</span> |
4 | <span>已使用</span> | 4 | <span>已使用</span> |
5 | </div> | 5 | </div> |
6 | +{{# couponsUrl}} | ||
6 | <div class="employ-list"> | 7 | <div class="employ-list"> |
8 | + | ||
9 | +{{# unused}} | ||
7 | <div class="employ-main"> | 10 | <div class="employ-main"> |
8 | <span>50</span> | 11 | <span>50</span> |
9 | <p>【summer sale】下装满¥399减¥50券</p> | 12 | <p>【summer sale】下装满¥399减¥50券</p> |
10 | <p>有效期:2014.07.28 - 2014.09.15</p> | 13 | <p>有效期:2014.07.28 - 2014.09.15</p> |
11 | </div> | 14 | </div> |
15 | +{{/ unused}} | ||
12 | </div> | 16 | </div> |
13 | <div class="employ-list not none"> | 17 | <div class="employ-list not none"> |
18 | +{{# used}} | ||
14 | <div class="employ-main"> | 19 | <div class="employ-main"> |
15 | - <span>60</span> | ||
16 | - <p>【summer sale】下装满¥399减¥60券</p> | ||
17 | - <p>有效期:2014.07.28 - 2014.09.15</p> | 20 | + <span>{{ money }}</span> |
21 | + <p>{{ coupon_name }}</p> | ||
22 | + <p>{{ couponValidity }}</p> | ||
18 | </div> | 23 | </div> |
24 | +{{/ used}} | ||
19 | </div> | 25 | </div> |
26 | +{{/ couponsUrl}} | ||
20 | {{> layout/footer}} | 27 | {{> layout/footer}} |
@@ -212,8 +212,6 @@ class HomeController extends AbstractAction | @@ -212,8 +212,6 @@ class HomeController extends AbstractAction | ||
212 | 'couponsUrl' => \Index\UserModel::getCouponData($uid, $status), | 212 | 'couponsUrl' => \Index\UserModel::getCouponData($uid, $status), |
213 | 'couponsPage' => true | 213 | 'couponsPage' => true |
214 | ); | 214 | ); |
215 | - print_r($coupons); | ||
216 | - | ||
217 | $this->_view->display('coupons', $coupons); | 215 | $this->_view->display('coupons', $coupons); |
218 | } | 216 | } |
219 | 217 |
-
Please register or login to post a comment