|  | @@ -1,4 +1,4 @@
 | 
	
		
			
				|  |  | -const webpack = require('webpack');
 | 
	
		
			
				|  |  | +const webpack = require('webpack');
 | 
	
		
			
				|  |  |  const path = require('path');
 | 
	
		
			
				|  |  |  const ExtractTextPlugin = require("extract-text-webpack-plugin");
 | 
	
		
			
				|  |  |  const HtmlWebpackPlugin = require('html-webpack-plugin');
 | 
	
	
		
			
				|  | @@ -239,11 +239,15 @@ module.exports = (function () {
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }));
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +<<<<<<< HEAD
 | 
	
		
			
				|  |  |     //let staticHost = 'http://afts.hnzhiming.com';
 | 
	
		
			
				|  |  | +=======
 | 
	
		
			
				|  |  | +    //let staticHost = 'http://afts.hnzhiming.com';
 | 
	
		
			
				|  |  | +>>>>>>> 616af63cf649d6ce785c0bbfe358e9163f4c82e2
 | 
	
		
			
				|  |  |      let staticHost = 'http://127.0.0.1';    
 | 
	
		
			
				|  |  |      switch (argv.env.deploy) {
 | 
	
		
			
				|  |  |          case 'test':
 | 
	
		
			
				|  |  | -            staticHost = 'http://afts.hnzhiming.com';
 | 
	
		
			
				|  |  | +            staticHost = 'http://static.jishutao.com';
 | 
	
		
			
				|  |  |              break;
 | 
	
		
			
				|  |  |          case 'prod':
 | 
	
		
			
				|  |  |              staticHost = 'http://s.jishutao.com';
 |