fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit 2bc0ca1044e800c524978a02260cc8d03028ed80 2 parents 3354ed82 89c4c3bf

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 10 changed files with 65 additions and 88 deletions
@@ -708,12 +708,16 @@ const setSizeData = (sizeInfo) => { @@ -708,12 +708,16 @@ const setSizeData = (sizeInfo) => {
708 } 708 }
709 709
710 _.forEach(sizeInfo.sizeInfoBo.sizeAttributeBos, value => { 710 _.forEach(sizeInfo.sizeInfoBo.sizeAttributeBos, value => {
711 - sizeTable.thead.push({ 711 + let th = {
712 name: value.attributeName || ' ', 712 name: value.attributeName || ' ',
713 id: value.id, 713 id: value.id,
714 - doubt: true,  
715 width: 126 714 width: 126
716 - }); 715 + };
  716 +
  717 + if (size.sizeImage) {
  718 + th.doubt = true;
  719 + }
  720 + sizeTable.thead.push(th);
717 }); 721 });
718 722
719 sizeTable.tbody = []; 723 sizeTable.tbody = [];
@@ -186,27 +186,29 @@ @@ -186,27 +186,29 @@
186 <span class="cn">{{titleCn}}</span> 186 <span class="cn">{{titleCn}}</span>
187 </label> 187 </label>
188 </div> 188 </div>
189 - <ul class="des-basic clearfix">  
190 - {{# basic}}  
191 - <li>  
192 - {{key}}: {{value}}  
193 - </li>  
194 - {{/ basic}}  
195 - </ul>  
196 - {{#if comfort}}  
197 - <ul class="des-comfort clearfix">  
198 - {{# comfort}} 189 + <div class="des-wrapper">
  190 + <ul class="des-basic clearfix">
  191 + {{# basic}}
199 <li> 192 <li>
200 - {{name}}:  
201 - <span class="min-des">{{minDes}}</span>  
202 - {{# blocks}}  
203 - <span class="comfort-block{{#if cur}} cur{{/if}}"></span>  
204 - {{/ blocks}}  
205 - <span class="max-des">{{maxDes}}</span> 193 + {{key}}: {{value}}
206 </li> 194 </li>
207 - {{/ comfort}} 195 + {{/ basic}}
208 </ul> 196 </ul>
209 - {{/if}} 197 + {{#if comfort}}
  198 + <ul class="des-comfort clearfix">
  199 + {{# comfort}}
  200 + <li>
  201 + {{name}}:
  202 + <span class="min-des">{{minDes}}</span>
  203 + {{# blocks}}
  204 + <span class="comfort-block{{#if cur}} cur{{/if}}"></span>
  205 + {{/ blocks}}
  206 + <span class="max-des">{{maxDes}}</span>
  207 + </li>
  208 + {{/ comfort}}
  209 + </ul>
  210 + {{/if}}
  211 + </div>
210 </div> 212 </div>
211 {{/ description}} 213 {{/ description}}
212 214
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
2 <div class="center-content"> 2 <div class="center-content">
3 <ul class="about-us clearfix"> 3 <ul class="about-us clearfix">
4 <li><a href="{{siteUrl}}">BLK首页</a></li> 4 <li><a href="{{siteUrl}}">BLK首页</a></li>
5 - <li><a href="{{siteUrl}}/help" target="_blank">客户服务</a></li> 5 + <li>
  6 + <a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">客户服务</a>
  7 + </li>
6 <li><a href="{{siteUrl}}/help?id=2" target="_blank">支付方式</a></li> 8 <li><a href="{{siteUrl}}/help?id=2" target="_blank">支付方式</a></li>
7 <li><a href="{{siteUrl}}/help?id=31" target="_blank">配送方式</a></li> 9 <li><a href="{{siteUrl}}/help?id=31" target="_blank">配送方式</a></li>
8 <li><a href="{{siteUrl}}/help?id=41" target="_blank">售后服务</a></li> 10 <li><a href="{{siteUrl}}/help?id=41" target="_blank">售后服务</a></li>
@@ -48,21 +48,7 @@ @@ -48,21 +48,7 @@
48 </a> 48 </a>
49 <div class="mini-bag-box sub-wrapper"> 49 <div class="mini-bag-box sub-wrapper">
50 <div class="bag-goods bag-empty"> 50 <div class="bag-goods bag-empty">
51 - <dl class="mini-goods-list">  
52 - <dd class="goods-item clearfix">  
53 - <div class="thumb">  
54 - <img src="//placehold.it/48x64">  
55 - </div>  
56 - <div class="info">  
57 - <a href="">范德萨发生大幅度是</a>  
58 - <p>颜色：黄 尺码：F</p>  
59 - </div>  
60 - <div class="price">  
61 - <p>¥199.00 X1</p>  
62 - <a href="#">删除</a>  
63 - </div>  
64 - </dd>  
65 - </dl> 51 + <dl class="mini-goods-list"></dl>
66 <div class="go-bag-btn"> 52 <div class="go-bag-btn">
67 <a href="{{../siteUrl}}/shopping/cart">去购物车结算</a> 53 <a href="{{../siteUrl}}/shopping/cart">去购物车结算</a>
68 </div> 54 </div>
@@ -62,8 +62,7 @@ @@ -62,8 +62,7 @@
62 <div class="search-input"> 62 <div class="search-input">
63 <form id="search-form" action="{{../siteUrl}}/product/query"> 63 <form id="search-form" action="{{../siteUrl}}/product/query">
64 <span class="iconfont left">&#xe605;</span> 64 <span class="iconfont left">&#xe605;</span>
65 - <input type="text" name="query" id="search-key" class="search-key" placeholder="search"  
66 - autocomplete="off"> 65 + <input type="text" name="query" id="search-key" class="search-key" autocomplete="off">
67 <span class="iconfont right clear-input">&#xe608;</span> 66 <span class="iconfont right clear-input">&#xe608;</span>
68 </form> 67 </form>
69 </div> 68 </div>
@@ -167,21 +167,22 @@ $searchKey.keyup(function(e) { @@ -167,21 +167,22 @@ $searchKey.keyup(function(e) {
167 }); 167 });
168 168
169 // ie8输入框提示特殊处理 169 // ie8输入框提示特殊处理
170 -if (!!window.ActiveXObject && !!document.documentMode) {  
171 - $searchKey.focus(function() {  
172 - var key = $searchKey.val(); 170 +// 应产品要求所有浏览器获得焦点提示文字隐藏
  171 +// if (!!window.ActiveXObject && !!document.documentMode) {
  172 +$searchKey.focus(function() {
  173 + var key = $searchKey.val();
173 174
174 - if (key === 'search') {  
175 - $searchKey.val('').css('color', '#fff');  
176 - }  
177 - }).blur(function() {  
178 - var key = $searchKey.val(); 175 + if (key === 'search') {
  176 + $searchKey.val('').css('color', '#fff');
  177 + }
  178 +}).blur(function() {
  179 + var key = $searchKey.val();
179 180
180 - if ($.trim(key) === '') {  
181 - $searchKey.val('search').css('color', '#aaa');  
182 - }  
183 - }).val('search').css('color', '#aaa');  
184 -} 181 + if ($.trim(key) === '') {
  182 + $searchKey.val('search').css('color', '#aaa');
  183 + }
  184 +}).val('search').css('color', '#aaa');
  185 +// }
185 186
186 $clearInput.click(function() { 187 $clearInput.click(function() {
187 $searchKey.val(''); 188 $searchKey.val('');
@@ -397,7 +397,7 @@ Cart = { @@ -397,7 +397,7 @@ Cart = {
397 pic: color.thumbs[0], 397 pic: color.thumbs[0],
398 selectable: color.total > 0, 398 selectable: color.total > 0,
399 colorName: color.name, 399 colorName: color.name,
400 - rbg: color.rgb 400 + rgb: color.rgb
401 }); 401 });
402 if (color.color === defaultColor && color.cur) { 402 if (color.color === defaultColor && color.cur) {
403 defaultImg = color.thumbs[0]; 403 defaultImg = color.thumbs[0];
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
25 25
26 &:hover { 26 &:hover {
27 height: 50px; 27 height: 50px;
28 - border-bottom: 2px solid #9a9a9a;  
29 28
30 > * { 29 > * {
31 color: #9a9a9a; 30 color: #9a9a9a;
@@ -74,7 +73,6 @@ @@ -74,7 +73,6 @@
74 &:hover { 73 &:hover {
75 color: #9a9a9a; 74 color: #9a9a9a;
76 height: 50px; 75 height: 50px;
77 - border-bottom: 2px solid #9a9a9a;  
78 cursor: default; 76 cursor: default;
79 } 77 }
80 78
@@ -157,7 +155,7 @@ @@ -157,7 +155,7 @@
157 .bag-content { 155 .bag-content {
158 padding: 280px 0 130px; 156 padding: 280px 0 130px;
159 text-align: center; 157 text-align: center;
160 - color: #1d1d1d; 158 + color: #1b1b1b;
161 background: resolve('layout/bag-bg.png') no-repeat center center; 159 background: resolve('layout/bag-bg.png') no-repeat center center;
162 display: none; 160 display: none;
163 } 161 }
@@ -193,7 +191,7 @@ @@ -193,7 +191,7 @@
193 .goods-item { 191 .goods-item {
194 line-height: 2; 192 line-height: 2;
195 padding: 6px 0; 193 padding: 6px 0;
196 - color: #1d1d1d; 194 + color: #1b1b1b;
197 font-size: 14px; 195 font-size: 14px;
198 196
199 & > * { 197 & > * {
@@ -249,11 +247,11 @@ @@ -249,11 +247,11 @@
249 } 247 }
250 248
251 .cur { 249 .cur {
252 - border-bottom: 2px solid #1d1d1d; 250 + border-bottom: 2px solid #1b1b1b;
253 } 251 }
254 252
255 .cur > a { 253 .cur > a {
256 - color: #1d1d1d; 254 + color: #1b1b1b;
257 } 255 }
258 } 256 }
259 257
@@ -276,7 +274,7 @@ @@ -276,7 +274,7 @@
276 274
277 .sub-nav { 275 .sub-nav {
278 height: 50px; 276 height: 50px;
279 - background: #1d1d1d; 277 + background: #1b1b1b;
280 278
281 .sub-nav-list { 279 .sub-nav-list {
282 max-width: 94%; 280 max-width: 94%;
@@ -325,7 +323,7 @@ @@ -325,7 +323,7 @@
325 top: 50px; 323 top: 50px;
326 right: 0; 324 right: 0;
327 position: absolute; 325 position: absolute;
328 - background: #1d1d1d; 326 + background: #1b1b1b;
329 text-align: left; 327 text-align: left;
330 display: none; 328 display: none;
331 z-index: 10; 329 z-index: 10;
@@ -269,6 +269,11 @@ @@ -269,6 +269,11 @@
269 } 269 }
270 } 270 }
271 271
  272 + .des-wrapper {
  273 + width: 950px;
  274 + overflow: hidden;
  275 + }
  276 +
272 .des-basic { 277 .des-basic {
273 width: 1140px; 278 width: 1140px;
274 279
@@ -430,7 +435,6 @@ @@ -430,7 +435,6 @@
430 border: 1px solid #f3f3f3; 435 border: 1px solid #f3f3f3;
431 padding: 40px 130px; 436 padding: 40px 130px;
432 margin-top: 80px; 437 margin-top: 80px;
433 - overflow: hidden;  
434 438
435 .block-title { 439 .block-title {
436 height: 0; 440 height: 0;
@@ -453,15 +457,6 @@ @@ -453,15 +457,6 @@
453 } 457 }
454 } 458 }
455 } 459 }
456 -  
457 - + .arr-notice-dialog {  
458 - .content {  
459 - width: 260px;  
460 - text-align: center;  
461 - margin: 0 auto;  
462 - }  
463 -  
464 - }  
465 } 460 }
466 461
467 .arr-notice-dialog { 462 .arr-notice-dialog {
@@ -8,23 +8,13 @@ @@ -8,23 +8,13 @@
8 8
9 <div class="colors-list mb20"> 9 <div class="colors-list mb20">
10 {{#each colors}} 10 {{#each colors}}
11 - {{#if active}}  
12 - <span class="color-item current-color {{#unless selectable}}disabled{{/unless}}"  
13 - style="background: {{rgb}}"  
14 - data-imageurl="{{image pic 100 134}}"  
15 - data-target="{{proId}}-color-{{@index}}"  
16 - data-title="{{color}}">  
17 - <span class="inner"></span>  
18 - </span>  
19 - {{^}}  
20 - <span class="color-item {{#unless selectable}}disabled{{/unless}}"  
21 - style="background: {{rgb}}"  
22 - data-imageurl="{{image pic 100 134}}"  
23 - data-target="{{proId}}-color-{{@index}}"  
24 - data-title="{{color}}">  
25 - <span class="inner"></span>  
26 - </span>  
27 - {{/if}} 11 + <span class="color-item{{#if active}} current-color{{/if}}{{#unless selectable}} disabled{{/unless}}"
  12 + style="background: {{rgb}}"
  13 + data-imageurl="{{image pic 100 134}}"
  14 + data-target="{{proId}}-color-{{@index}}"
  15 + data-title="{{color}}">
  16 + <span class="inner"></span>
  17 + </span>
28 {{/each}} 18 {{/each}}
29 </div> 19 </div>
30 20