| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -141,17 +141,13 @@ var config = { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     * title | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     * 描述 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     */ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			<<<<<<< Updated upstream | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    getWeapNote: '/mall/getWeapNote', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    scoreLevelInfo: '/mall/scoreLevelInfo', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    getWeRunData: '/user/getWeRunData' | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			======= | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    getWeapNote:'/mall/getWeapNote', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    getWeRunData: '/user/getWeRunData', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    /** | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     * 小程序获取游戏路径 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     */ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    getGame:'/game/getOne' | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			>>>>>>> Stashed changes | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			  }, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			  weapp: { | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |