fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Rock Zhang
Commit 2a8ab0c627b2646467f1ab2470470141a6b5b2ae 2 parents 8f109db5 a68bfff5

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 4 changed files with 15 additions and 13 deletions
@@ -261,7 +261,13 @@ @@ -261,7 +261,13 @@
261 height: pxToRem(200px); 261 height: pxToRem(200px);
262 line-height: pxToRem(200px); 262 line-height: pxToRem(200px);
263 color: #e0e0e0; 263 color: #e0e0e0;
  264 + font-size: 20px;
264 text-align: center; 265 text-align: center;
  266 + span{
  267 + display: inline-block;
  268 + font-size: 20px;
  269 + padding-right: 5px;
  270 + }
265 } 271 }
266 } 272 }
267 } 273 }
@@ -33,11 +33,8 @@ $basicBtnC:#eb0313; @@ -33,11 +33,8 @@ $basicBtnC:#eb0313;
33 line-height: pxToRem(36px); 33 line-height: pxToRem(36px);
34 &.table { 34 &.table {
35 width: 100%; 35 width: 100%;
36 - // .row {  
37 - // display: table-row;  
38 .column { 36 .column {
39 box-sizing: border-box; 37 box-sizing: border-box;
40 - display: table-cell;  
41 padding: pxToRem(20px) pxToRem(12px); 38 padding: pxToRem(20px) pxToRem(12px);
42 width: 50%; 39 width: 50%;
43 border-bottom: 1px solid #fff; 40 border-bottom: 1px solid #fff;
@@ -45,9 +42,6 @@ $basicBtnC:#eb0313; @@ -45,9 +42,6 @@ $basicBtnC:#eb0313;
45 font-size: pxToRem(24px); 42 font-size: pxToRem(24px);
46 background-color: $tableCellC; 43 background-color: $tableCellC;
47 float: left; 44 float: left;
48 - // &:nth-child(even) {  
49 - // border-right: none;  
50 - // }  
51 } 45 }
52 } 46 }
53 } 47 }
@@ -89,7 +83,6 @@ $basicBtnC:#eb0313; @@ -89,7 +83,6 @@ $basicBtnC:#eb0313;
89 left: pxToRem(108px); 83 left: pxToRem(108px);
90 top: pxToRem(40px); 84 top: pxToRem(40px);
91 height: pxToRem(35px); 85 height: pxToRem(35px);
92 - // width: pxToRem(70px);  
93 color: #fff; 86 color: #fff;
94 font-size: pxToRem(20px); 87 font-size: pxToRem(20px);
95 line-height: pxToRem(35px); 88 line-height: pxToRem(35px);
@@ -137,6 +130,12 @@ $basicBtnC:#eb0313; @@ -137,6 +130,12 @@ $basicBtnC:#eb0313;
137 background-color: #fff; 130 background-color: #fff;
138 // overflow: hidden; 131 // overflow: hidden;
139 } 132 }
  133 + .banner-top-single{
  134 + height:pxToRem(600px);
  135 + width: pxToRem(448px);
  136 + margin:pxToRem(30px) pxToRem(72px);
  137 + overflow: hidden;
  138 + }
140 .banner-top { 139 .banner-top {
141 // width: 100%; 140 // width: 100%;
142 min-height: 660rem / $pxConvertRem; 141 min-height: 660rem / $pxConvertRem;
@@ -163,14 +162,12 @@ $basicBtnC:#eb0313; @@ -163,14 +162,12 @@ $basicBtnC:#eb0313;
163 min-height: pxToRem(600px); 162 min-height: pxToRem(600px);
164 min-width: pxToRem(448px); 163 min-width: pxToRem(448px);
165 margin: pxToRem(30px) pxToRem(96px); 164 margin: pxToRem(30px) pxToRem(96px);
166 - // position: relative;  
167 overflow: hidden; 165 overflow: hidden;
168 ul { 166 ul {
169 position: relative; 167 position: relative;
170 height: 100%; 168 height: 100%;
171 li { 169 li {
172 float: left; 170 float: left;
173 - // height: 100%;  
174 } 171 }
175 } 172 }
176 } 173 }
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="tag-container"> 4 <div class="tag-container">
5 {{# tags}} 5 {{# tags}}
6 {{# is_new}} 6 {{# is_new}}
7 - <p class="good-tag new-tag">NEW</p> 7 + <p class="good-tag new-tag">NEW</p>
8 {{/ is_new}} 8 {{/ is_new}}
9 {{# is_advance}} 9 {{# is_advance}}
10 <p class="good-tag renew-tag">再到着</p> 10 <p class="good-tag renew-tag">再到着</p>
@@ -113,7 +113,6 @@ @@ -113,7 +113,6 @@
113 {{/ enterStore}} 113 {{/ enterStore}}
114 114
115 <div id="productDesc"> </div> 115 <div id="productDesc"> </div>
116 - <!-- {{> product/product-description}} -->  
117 {{> product/recommend-for-you}} 116 {{> product/recommend-for-you}}
118 117
119 {{#cartInfo}} 118 {{#cartInfo}}
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </div> 44 </div>
45 45
46 <div class="answer"> 46 <div class="answer">
47 - <span class="iconfont">&#xe63c;</span> 47 + <span class="iconfont">&#xe63d;</span>
48 <p>{{answer}}</p> 48 <p>{{answer}}</p>
49 </div> 49 </div>
50 {{/ consults}} 50 {{/ consults}}
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 </div> 56 </div>
57 {{else}} 57 {{else}}
58 <div class="consult-content-main content-main no-item"> 58 <div class="consult-content-main content-main no-item">
59 - <span class="iconfont">&#xe63c;</span>暂无咨询 59 + <span class="iconfont">&#xe63d;</span>暂无咨询
60 </div> 60 </div>
61 <div class="consult-content-footer"> 61 <div class="consult-content-footer">
62 <a href="/product/detail/consultform"> 62 <a href="/product/detail/consultform">