Authored by Rock Zhang

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

@@ -34,6 +34,20 @@ @@ -34,6 +34,20 @@
34 </div> 34 </div>
35 {{/if}} 35 {{/if}}
36 36
  37 + {{#if gender}}
  38 + <div class="channel section">
  39 + <span class="title">性别:</span>
  40 +
  41 + <div class="attr-content clearfix">
  42 + {{#each channel}}
  43 + <a class="attr {{#if checked}}checked{{/if}}" href="{{href}}">
  44 + {{name}}
  45 + </a>
  46 + {{/each}}
  47 + </div>
  48 + </div>
  49 + {{/if}}
  50 +
37 {{#if sort}} 51 {{#if sort}}
38 <div class="sort section"> 52 <div class="sort section">
39 <span class="title">分类:</span> 53 <span class="title">分类:</span>
@@ -135,7 +135,6 @@ exports.init = function(num) { @@ -135,7 +135,6 @@ exports.init = function(num) {
135 135
136 // 鼠标悬浮获取到商品信息后显示第一张图片 136 // 鼠标悬浮获取到商品信息后显示第一张图片
137 if (data[0] && data[0].src) { 137 if (data[0] && data[0].src) {
138 - $(event.target).find('.good-thumb img').attr('src', data[0].src);  
139 $goodInfoMain.find('.good-thumb img').attr('src', data[0].src); 138 $goodInfoMain.find('.good-thumb img').attr('src', data[0].src);
140 } 139 }
141 140
@@ -82,6 +82,7 @@ @@ -82,6 +82,7 @@
82 width: 14px; 82 width: 14px;
83 border: 1px solid #fff; 83 border: 1px solid #fff;
84 margin-bottom: -3px; 84 margin-bottom: -3px;
  85 + background-size: 100% !important;
85 } 86 }
86 87
87 .clear-checked { 88 .clear-checked {
@@ -283,6 +284,7 @@ @@ -283,6 +284,7 @@
283 border: 1px solid #ccc; 284 border: 1px solid #ccc;
284 margin-bottom: -6px; 285 margin-bottom: -6px;
285 margin-right: 5px; 286 margin-right: 5px;
  287 + background-size: 100% !important;
286 } 288 }
287 289
288 .senior { 290 .senior {
@@ -125,9 +125,20 @@ @@ -125,9 +125,20 @@
125 } 125 }
126 } 126 }
127 127
  128 + @keyframes slideRight {
  129 + from {
  130 + width: 0;
  131 + }
  132 + to {
  133 + width: 50px;
  134 + }
  135 + }
  136 +
128 .good-select-color { 137 .good-select-color {
129 float: left; 138 float: left;
130 margin-top: 22px; 139 margin-top: 22px;
  140 + overflow: hidden;
  141 + animation: slideRight 200ms 1;
131 142
132 ul { 143 ul {
133 display: block; 144 display: block;