Authored by 陈峰

Merge branch 'feature/new-goods' into 'release/5.4'

新品到着产品验收问题整改



See merge request !175
@@ -77,7 +77,6 @@ const _newGoods = (req, res, next) => { @@ -77,7 +77,6 @@ const _newGoods = (req, res, next) => {
77 res.render('new/index', { 77 res.render('new/index', {
78 module: 'product', 78 module: 'product',
79 page: 'new-arrival', 79 page: 'new-arrival',
80 - width750: true,  
81 localCss: true, 80 localCss: true,
82 pageHeader: headerModel.setNav({ 81 pageHeader: headerModel.setNav({
83 navTitle: '新品到着' 82 navTitle: '新品到着'
@@ -34,11 +34,11 @@ body { @@ -34,11 +34,11 @@ body {
34 z-index: 5; 34 z-index: 5;
35 35
36 li { 36 li {
37 - margin-left: 1.2rem;  
38 - height: 2.2rem;  
39 - line-height: 2.2rem; 37 + margin-left: 36px;
  38 + height: 88px;
  39 + line-height: 88px;
40 border-bottom: 1px solid #e0e0e0; 40 border-bottom: 1px solid #e0e0e0;
41 - padding-right: 0.95rem; 41 + padding-right: 54px;
42 } 42 }
43 43
44 li:last-child { 44 li:last-child {
@@ -64,11 +64,17 @@ body { @@ -64,11 +64,17 @@ body {
64 margin-top: 11rem; 64 margin-top: 11rem;
65 } 65 }
66 } 66 }
67 -}  
68 67
69 -.good-info {  
70 - width: 325px;  
71 - height: 550px; 68 + .good-info {
  69 + float: left;
  70 + margin: 0.25rem 0.375rem 1rem;
  71 + width: 6.9rem;
  72 + height: 12.65rem;
  73 + }
  74 +
  75 + .guang-article .meta .iconfont {
  76 + font-size: 1em;
  77 + }
72 } 78 }
73 79
74 .new-recommend, 80 .new-recommend,
@@ -141,4 +147,4 @@ body { @@ -141,4 +147,4 @@ body {
141 147
142 .brand-news-count h5 { 148 .brand-news-count h5 {
143 display: none; 149 display: none;
144 -}  
  150 +}
1 .guang-article { 1 .guang-article {
2 position: relative; 2 position: relative;
  3 + margin-top: 28px;
  4 +
3 .cate { 5 .cate {
4 position: absolute; 6 position: absolute;
5 top: 0; 7 top: 0;
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 padding-bottom: 55px; 3 padding-bottom: 55px;
4 background-color: #f5f5f5; 4 background-color: #f5f5f5;
5 text-align: center; 5 text-align: center;
  6 + margin-top: 38px!important;
  7 + height: 476px!important;
6 8
7 img { 9 img {
8 width: 141px; 10 width: 141px;
@@ -5,10 +5,12 @@ @@ -5,10 +5,12 @@
5 5
6 &.season-tags { 6 &.season-tags {
7 background-image: url('/product/new/season-hot.jpg'); 7 background-image: url('/product/new/season-hot.jpg');
  8 + background-position-y: 28px;
8 } 9 }
9 10
10 &.search-tags { 11 &.search-tags {
11 background-image: url('/product/new/hot-search.jpg'); 12 background-image: url('/product/new/hot-search.jpg');
  13 + background-position-y: 28px;
12 } 14 }
13 15
14 &.brand-tags { 16 &.brand-tags {
@@ -21,7 +23,7 @@ @@ -21,7 +23,7 @@
21 flex-wrap: wrap; 23 flex-wrap: wrap;
22 justify-content: space-around; 24 justify-content: space-around;
23 align-content: space-between; 25 align-content: space-between;
24 - height: 395px; 26 + height: 355px;
25 padding: 55px 0; 27 padding: 55px 0;
26 background-color: #f0f0f0; 28 background-color: #f0f0f0;
27 29
@@ -18,6 +18,6 @@ @@ -18,6 +18,6 @@
18 18
19 .swiper-slide-active { 19 .swiper-slide-active {
20 height: 220px; 20 height: 220px;
21 - width: 378px; 21 + /*width: 378px;*/
22 } 22 }
23 } 23 }
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 padding-right: 10px; 35 padding-right: 10px;
36 height: 30px; 36 height: 30px;
37 line-height: 30px; 37 line-height: 30px;
38 - font-size: 18px; 38 + font-size: 16px;
39 border-radius: 32px; 39 border-radius: 32px;
40 background-color: #999; 40 background-color: #999;
41 41