dengzhiguo 6 years ago
parent
commit
1349831d56
2 changed files with 0 additions and 38 deletions
  1. 0 10
      webpack.config.js
  2. 0 28
      webpack/entry.config.js

+ 0 - 10
webpack.config.js

@@ -121,11 +121,7 @@ module.exports = (function () {
         }));
     }
 
-<<<<<<< HEAD
     let staticHost = 'http://192.168.0.190:8088';    
-=======
-    let staticHost = 'http://192.168.0.188:8088';    
->>>>>>> 0c83e01ff346f69888c4d3ffbf455bb80e6edf65
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -160,15 +156,9 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-<<<<<<< HEAD
             host: '192.168.0.190',
             port: 8088,
             allowedHosts: ['192.168.0.190:8088','192.168.0.20','192.168.0.99'],
-=======
-            host: '192.168.0.188',
-            port: 80,
-            allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
->>>>>>> 0c83e01ff346f69888c4d3ffbf455bb80e6edf65
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }

+ 0 - 28
webpack/entry.config.js

@@ -11,7 +11,6 @@ module.exports = {
     'admin/index': './js/admin/index.js',
   },
   watch: {
-<<<<<<< HEAD
     'user/index': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/index.js'
@@ -29,42 +28,15 @@ module.exports = {
       './js/user/account/index.js'
     ],
     'user/account/evaluateInfo': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
-=======
-    'user/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/user/index.js'
-    ],
-    'user/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/user/login.js'
-    ],
-    'user/signIn': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/user/signIn.js'
-    ],
-    'user/account/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/user/account/index.js'
-    ],
-    'user/account/evaluateInfo': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
->>>>>>> 0c83e01ff346f69888c4d3ffbf455bb80e6edf65
       'webpack/hot/only-dev-server',
       './js/user/account/assessment.js'
     ],
     //admin
-<<<<<<< HEAD
     'admin/login': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
     'webpack/hot/only-dev-server',
     './js/user/adminLogin.js'
     ],
     'admin/index': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
-=======
-    'admin/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
-    'webpack/hot/only-dev-server',
-    './js/user/adminLogin.js'
-    ],
-    'admin/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
->>>>>>> 0c83e01ff346f69888c4d3ffbf455bb80e6edf65
       'webpack/hot/only-dev-server',
       './js/admin/index.js'
     ]