Showing
9 changed files
with
28 additions
and
122 deletions
@@ -17,8 +17,6 @@ const myCurrency = (req, res, next) => { | @@ -17,8 +17,6 @@ const myCurrency = (req, res, next) => { | ||
17 | myCurrencyModel.myCurrency(uid, contentCode).then(result => { | 17 | myCurrencyModel.myCurrency(uid, contentCode).then(result => { |
18 | 18 | ||
19 | res.render('currency-new', { | 19 | res.render('currency-new', { |
20 | - module: 'home', | ||
21 | - page: 'currency-new', | ||
22 | pageHeader: _.assign(headerModel.setNav({ | 20 | pageHeader: _.assign(headerModel.setNav({ |
23 | navTitle: '有货币' | 21 | navTitle: '有货币' |
24 | }), { | 22 | }), { |
@@ -28,7 +26,8 @@ const myCurrency = (req, res, next) => { | @@ -28,7 +26,8 @@ const myCurrency = (req, res, next) => { | ||
28 | title: '有货币', | 26 | title: '有货币', |
29 | pageFooter: true, | 27 | pageFooter: true, |
30 | yohoCoin: result.yohoCoin, | 28 | yohoCoin: result.yohoCoin, |
31 | - banner: result.banner | 29 | + banner: result.banner, |
30 | + localCss: true | ||
32 | }); | 31 | }); |
33 | }).catch(next); | 32 | }).catch(next); |
34 | }; | 33 | }; |
@@ -23,6 +23,8 @@ const bannerData = (contentCode) => { | @@ -23,6 +23,8 @@ const bannerData = (contentCode) => { | ||
23 | 23 | ||
24 | return serviceAPI.get('operations/api/v5/resource/get', { | 24 | return serviceAPI.get('operations/api/v5/resource/get', { |
25 | content_code: contentCode | 25 | content_code: contentCode |
26 | + }, { | ||
27 | + cache: true | ||
26 | }).then((result) => { | 28 | }).then((result) => { |
27 | 29 | ||
28 | if (result && result.code === 200) { | 30 | if (result && result.code === 200) { |
apps/home/views/action/currency.hbs
deleted
100644 → 0
1 | -<div class="yoho-coin-page yoho-page"> | ||
2 | - {{# yohoCoin}} | ||
3 | - <p class="coin-num"> | ||
4 | - <em>{{coin_num}}</em> | ||
5 | - 有货币 | ||
6 | - </p> | ||
7 | - | ||
8 | - <section> | ||
9 | - <p class="title">有货币</p> | ||
10 | - <hr> | ||
11 | - <p> | ||
12 | - <span class="sub-title">有货币是什么,有什么用?</span> | ||
13 | - 有货币是有货商城的虚拟货币,与现金比例1:1,没有任何使用期限,有货币可直接用于有货线上购物使用,不可转让他人,不可兑换为现金。使用有货币支付的金额不可计入消费金额。 | ||
14 | - </p> | ||
15 | - <p> | ||
16 | - <span class="sub-title">如何查看自己的有货币?</span> | ||
17 | - <span class="path">登录 > 个人中心 > 我的有货币</span> | ||
18 | - </p> | ||
19 | - <p> | ||
20 | - <span class="sub-title">有货币如何购买支付?</span> | ||
21 | - 在购买支付页面输入您要使用的有货币金额即可完成支付 | ||
22 | - | ||
23 | - <div class="remark"> | ||
24 | - <span>※ </span> | ||
25 | - 如果超过了我们约定的期限的非正常退货,我们将会于您的退款金额中直接扣除赠送有货币等值的金额。赠送给您的有货币还将保留在您的账户中,敬请谅解。 | ||
26 | - </div> | ||
27 | - </p> | ||
28 | - </section> | ||
29 | - {{/ yohoCoin}} | ||
30 | -</div> |
@@ -17,21 +17,21 @@ module.exports = { | @@ -17,21 +17,21 @@ module.exports = { | ||
17 | assetUrl: '//127.0.0.1:5001', | 17 | assetUrl: '//127.0.0.1:5001', |
18 | testCode: 'yoho4946abcdef#$%&!@', | 18 | testCode: 'yoho4946abcdef#$%&!@', |
19 | domains: { | 19 | domains: { |
20 | - // api: 'http://api-test3.yohops.com:9999/', | ||
21 | - // service: 'http://service-test3.yohops.com:9999/', | ||
22 | - // liveApi: 'http://testapi.live.yohops.com:9999/', | ||
23 | - // singleApi: 'http://api-test3.yohops.com:9999/', | ||
24 | - // imSocket: 'ws://im.yohobuy.com:10240', | ||
25 | - // imCs: 'http://im.yohobuy.com/api', | ||
26 | - // imServer: 'http://im.yohobuy.com/server' | 20 | + api: 'http://api-test3.yohops.com:9999/', |
21 | + service: 'http://service-test3.yohops.com:9999/', | ||
22 | + liveApi: 'http://testapi.live.yohops.com:9999/', | ||
23 | + singleApi: 'http://api-test3.yohops.com:9999/', | ||
24 | + imSocket: 'ws://im.yohobuy.com:10240', | ||
25 | + imCs: 'http://im.yohobuy.com/api', | ||
26 | + imServer: 'http://im.yohobuy.com/server' | ||
27 | 27 | ||
28 | - api: 'http://api.yoho.cn/', | ||
29 | - service: 'http://service.yoho.cn/', | ||
30 | - liveApi: 'http://api.live.yoho.cn/', | ||
31 | - singleApi: 'http://single.yoho.cn/', | ||
32 | - imSocket: 'wss://imsocket.yohobuy.com:443', | ||
33 | - imCs: 'https://imhttp.yohobuy.com/api', | ||
34 | - imServer: 'https://imhttp.yohobuy.com/server' | 28 | + // api: 'http://api.yoho.cn/', |
29 | + // service: 'http://service.yoho.cn/', | ||
30 | + // liveApi: 'http://api.live.yoho.cn/', | ||
31 | + // singleApi: 'http://single.yoho.cn/', | ||
32 | + // imSocket: 'wss://imsocket.yohobuy.com:443', | ||
33 | + // imCs: 'https://imhttp.yohobuy.com/api', | ||
34 | + // imServer: 'https://imhttp.yohobuy.com/server' | ||
35 | }, | 35 | }, |
36 | subDomains: { | 36 | subDomains: { |
37 | host: '.m.yohobuy.com', | 37 | host: '.m.yohobuy.com', |
1 | /** | 1 | /** |
2 | * 新有货币界面 | 2 | * 新有货币界面 |
3 | */ | 3 | */ |
4 | +require('../../scss/home/_currency-index.css'); | ||
5 | + | ||
4 | var $ = require('yoho-jquery'), | 6 | var $ = require('yoho-jquery'), |
5 | lazyLoad = require('yoho-jquery-lazyload'); | 7 | lazyLoad = require('yoho-jquery-lazyload'); |
6 | 8 | ||
7 | require('../common'); | 9 | require('../common'); |
8 | 10 | ||
9 | -lazyLoad($('img.lazy')); | ||
10 | - | ||
11 | function getGender() { | 11 | function getGender() { |
12 | return window.cookie('_Channel') || 'boys'; | 12 | return window.cookie('_Channel') || 'boys'; |
13 | } | 13 | } |
14 | 14 | ||
15 | require('../channel/maybe-like')(getGender()); | 15 | require('../channel/maybe-like')(getGender()); |
16 | 16 | ||
17 | -if ($('#goods-list').length === 0) { | 17 | +setTimeout(function() { |
18 | + | ||
19 | + lazyLoad($('img.lazy')); | ||
20 | + | ||
21 | + if ($('#goods-list').length === 0) { | ||
18 | $('.maybe-like').hide(); | 22 | $('.maybe-like').hide(); |
19 | -} | 23 | + } |
24 | +}, 30); |
public/scss/home/_currency-index.css
0 → 100644
1 | +@import "coin/yoho-coin-new"; |
@@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
3 | @import "order"; | 3 | @import "order"; |
4 | @import "order-detail"; | 4 | @import "order-detail"; |
5 | @import "personal-details"; | 5 | @import "personal-details"; |
6 | -@import "yoho-coin"; | ||
7 | @import "fav"; | 6 | @import "fav"; |
8 | @import "suggest"; | 7 | @import "suggest"; |
9 | @import "address"; | 8 | @import "address"; |
@@ -13,7 +12,6 @@ | @@ -13,7 +12,6 @@ | ||
13 | @import "browse-record"; | 12 | @import "browse-record"; |
14 | @import "logistic"; | 13 | @import "logistic"; |
15 | @import "pay"; | 14 | @import "pay"; |
16 | -@import "yoho-coin-new"; | ||
17 | @import "yoho-coin-detail"; | 15 | @import "yoho-coin-detail"; |
18 | @import "installment/index"; | 16 | @import "installment/index"; |
19 | @import "qrcode"; | 17 | @import "qrcode"; |
public/scss/home/_yoho-coin.css
deleted
100644 → 0
1 | -.yoho-coin-page { | ||
2 | - .coin-num { | ||
3 | - font-size: 1.4em; | ||
4 | - text-align: center; | ||
5 | - | ||
6 | - em { | ||
7 | - font-size: 4em; | ||
8 | - color: #f00; | ||
9 | - } | ||
10 | - | ||
11 | - span { | ||
12 | - width: 100%; | ||
13 | - height: auto; | ||
14 | - overflow: hidden; | ||
15 | - display: block; | ||
16 | - color: #b0b0b0; | ||
17 | - margin-top: -0.6rem; | ||
18 | - } | ||
19 | - } | ||
20 | - | ||
21 | - .check { | ||
22 | - width: 100%; | ||
23 | - height: auto; | ||
24 | - overflow: hidden; | ||
25 | - text-align: center; | ||
26 | - margin-top: 0.6rem; | ||
27 | - padding-bottom: 1rem; | ||
28 | - border-bottom: 1px solid #b0b0b0; | ||
29 | - | ||
30 | - a { | ||
31 | - line-height: 1.2rem; | ||
32 | - border: 1px solid #444; | ||
33 | - width: 30%; | ||
34 | - height: 100%; | ||
35 | - font-size: 1.2em; | ||
36 | - display: inline-block; | ||
37 | - border-radius: 0.6rem; | ||
38 | - } | ||
39 | - } | ||
40 | - | ||
41 | - section p { | ||
42 | - line-height: 1.5em; | ||
43 | - } | ||
44 | - | ||
45 | - .title { | ||
46 | - font-size: 16px; | ||
47 | - line-height: 20px; | ||
48 | - font-weight: bold; | ||
49 | - } | ||
50 | - | ||
51 | - .sub-title { | ||
52 | - display: block; | ||
53 | - font-size: 14px; | ||
54 | - line-height: 28px; | ||
55 | - font-weight: bold; | ||
56 | - } | ||
57 | - | ||
58 | - .path { | ||
59 | - color: #f60; | ||
60 | - } | ||
61 | - | ||
62 | - .remark { | ||
63 | - color: #666; | ||
64 | - | ||
65 | - span { | ||
66 | - color: #9c3; | ||
67 | - } | ||
68 | - } | ||
69 | -} |
-
Please register or login to post a comment