Authored by 姜枫

fix bugs

@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 {{#each this}} 37 {{#each this}}
38 {{#if more}} 38 {{#if more}}
39 <div class="goods-more"> 39 <div class="goods-more">
40 - <a href="/product/shop/{{../../brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}"> 40 + <a href="/product/shop/{{../../brandDomain}}{{#if ../../shopId}}?shopId={{../../shopId}}{{/if}}" target="_blank">
41 <div class="more-text">MORE</div> 41 <div class="more-text">MORE</div>
42 <p>查看更多</p> 42 <p>查看更多</p>
43 </a> 43 </a>
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 {{/each}} 86 {{/each}}
87 </div> 87 </div>
88 </div> 88 </div>
89 - <div class="brand-btns hide"> 89 + <div class="brand-btns">
90 <span class="btn disable large confirm">确定</span> 90 <span class="btn disable large confirm">确定</span>
91 <span class="btn large cancel">取消</span> 91 <span class="btn large cancel">取消</span>
92 </div> 92 </div>
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 {{/each}} 178 {{/each}}
179 </div> 179 </div>
180 </div> 180 </div>
181 - <div class="style-btns hide"> 181 + <div class="style-btns">
182 <span class="btn disable large confirm">确定</span> 182 <span class="btn disable large confirm">确定</span>
183 <span class="btn large cancel">取消</span> 183 <span class="btn large cancel">取消</span>
184 </div> 184 </div>
@@ -32,6 +32,9 @@ var jQuery = require('yoho-jquery'); @@ -32,6 +32,9 @@ var jQuery = require('yoho-jquery');
32 32
33 $('.iconfont', this).removeClass('radio').removeClass('checkbox').addClass(options.type); 33 $('.iconfont', this).removeClass('radio').removeClass('checkbox').addClass(options.type);
34 $('.iconfont', this).html(_checked ? options.checkedHtml : options.uncheckedHtml); 34 $('.iconfont', this).html(_checked ? options.checkedHtml : options.uncheckedHtml);
  35 + if (_checked) {
  36 + $('.iconfont', this).addClass('checked');
  37 + }
35 38
36 if (options.group) { 39 if (options.group) {
37 $(this).addClass('check-group-' + options.group); 40 $(this).addClass('check-group-' + options.group);
@@ -299,6 +299,7 @@ var YohoListPage = { @@ -299,6 +299,7 @@ var YohoListPage = {
299 }); 299 });
300 }, 300 },
301 openBrandMulitChoose: function() { 301 openBrandMulitChoose: function() {
  302 + console.log(1);
302 $('.yoho-product-list .mulit-choose').hide(); 303 $('.yoho-product-list .mulit-choose').hide();
303 $('.input-radio', this.brandsDoc).check({ 304 $('.input-radio', this.brandsDoc).check({
304 type: 'checkbox' 305 type: 'checkbox'
@@ -308,10 +309,8 @@ var YohoListPage = { @@ -308,10 +309,8 @@ var YohoListPage = {
308 }, 309 },
309 closeBrandMulitChoose: function() { 310 closeBrandMulitChoose: function() {
310 $('.yoho-product-list .mulit-choose').show(); 311 $('.yoho-product-list .mulit-choose').show();
311 - $('.yoho-product-list .brand-btns').addClass('hide');  
312 312
313 $('.yoho-product-list .brand-list .input-radio').check('unCheckAll'); 313 $('.yoho-product-list .brand-list .input-radio').check('unCheckAll');
314 - YohoListPage.mulitBrand = false;  
315 $('.input-radio', this.brandsDoc).check({ 314 $('.input-radio', this.brandsDoc).check({
316 type: 'radio' 315 type: 'radio'
317 }); 316 });
@@ -320,6 +319,8 @@ var YohoListPage = { @@ -320,6 +319,8 @@ var YohoListPage = {
320 type: 'radio', 319 type: 'radio',
321 checked: true 320 checked: true
322 }); 321 });
  322 + YohoListPage.mulitBrand = false;
  323 + $('.yoho-product-list .brand-btns').hide();
323 }, 324 },
324 325
325 openStyleMulit: function() { 326 openStyleMulit: function() {
@@ -342,7 +343,7 @@ var YohoListPage = { @@ -342,7 +343,7 @@ var YohoListPage = {
342 }, 343 },
343 344
344 showBrandMulitBtn: function() { 345 showBrandMulitBtn: function() {
345 - $('.brand-btns', this.rootDoc).removeClass('hide'); 346 + $('.yoho-product-list .brand-btns').show();
346 if (YohoListPage.getSelectBrands().length > 0) { 347 if (YohoListPage.getSelectBrands().length > 0) {
347 $('.brand-btns .confirm', this.rootDoc).removeClass('disable'); 348 $('.brand-btns .confirm', this.rootDoc).removeClass('disable');
348 } else { 349 } else {
@@ -373,7 +374,7 @@ var YohoListPage = { @@ -373,7 +374,7 @@ var YohoListPage = {
373 getSelectBrands: function() { 374 getSelectBrands: function() {
374 var brands = []; 375 var brands = [];
375 376
376 - $('.input-radio .checkbox', this.brandsDoc).each(function() { 377 + $('.input-radio .iconfont', this.brandsDoc).each(function() {
377 if ($(this).hasClass('checked')) { 378 if ($(this).hasClass('checked')) {
378 brands.push($(this).parent().data('value')); 379 brands.push($(this).parent().data('value'));
379 } 380 }
@@ -127,6 +127,7 @@ @@ -127,6 +127,7 @@
127 .style-btns { 127 .style-btns {
128 text-align: center; 128 text-align: center;
129 margin-top: 10px; 129 margin-top: 10px;
  130 + display: none;
130 131
131 .btn { 132 .btn {
132 margin: 0 10px; 133 margin: 0 10px;