升级依赖

@@ -19,6 +19,16 @@ module.exports = {
         service: 'http://devservice.yoho.cn:58077/',
         service: 'http://devservice.yoho.cn:58077/',
         search: 'http://192.168.102.216:8080/yohosearch/'
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     },
+    subDomains: {
+        host: '.yohobuy.com',
+        default: '//yohobuy.com',
+        guang: '//guang.yohobuy.com',
+        list: '//list.yohobuy.com',
+        search: '//search.yohobuy.com',
+        huodong: '//huodong.yohobuy.com',
+        activity: '//activity.yohobuy.com',
+        index: '//yohobuy.com'
+    },
     useOneapm: false,
     useOneapm: false,
     useCache: false,
     useCache: false,
     memcache: {
     memcache: {

@@ -38,12 +38,12 @@
     "cookie-parser": "^1.4.3",
     "cookie-parser": "^1.4.3",
     "express": "^4.13.1",
     "express": "^4.13.1",
     "express-handlebars": "^3.0.0",
     "express-handlebars": "^3.0.0",
-    "express-session": "^1.13.0",
+    "express-session": "^1.14.0",
     "influxdb-winston": "^1.0.1",
     "influxdb-winston": "^1.0.1",
     "lodash": "^4.13.1",
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
     "md5": "^2.1.0",
     "memcached": "^2.2.2",
     "memcached": "^2.2.2",
-    "moment": "^2.13.0",
+    "moment": "^2.14.1",
     "morgan": "^1.7.0",
     "morgan": "^1.7.0",
     "oneapm": "^1.2.20",
     "oneapm": "^1.2.20",
     "passport": "^0.3.2",
     "passport": "^0.3.2",
@@ -59,15 +59,15 @@
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.11"
+    "yoho-node-lib": "0.0.17"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "autoprefixer": "^6.3.6",
+    "autoprefixer": "^6.3.7",
     "ava": "^0.15.2",
     "ava": "^0.15.2",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-es2015": "^6.9.0",
     "babel-register": "^6.9.0",
     "babel-register": "^6.9.0",
     "cross-env": "^1.0.8",
     "cross-env": "^1.0.8",
-    "eslint": "^2.12.0",
+    "eslint": "^3.0.1",
     "eslint-config-yoho": "^1.0.1",
     "eslint-config-yoho": "^1.0.1",
     "gulp": "^3.9.1",
     "gulp": "^3.9.1",
     "gulp-cssnano": "^2.1.2",
     "gulp-cssnano": "^2.1.2",
@@ -91,9 +91,9 @@
     "postcss-sprites": "^3.1.2",
     "postcss-sprites": "^3.1.2",
     "postcss-use": "^2.0.2",
     "postcss-use": "^2.0.2",
     "precss": "^1.4.0",
     "precss": "^1.4.0",
-    "rewire": "^2.5.1",
+    "rewire": "^2.5.2",
     "shelljs": "^0.7.0",
     "shelljs": "^0.7.0",
-    "stylelint": "^6.8.0",
+    "stylelint": "^6.9.0",
     "stylelint-config-yoho": "^1.2.4",
     "stylelint-config-yoho": "^1.2.4",
     "webpack": "^1.13.1",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",
     "webpack-dev-server": "^1.14.1",
@@ -101,11 +101,7 @@
     "yoho-handlebars": "^4.0.5",
     "yoho-handlebars": "^4.0.5",
     "yoho-jquery": "^1.12.4",
     "yoho-jquery": "^1.12.4",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-jquery-lazyload": "^1.9.7",
-<<<<<<< HEAD
     "yoho-jquery-placeholder": "^2.3.1",
     "yoho-jquery-placeholder": "^2.3.1",
-=======
-    "yoho-jquery-placeholder": "0.0.3",
->>>>>>> develop
     "yoho-slider": "0.0.2"
     "yoho-slider": "0.0.2"
   }
   }
 }
 }

@@ -546,7 +546,7 @@ function actionCover() {
         $('#cover .guide-box').bind('click', function(e) {
         $('#cover .guide-box').bind('click', function(e) {
             e.stopPropagation();
             e.stopPropagation();
         });
         });
-    });
+    };
 }
 }
 
 
 actionCover();
 actionCover();