Merge branch 'grey' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into grey

@@ -140,14 +140,14 @@ Controller.prototype.client=function(res,views,model,clientmodel){
         var src="";
 
         	
-//        if(process.env.NODE_ENV==="production"||process.env.NODE_ENV==="gray"){
-//        	src="http://cdn.yoho.cn/"+config.name+"/"+config.version;
-//        	html=html.replace(/\/static\/index\.min\.css/g,function($1){
-//        		return src+"/index.min.css";
-//        	})
-//        }else{
+        if(process.env.NODE_ENV==="production"||process.env.NODE_ENV==="gray"){
+        	src="http://cdn.yoho.cn/"+config.name+"/"+config.version;
+        	html=html.replace(/\/static\/index\.min\.css/g,function($1){
+        		return src+"/index.min.css";
+        	})
+        }else{
         	src="/static";
-//        }
+        }
         var script=['<script type="text/javascript" src="'+src+'/'+clientmodel+'/libs.js"></script>',
         	'<script type="text/javascript" src="'+src+'/'+clientmodel+'/'+ views+'.js"></script>'];
 		res.send(html+ViewModel+script.join(''));