fe / yohobuy-frontend · Commits

Go to a project

Authored by xuqi
Commit 2c1e4da2645e47f4bb63fe050c41632b8d7006a1 2 parents de40c1e5 c37e4956

Merge branch 'feature/h5detail' of git.dev.yoho.cn:web/yohobuy-frontend into feature/h5detail 

Conflicts:
	mobile/public/sass/_article-type-three.scss
	mobile/views/partials/article-type-three.html
Inline Side-by-side
Showing 10 changed files with 43 additions and 20 deletions
1 var yohobuyMobile; 1 var yohobuyMobile;
2 2
3 require('./public/js/article-type-three'); 3 require('./public/js/article-type-three');
  4 +require('./public/js/related-post');
4 5
5 module.exports = yohobuyMobile; 6 module.exports = yohobuyMobile;
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </script> 31 </script>
32 <script src="//localhost:5000/dist/all-debug.js"></script> 32 <script src="//localhost:5000/dist/all-debug.js"></script>
33 <script type="text/javascript"> 33 <script type="text/javascript">
34 - seajs.use('yohobuy-mobile/1.0.0/public/js/article-type-three-debug', function(article) { 34 + seajs.use(['yohobuy-mobile/1.0.0/public/js/article-type-three-debug','yohobuy-mobile/1.0.0/public/js/related-post-debug'], function(article) {
35 if (article) { 35 if (article) {
36 article.init(); 36 article.init();
37 } 37 }
@@ -13,8 +13,9 @@ @@ -13,8 +13,9 @@
13 "spm": { 13 "spm": {
14 "main": "index.js", 14 "main": "index.js",
15 "dependencies": { 15 "dependencies": {
16 - "jquery": "2.1.3",  
17 - "jquery-pjax": "1.0.1" 16 + "jquery": "1.8.3",
  17 + "jquery-pjax": "1.0.1",
  18 + "mlellipsis": "0.0.2"
18 }, 19 },
19 "devDependencies": { 20 "devDependencies": {
20 "expect.js": "0.3.1" 21 "expect.js": "0.3.1"
@@ -77,7 +77,7 @@ module.exports = function() { @@ -77,7 +77,7 @@ module.exports = function() {
77 }, 77 },
78 { 78 {
79 thumb: 'http://placehold.it/98x134', 79 thumb: 'http://placehold.it/98x134',
80 - type: 'bag', 80 + type: 'lamp',
81 products: [ 81 products: [
82 { 82 {
83 thumb: 'http://placehold.it/276x366', 83 thumb: 'http://placehold.it/276x366',
@@ -177,7 +177,7 @@ module.exports = function() { @@ -177,7 +177,7 @@ module.exports = function() {
177 }, 177 },
178 { 178 {
179 thumb: 'http://placehold.it/98x134', 179 thumb: 'http://placehold.it/98x134',
180 - type: 'handset', 180 + type: 'watch',
181 products: [ 181 products: [
182 { 182 {
183 thumb: 'http://placehold.it/276x366', 183 thumb: 'http://placehold.it/276x366',
@@ -227,7 +227,7 @@ module.exports = function() { @@ -227,7 +227,7 @@ module.exports = function() {
227 }, 227 },
228 { 228 {
229 thumb: 'http://placehold.it/98x134', 229 thumb: 'http://placehold.it/98x134',
230 - type: 'pants', 230 + type: 'pent',
231 products: [ 231 products: [
232 { 232 {
233 thumb: 'http://placehold.it/276x366', 233 thumb: 'http://placehold.it/276x366',
  1 +/**
  2 + * 相关文章
  3 + * @author: yue.liu@yoho.cn
  4 + * @date；2015/3/31
  5 + */
  6 +
  7 +var $ = require('jquery'),
  8 + ellipsis = require('mlellipsis');
  9 +
  10 +ellipsis.init();
  11 +$(".post-list").find("span").each(function(){
  12 + $(this).mlellipsis(2);
  13 +})
@@ -14,8 +14,10 @@ @@ -14,8 +14,10 @@
14 } 14 }
15 15
16 .more-good { 16 .more-good {
17 - padding: 0 0 0 15rem / $pxConvertRem; 17 + padding: 0 0 0 30rem / $pxConvertRem;
  18 + margin: 0 0 0 -15rem / $pxConvertRem;
18 line-height: 88rem / $pxConvertRem; 19 line-height: 88rem / $pxConvertRem;
  20 + border-top: 1px solid #e0e0e0;
19 21
20 a { 22 a {
21 text-decoration: none; 23 text-decoration: none;
@@ -20,6 +20,7 @@ $pxConvertRem : 40; @@ -20,6 +20,7 @@ $pxConvertRem : 40;
20 border-bottom: 2px solid #efefef; 20 border-bottom: 2px solid #efefef;
21 21
22 .thumb { 22 .thumb {
  23 + position: relative;
23 display: inline-block; 24 display: inline-block;
24 position: relative; 25 position: relative;
25 margin-right: 22rem / $pxConvertRem; 26 margin-right: 22rem / $pxConvertRem;
@@ -73,35 +74,37 @@ $pxConvertRem : 40; @@ -73,35 +74,37 @@ $pxConvertRem : 40;
73 } 74 }
74 75
75 .clothe-type { 76 .clothe-type {
76 - background: url('../img/clothes-type-sd8fa28a215.png') no-repeat;  
77 - width: 47rem / $pxConvertRem;  
78 - height: 47rem / $pxConvertRem; 77 + position: absolute;
  78 + right: 6rem / $pxConvertRem;
  79 + bottom: 6rem / $pxConvertRem;
  80 + background: url('../img/clothes-type-s6453a814c2.png') no-repeat;
  81 + width: 15px;
  82 + height: 15px;
  83 + background-size: 100%;
79 84
80 &.bag { 85 &.bag {
81 background-position: 0 0; 86 background-position: 0 0;
82 } 87 }
83 &.cloth { 88 &.cloth {
84 - background-position: 0 -47px; 89 + background-position: 0 -47px * (15/47);
85 } 90 }
86 &.dress { 91 &.dress {
87 - background-position: 0 -94px; 92 + background-position: 0 -94px * (15/47);
88 } 93 }
89 &.headset { 94 &.headset {
90 - background-position: 0 -141px; 95 + background-position: 0 -141px * (15/47);
91 } 96 }
92 &.lamp { 97 &.lamp {
93 - width: 45rem / $pxConvertRem;  
94 - height: 45rem / $pxConvertRem;  
95 - background-position: 0 -188px; 98 + background-position: 0 -188px * (15/47);
96 } 99 }
97 &.pent { 100 &.pent {
98 - background-position: 0 -233px; 101 + background-position: 0 -233px * (15/47);
99 } 102 }
100 &.shoe { 103 &.shoe {
101 - background-position: 0 -280px; 104 + background-position: 0 -280px * (15/47);
102 } 105 }
103 &.watch { 106 &.watch {
104 - background-position: 0 -327px; 107 + background-position: 0 -327px * (15/47);
105 } 108 }
106 } 109 }
107 } 110 }
1 {{# recommendation}} 1 {{# recommendation}}
2 <div class="article-type-five clearfix"> 2 <div class="article-type-five clearfix">
3 <h2>相关推荐</h2> 3 <h2>相关推荐</h2>
  4 + <div class="good-list clearfix">
4 {{# list}} 5 {{# list}}
5 {{> good_info}} 6 {{> good_info}}
6 {{/ list}} 7 {{/ list}}
  8 + </div>
7 <div class="more-good clearfix"> 9 <div class="more-good clearfix">
8 <a href="{{moreProds}}"> 10 <a href="{{moreProds}}">
9 更多商品 11 更多商品
1 {{# smallImage}} 1 {{# smallImage}}
2 - <div class="article-type-four"> 2 + <div class="article-type-four clearfix">
3 {{# imgs}} 3 {{# imgs}}
4 <img src="{{src}}" alt="{{alt}}"> 4 <img src="{{src}}" alt="{{alt}}">
5 {{/ imgs}} 5 {{/ imgs}}
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 <em>&#9670;</em> 9 <em>&#9670;</em>
10 <span>&#9670;</span> 10 <span>&#9670;</span>
11 </div> 11 </div>
  12 + <span class="clothe-type {{type}}"></span>
12 </li> 13 </li>
13 {{/ list}} 14 {{/ list}}
14 </ul> 15 </ul>