gulp ge文件提交

@@ -596,19 +596,21 @@ if ($('.brand-search-page').length) {
 
     $keyword.on('input', function() {
         if ($keyword.val().length) {
-            $icon.css('color', '#000');
-            $(this).closest('.search-box').css('width', '11.25rem');
+            $icon.css('color', '#444');
+
+            // $(this).closest('.search-box').css('width', '11.25rem');
             $searchAction.show().find('.clear-text').show();
         } else {
             $icon.css('color', '#b2b2b2');
-            $(this).closest('.search-box').css('width', '12.5rem');
-            $searchAction.hide();
+
+            // $(this).closest('.search-box').css('width', '12.5rem');
+            $searchAction.find('.clear-text').hide();
         }
         searchResult();
     }).focus();
 
     // 2016.1.13 产品（高扬）要求进入页面默认显示取消按钮
-    $icon.css('color', '#000');
+    $icon.css('color', '#444');
     $keyword.closest('.search-box').css('width', '11.25rem');
     $searchAction.show().find('.clear-text').hide();
 
@@ -4779,7 +4781,7 @@ var $listNav = $('#list-nav'),
             end: false
         },
         discount: {
-            order: 0,
+            order: 1,
             reload: true,
             page: 0,
             end: false
@@ -5638,10 +5640,12 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
     // 颜色块切换勾选样式
     $this.siblings('.chosed').removeClass('chosed');
 
-    // 特殊处理
+    // 特殊处理: 老的选中尺码在新选中的颜色对应尺码中不存在, 需要将颜色的第一行对应的颜色块加上勾选样式.
     if (-1 === curGoodNum) {
         $curColorBlock = $($colorRowList.eq(0).children().get(index));
         $curColorBlock.addClass('chosed');
+
+        // 当前选择的颜色块,加上勾选样式
     } else {
         $this.toggleClass('chosed');
     }
@@ -8142,15 +8146,18 @@ $('.employ span').each(function(index) {
     });
 });
 
-
-$(window).scroll(function() {
-    if ($(window).scrollTop() + $(window).height() > $('body').height() - 1) {
+function scrollHandler() {
+    if ($(window).scrollTop() + $(window).height() > $('body').height() - 100) {
         page++;
         couponAJAX(statu, page);
         return;
     }
+}
 
+$(window).scroll(function() {
+    window.requestAnimationFrame(scrollHandler);
 });
+
 couponAJAX(statu, page);
 });
 define("js/me/online-service", ["jquery"], function(require, exports, module){
@@ -8260,6 +8267,12 @@ $action.on('touchend', '.del', function() {
     return false;
 });
 
+$action.on('touchstart', 'a,span', function() {
+    $(this).css('background', '#eee');
+}).on('touchend touchcancel', 'a,span', function() {
+    $(this).css('background', 'transparent');
+});
+
 });
 define("js/me/browse-record", ["jquery","lazyload","handlebars","source-map","hammer"], function(require, exports, module){
 /**
@@ -8830,15 +8843,20 @@ function ajaxCurrencyDetail(page) {
     });
 }
 
-$(window).scroll(function() {
-    if ($(window).scrollTop() + $(window).height() > $('body').height() - 1) {
+function scrollHandler() {
+    if ($(window).scrollTop() + $(window).height() > $('body').height() - 100) {
         page++;
         ajaxCurrencyDetail(page);
         return;
     }
+}
+
+$(window).scroll(function() {
+    window.requestAnimationFrame(scrollHandler);
 });
 
 ajaxCurrencyDetail(page);
+
 });
 define("js/me/currency-new", ["jquery","hammer","lazyload"], function(require, exports, module){
 /**