fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit f55b63b8294ac93f39acc10861d4836e6a43f626 1 parent 3f837bd7

del package lock

Inline Side-by-side
Showing 4 changed files with 9 additions and 6 deletions
@@ -151,3 +151,4 @@ library @@ -151,3 +151,4 @@ library
151 Procfile 151 Procfile
152 .env 152 .env
153 .package-lock 153 .package-lock
  154 +package-lock.json
@@ -158,10 +158,10 @@ const getSubNavGroup = (data, type) => { @@ -158,10 +158,10 @@ const getSubNavGroup = (data, type) => {
158 obj.isHot = item.is_hot === 'Y' ? true : false; 158 obj.isHot = item.is_hot === 'Y' ? true : false;
159 obj.isNew = item.is_new === 'Y' ? true : false; 159 obj.isNew = item.is_new === 'Y' ? true : false;
160 160
161 - // if (item.sub) {  
162 - // obj.thirdNav = getThirdNav(item.sub);  
163 - // obj.imgCode = item.content_code;  
164 - // } 161 + if (item.sub) {
  162 + obj.thirdNav = getThirdNav(item.sub);
  163 + obj.imgCode = item.content_code;
  164 + }
165 165
166 subNav.push(obj); 166 subNav.push(obj);
167 }); 167 });
This diff could not be displayed because it is too large.
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
33 "cookie-parser": "^1.4.3", 33 "cookie-parser": "^1.4.3",
34 "csurf": "^1.9.0", 34 "csurf": "^1.9.0",
35 "express": "^4.13.1", 35 "express": "^4.13.1",
  36 + "handlebars": "4.0.5",
36 "lodash": "^4.13.1", 37 "lodash": "^4.13.1",
37 "md5": "^2.1.0", 38 "md5": "^2.1.0",
38 "moment": "^2.14.1", 39 "moment": "^2.14.1",
@@ -68,9 +69,9 @@ @@ -68,9 +69,9 @@
68 "eslint-config-yoho": "^1.0.1", 69 "eslint-config-yoho": "^1.0.1",
69 "eslint-loader": "^1.6.3", 70 "eslint-loader": "^1.6.3",
70 "extract-text-webpack-plugin": "^2.1.0", 71 "extract-text-webpack-plugin": "^2.1.0",
71 - "happypack": "^3.0.3",  
72 "handlebars": "4.0.5", 72 "handlebars": "4.0.5",
73 "handlebars-loader": "^1.4.0", 73 "handlebars-loader": "^1.4.0",
  74 + "happypack": "^3.0.3",
74 "husky": "^0.11.4", 75 "husky": "^0.11.4",
75 "jquery-ui": "^1.12.1", 76 "jquery-ui": "^1.12.1",
76 "nodemon": "1.9.2", 77 "nodemon": "1.9.2",
@@ -85,6 +86,7 @@ @@ -85,6 +86,7 @@
85 "postcss-opacity": "^4.0.0", 86 "postcss-opacity": "^4.0.0",
86 "postcss-position": "^0.5.0", 87 "postcss-position": "^0.5.0",
87 "postcss-pxtorem": "^4.0.0", 88 "postcss-pxtorem": "^4.0.0",
  89 + "postcss-scss": "^1.0.2",
88 "postcss-short": "^3.0.3", 90 "postcss-short": "^3.0.3",
89 "postcss-sprites": "^4.2.0", 91 "postcss-sprites": "^4.2.0",
90 "postcss-use": "^2.3.0", 92 "postcss-use": "^2.3.0",
@@ -94,8 +96,8 @@ @@ -94,8 +96,8 @@
94 "style-loader": "^0.16.0", 96 "style-loader": "^0.16.0",
95 "stylelint": "^7.9.0", 97 "stylelint": "^7.9.0",
96 "stylelint-config-yoho": "^1.2.8", 98 "stylelint-config-yoho": "^1.2.8",
97 - "stylelint-webpack-plugin": "^0.7.0",  
98 "stylelint-formatter-table": "^1.0.3", 99 "stylelint-formatter-table": "^1.0.3",
  100 + "stylelint-webpack-plugin": "^0.7.0",
99 "webpack": "^2.3.1", 101 "webpack": "^2.3.1",
100 "webpack-dev-server": "^2.4.2", 102 "webpack-dev-server": "^2.4.2",
101 "yoho-eventproxy": "^0.3.6", 103 "yoho-eventproxy": "^0.3.6",