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 = {
pic: color.thumbs[0],
selectable: color.total > 0,
colorName: color.name,
rbg: color.rgb
rgb: color.rgb
});
if (color.color === defaultColor && color.cur) {
defaultImg = color.thumbs[0];
... ...
... ... @@ -8,23 +8,13 @@
<div class="colors-list mb20">
{{#each colors}}
{{#if active}}
<span class="color-item current-color {{#unless selectable}}disabled{{/unless}}"
style="background: {{rgb}}"
data-imageurl="{{image pic 100 134}}"
data-target="{{proId}}-color-{{@index}}"
data-title="{{color}}">
<span class="inner"></span>
</span>
{{^}}
<span class="color-item {{#unless selectable}}disabled{{/unless}}"
style="background: {{rgb}}"
data-imageurl="{{image pic 100 134}}"
data-target="{{proId}}-color-{{@index}}"
data-title="{{color}}">
<span class="inner"></span>
</span>
{{/if}}
<span class="color-item{{#if active}} current-color{{/if}}{{#unless selectable}} disabled{{/unless}}"
style="background: {{rgb}}"
data-imageurl="{{image pic 100 134}}"
data-target="{{proId}}-color-{{@index}}"
data-title="{{color}}">
<span class="inner"></span>
</span>
{{/each}}
</div>
... ...