fe / yoho-blk · Commits

Go to a project

Authored by yyq
Commit ea2dd914a0e83d2de11a456d6f11860d43dfacb8 2 parents b05de8c6 dc21a3c2

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

Inline Side-by-side
Showing 2 changed files with 8 additions and 18 deletions
@@ -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];
@@ -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