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

@@ -43,7 +43,7 @@
     {{! 新品速报}}
     {{# newReport}}
     <div class="new-report clearfix">
-        {{> index/floor_header}}
+        {{> index/floor-header}}
 
         <ul class="report-list clearfix">
             {{# list}}
@@ -72,7 +72,7 @@
     {{! 优选品牌}}
     {{# preferenceBrand}}
     <div class="preference-brand">
-        {{> index/floor_header}}
+        {{> index/floor-header}}
         <div class="img-brand">
             <ul class="img-list clearfix">
                 {{# imgBrand}}

-{{> index/floor_header}}
+{{> index/floor-header}}
 <div class="commodity">
 
 	<ul class="clearfix">

 {{# tplrecommend}}
-{{> index/floor_header}}
+{{> index/floor-header}}
 <div class="tpl-recommend clearfix">
 	<div class="tpl-body clearfix">
 		<div class="tpl-nav">

@@ -3,7 +3,7 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/11/23
  */
-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 function cookie(name) {
     var cookies = document.cookie,

 
-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 
 function infiniteLoad(options) {

-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 (function($) {
     var LinkageSlider = function(element, options) {

-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 //var Lazyload = require('yoho.lazyload');
 var Handlebars = require('yoho.handlebars');

@@ -3,7 +3,7 @@
  * @author: wangqing(robin.wang@yoho.cn)
  * @date: 205/7/2
  */
-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 (function($) {
     $.fn.slider2 = function(options) {
@@ -69,6 +69,7 @@ var $ = require('jquery');
                     _obj = null;
 
                 e.preventDefault();
+
                 changePic(3, _width, function() {
                     for (i = 0; i < 3; i++) {
                         _obj = bannerarr.shift();
@@ -83,7 +84,6 @@ var $ = require('jquery');
                         'margin-left': '0'
                     });
                 });
-
             });
             $(this).find('.prev').on('click', function(e) {
                 var i = 0,

@@ -4,7 +4,7 @@
  * @date: 2015/12/01
  */
 
-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 
 var noticeSuccess = false;

@@ -4,15 +4,15 @@
  * @date: 2015/11/23
  */
 
-var $ = require('jquery'),
+var $ = require('yoho.jquery'),
     Handlebars = require('yoho.handlebars'),
-    lazyload = require('yoho.lazyload');
+    lazyLoad = require('yoho.lazyload');
 
 require('../common/linkage-slider');
 require('../common/slider2');
 require('../common/new-arrivls');
 
-lazyload($('img.lazy'));
+lazyLoad();
 $('.slide-container').linkageSlider();
 $('.img-brand').slider2();
 
@@ -88,6 +88,7 @@ $.ajax({
             } else {
                 prevPage = page - 1;
             }
+
             $('.logo-brand').find('li[data-page=' + page + ']').find('img').fadeOut('normal', function() {
                 $('.logo-brand').find('li').hide();
                 $('.logo-brand').find('li[data-page=' + prevPage + ']').show().find('img').fadeIn();

@@ -4,7 +4,7 @@
  * @date: 2015/11/23
  */
 
-var $ = require('jquery');
+var $ = require('yoho.jquery');
 
 var checkUnicode = {
     unchecked: '',

@@ -13,9 +13,9 @@
   "spm": {
     "main": "index.js",
     "dependencies": {
-      "jquery": "1.8.3",
       "yoho.lazyload": "1.0.0",
-      "yoho.handlebars": "3.0.3"
+      "yoho.handlebars": "3.0.3",
+      "yoho.jquery": "1.8.3"
     },
     "devDependencies": {
       "expect.js": "0.3.1"

@@ -406,7 +406,7 @@
                 height: 284px;
             }
         }
-        .impo1 img,.impo5 img{
+        .impo1 img,.impo9 img{
             width: 378px;
         }
     }