Showing
6 changed files
with
64 additions
and
24 deletions
@@ -314,7 +314,7 @@ module.exports = class extends global.yoho.BaseModel { | @@ -314,7 +314,7 @@ module.exports = class extends global.yoho.BaseModel { | ||
314 | key: res.data.brand_id, | 314 | key: res.data.brand_id, |
315 | icon: helpers.image(res.data.brand_ico, 80, 50, 3), | 315 | icon: helpers.image(res.data.brand_ico, 80, 50, 3), |
316 | title: res.data.brand_name, | 316 | title: res.data.brand_name, |
317 | - content: res.data.brand_intro, | 317 | + content: _.trim(res.data.brand_intro), |
318 | subtitle: 'FEATURED ITEMS', | 318 | subtitle: 'FEATURED ITEMS', |
319 | imgs: imgs | 319 | imgs: imgs |
320 | }; | 320 | }; |
@@ -21,13 +21,13 @@ module.exports = { | @@ -21,13 +21,13 @@ module.exports = { | ||
21 | cookieDomain: '.yohobuy.com', | 21 | cookieDomain: '.yohobuy.com', |
22 | domains: { | 22 | domains: { |
23 | // test3 | 23 | // test3 |
24 | - singleApi: 'http://api-test3.yohops.com:9999/', | ||
25 | - api: 'http://api-test3.yohops.com:9999/', | ||
26 | - service: 'http://api-test3.yohops.com:9999/', | ||
27 | - serviceNotify: 'http://api-test3.yohops.com:9999/', | ||
28 | - global: 'http://global-test-soa.yohops.com:9999/', | ||
29 | - platformApi: 'http://192.168.102.48:8088/', | ||
30 | - yohoNowApi: 'http://yohonow-test.yohops.com:9999/', | 24 | + // singleApi: 'http://api-test3.yohops.com:9999/', |
25 | + // api: 'http://api-test3.yohops.com:9999/', | ||
26 | + // service: 'http://api-test3.yohops.com:9999/', | ||
27 | + // serviceNotify: 'http://api-test3.yohops.com:9999/', | ||
28 | + // global: 'http://global-test-soa.yohops.com:9999/', | ||
29 | + // platformApi: 'http://192.168.102.48:8088/', | ||
30 | + // yohoNowApi: 'http://yohonow-test.yohops.com:9999/', | ||
31 | 31 | ||
32 | // test2 | 32 | // test2 |
33 | // singleApi: 'http://api-test2.yohops.com:9999/', | 33 | // singleApi: 'http://api-test2.yohops.com:9999/', |
@@ -38,11 +38,11 @@ module.exports = { | @@ -38,11 +38,11 @@ module.exports = { | ||
38 | // platformApi: 'http://192.168.102.48:8088/', | 38 | // platformApi: 'http://192.168.102.48:8088/', |
39 | 39 | ||
40 | // prod | 40 | // prod |
41 | - // singleApi: 'http://api.yoho.cn/', | ||
42 | - // api: 'http://api.yoho.cn/', | ||
43 | - // service: 'http://api.yoho.cn/', | ||
44 | - // serviceNotify: 'http://service.yoho.cn/', | ||
45 | - // platformApi: 'http://172.16.6.210:8088/', | 41 | + singleApi: 'http://api.yoho.cn/', |
42 | + api: 'http://api.yoho.cn/', | ||
43 | + service: 'http://api.yoho.cn/', | ||
44 | + serviceNotify: 'http://service.yoho.cn/', | ||
45 | + platformApi: 'http://172.16.6.210:8088/', | ||
46 | 46 | ||
47 | // gray | 47 | // gray |
48 | // singleApi: 'http://apigray.yoho.cn/', | 48 | // singleApi: 'http://apigray.yoho.cn/', |
@@ -113,7 +113,7 @@ module.exports = { | @@ -113,7 +113,7 @@ module.exports = { | ||
113 | port: '4444' // influxdb port | 113 | port: '4444' // influxdb port |
114 | }, | 114 | }, |
115 | console: { | 115 | console: { |
116 | - level: 'info', | 116 | + level: 'debug', |
117 | colorize: 'all', | 117 | colorize: 'all', |
118 | prettyPrint: true | 118 | prettyPrint: true |
119 | } | 119 | } |
@@ -19,6 +19,8 @@ | @@ -19,6 +19,8 @@ | ||
19 | {{#dnsPrefetch.hosts}} | 19 | {{#dnsPrefetch.hosts}} |
20 | <link rel="dns-prefetch" href="{{this}}"> | 20 | <link rel="dns-prefetch" href="{{this}}"> |
21 | {{/dnsPrefetch.hosts}} | 21 | {{/dnsPrefetch.hosts}} |
22 | + <script src="https://js.fundebug.cn/fundebug.0.3.4.min.js" | ||
23 | + apikey="7ed21c1f98779074668264be211e847b0aff71d9ab45486d4c6684384ee26aa3"></script> | ||
22 | <!--[if lt IE 9]> | 24 | <!--[if lt IE 9]> |
23 | <script src="//cdn.yoho.cn/yohobuy-node/static/json2.js"></script> | 25 | <script src="//cdn.yoho.cn/yohobuy-node/static/json2.js"></script> |
24 | <![endif]--> | 26 | <![endif]--> |
1 | <div class="brands-dialog"> | 1 | <div class="brands-dialog"> |
2 | <div class="brands-layer"> | 2 | <div class="brands-layer"> |
3 | + <div class="arrow"></div> | ||
3 | <div class="layer-content"> | 4 | <div class="layer-content"> |
4 | <div class="title">{{title}}</div> | 5 | <div class="title">{{title}}</div> |
6 | + {{#if content}} | ||
5 | <div class="clearfix desc"> | 7 | <div class="clearfix desc"> |
6 | - <img src="{{image2 icon}}"> | ||
7 | - <p class="right">{{content}}</p> | 8 | + <p class="full">{{content}}</p> |
8 | </div> | 9 | </div> |
10 | + {{/if}} | ||
9 | <div class="featured"> | 11 | <div class="featured"> |
10 | <p>{{subtitle}}</p> | 12 | <p>{{subtitle}}</p> |
11 | <div class="clearfix"> | 13 | <div class="clearfix"> |
@@ -800,12 +800,26 @@ | @@ -800,12 +800,26 @@ | ||
800 | top: -83px; | 800 | top: -83px; |
801 | left: 15px; | 801 | left: 15px; |
802 | width: 325px; | 802 | width: 325px; |
803 | - height: 287px; | ||
804 | - background: resolve(index/brands-layer.png) no-repeat; | 803 | + min-height: 200px; |
805 | font-weight: normal; | 804 | font-weight: normal; |
805 | + background-color: #fff; | ||
806 | + border: 1px solid #ccc; | ||
807 | + box-shadow: 1px 1px 3px #ccc; | ||
808 | + | ||
809 | + .arrow { | ||
810 | + position: absolute; | ||
811 | + left: -12px; | ||
812 | + top: 80px; | ||
813 | + width: 20px; | ||
814 | + height: 20px; | ||
815 | + border-left: 1px solid #ccc; | ||
816 | + border-bottom: 1px solid #ccc; | ||
817 | + background-color: #fff; | ||
818 | + transform: rotate(45deg); | ||
819 | + } | ||
806 | 820 | ||
807 | .layer-content { | 821 | .layer-content { |
808 | - padding: 20px 20px 20px 35px; | 822 | + padding: 20px 20px 20px 20px; |
809 | 823 | ||
810 | .title { | 824 | .title { |
811 | font-size: 24px; | 825 | font-size: 24px; |
@@ -836,9 +850,17 @@ | @@ -836,9 +850,17 @@ | ||
836 | line-height: 150%; | 850 | line-height: 150%; |
837 | max-height: 80px; | 851 | max-height: 80px; |
838 | } | 852 | } |
853 | + | ||
854 | + .full { | ||
855 | + font-size: 12px; | ||
856 | + line-height: 150%; | ||
857 | + max-height: 80px; | ||
858 | + } | ||
839 | } | 859 | } |
840 | 860 | ||
841 | .featured { | 861 | .featured { |
862 | + margin-top: 10px; | ||
863 | + margin-bottom: 5px; | ||
842 | font-size: 16px; | 864 | font-size: 16px; |
843 | margin-right: -15px; | 865 | margin-right: -15px; |
844 | 866 | ||
@@ -853,11 +875,20 @@ | @@ -853,11 +875,20 @@ | ||
853 | } | 875 | } |
854 | 876 | ||
855 | .brands-layer-right { | 877 | .brands-layer-right { |
856 | - background: resolve(index/brands-layer.png) no-repeat 0 -287px; | ||
857 | left: -325px; | 878 | left: -325px; |
858 | top: -83px; | 879 | top: -83px; |
859 | 880 | ||
881 | + .arrow { | ||
882 | + left: initial; | ||
883 | + right: -12px; | ||
884 | + top: 80px; | ||
885 | + border-right: 1px solid #ccc; | ||
886 | + border-top: 1px solid #ccc; | ||
887 | + border-left: none; | ||
888 | + border-bottom: none; | ||
889 | + } | ||
890 | + | ||
860 | .layer-content { | 891 | .layer-content { |
861 | - padding: 20px 35px 20px 20px; | 892 | + padding: 20px 20px 20px 20px; |
862 | } | 893 | } |
863 | } | 894 | } |
-
Please register or login to post a comment