Merge remote-tracking branch 'origin/master' into release/6.1

@@ -12,7 +12,7 @@
     "dev": "nodemon -e js,hbs -i public/ app.js",
     "static": "node ./public/build/dev-server.js",
     "build:dll": "webpack --config ./public/build/webpack.dll.indexcss.config.js",
-    "build": "webpack --config ./public/build/webpack.dll.indexcss.config.js --config ./public/build/webpack.prod.config.js",
+    "build": "webpack --config ./public/build/webpack.dll.indexcss.config.js && webpack --config ./public/build/webpack.prod.config.js",
     "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js",
     "lint-js": "lint-js",
     "lint-css": "lint-css",

 let $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    fastclick = require('yoho-fastclick'),
     tip = require('plugin/tip'),
     dialog = require('plugin/dialog'),
     Hammer = require('yoho-hammer');
@@ -62,8 +61,6 @@ function uuid() {
     return id;
 }
 
-
-fastclick.attach(document.body);
 lazyLoad($('img.lazy'));
 
 // 头部banner轮播

 let $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    fastclick = require('yoho-fastclick'),
     tip = require('plugin/tip'),
     dialog = require('plugin/dialog'),
     Hammer = require('yoho-hammer');
@@ -58,8 +57,6 @@ function uuid() {
     return id;
 }
 
-
-fastclick.attach(document.body);
 lazyLoad($('img.lazy'));
 
 // 头部banner轮播

@@ -5,7 +5,6 @@
  */
 
 let $ = require('yoho-jquery');
-let FastClick = require('yoho-fastclick');
 
 let $nav = $('.category-nav'),
     $search = $('#search-input'),
@@ -16,10 +15,6 @@ let $nav = $('.category-nav'),
 
 require('common');
 
-$(function() {
-    FastClick.attach(document.body);
-});
-
 function resetHeight() {
     let h = document.body.scrollHeight - $search.outerHeight() - $nav.outerHeight();
 

 let Swiper = require('yoho-swiper2');
 let lazyLoad = require('yoho-jquery-lazyload');
-let fastclick = require('yoho-fastclick');
 let swiperClass;
 
 require('common');
 
 $(function() {
-    fastclick.attach(document.body);
     lazyLoad($('img.lazy'));
 
     // 头部banner轮播

@@ -10,7 +10,6 @@ require('channel/home.page.css');
 let $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    fastclick = require('yoho-fastclick'),
     noticeScroll = require('plugin/notice-scroll'),
     tip = require('plugin/tip');
 
@@ -27,7 +26,6 @@ let $mobileWrap = $('.mobile-wrap'),
 let C_ID;
 
 require('common');
-fastclick.attach(document.body);
 
 lazyLoad($('img.lazy'));
 noticeScroll('.notice', $('.notice').data('time') * 1000);

@@ -5,18 +5,12 @@
  */
 
 let $ = require('yoho-jquery');
-let FastClick = require('yoho-fastclick');
 
 let $nav = $('.category-nav'),
     $categoryContainer = $('.category-container'),
     $contents = $categoryContainer.children('.content'),
     $subLevelItem = $categoryContainer.find('.sub-level li');
 
-
-$(function() {
-    FastClick.attach(document.body);
-});
-
 function resetHeight() {
     let h = document.body.scrollHeight - $nav.outerHeight();
 

@@ -9,7 +9,6 @@ require('product/sale/index.page.css');
 let $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper2'),
     ellipsis = require('yoho-mlellipsis'),
-    fastclick = require('yoho-fastclick'),
     lazyload = require('yoho-jquery-lazyload');
 
 let search = require('./sale/search');
@@ -43,8 +42,6 @@ $(function() {
     let $listNavLayer = $saleNavWrap.find('.list-nav-layer');
     let $filterMask = $('.filter-mask');
 
-    fastclick.attach(document.body);
-
     $('.sale-nav').on('click', function() {
         $saleNavSelect.toggleClass('show');
     });

@@ -13,10 +13,6 @@ import {RatingView, LeaveMSGView, OrderListView } from './view';
 import tip from 'plugin/tip';
 import dialog from 'plugin/dialog';
 
-let FastClick = require('yoho-fastclick');
-
-FastClick.attach(document.body);
-
 window.requestAnimFrame = (function() {
     return window.requestAnimationFrame ||
         window.webkitRequestAnimationFrame ||