Merge branch 'feature/yohood' into 'master'

Feature/yohood



See merge request !33

@@ -55,6 +55,7 @@ app.use(cookieParser());
 app.use((req, res, next) => {
     req.user = {}; // 全局的用户数据
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据
+    req.cookies.from = 'action';
 
     next();
 });

@@ -74,7 +74,9 @@ const getEntries = () => {
 };
 
 module.exports = (env) => {
-    return {
+    return {q
+    :Q
+
         entry: getEntries(),
         output: {
             path: path.join(__dirname, '../public/bundle'), // absolute path

@@ -29,6 +29,11 @@ module.exports = {
         serviceNotify: 'http://service.yoho.cn/',
         platformApi: 'http://172.16.6.210:8088/',
     },
+    from: {
+        action: {
+            business_line: 'yohobuy'
+        }
+    },
     corsAllowOrigin: [
         'http://localhost:8081',
         'http://localhost:9000',