解决pull冲突问题

css/style.css

@@ -577,8 +577,8 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
    border-color:#1dc5a3
}
.btn-success {
    background-color:#1c84c6;
    border-color:#1c84c6;
    background-color:#12b7f5;
    border-color:#12b7f5;
    color:#FFF
}
.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success {

js/api-service.js

@@ -9,7 +9,7 @@
		
	} else { // 测试环境配置
        server = "http://172.19.103.88:9092/wlyy/"
        // server = "http://192.168.131.127:8060/"; //逸祥
        //server = "http://192.168.131.127:8060/"; //逸祥
        // server = "http://192.168.131.24:8080/"; //仕杰
        imserver = "http://172.19.103.88:3000/api/v2";
        socketUrl = "http://172.19.103.88:3000";
@@ -20,10 +20,10 @@
    userAgent = localStorage.getItem(agentName)
    //hard code userAgent for test
    //全科
    // userAgent = {"id":4800,"uid":"zbqD201703150222","imei":"864394010176834","token":"3e1795bd21c466eb749480c37847c8b1","platform":2,"hospital":"3502050100"};
    //userAgent = {"id":4817,"uid":"xh1D2017031502222","imei":"864394010176834","token":"7273b147bd09da2ce2daae9fb5066a9c","platform":2,"hospital":"3502050100","appVersion":"1.3.6"};
    //健管
    // userAgent = {"id":4821,"uid":"zbqD201703150228","imei":"864394010176834","token":"73f5ace5c7d4cdb811f743902fd705d9","platform":2,"hospital":"3502050100"}; 
    // userAgent = JSON.stringify(userAgent);
    //userAgent = JSON.stringify(userAgent);
     
	if(userAgent) {
		try{