Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-prescription

# Conflicts:
#	js/api-service.js

css/style.css

@@ -5719,6 +5719,8 @@ input[type="checkbox"], input[type="radio"] {
}
/* spacing
-----------------------------------------------------------------------------*/
.mt0 { margin-top: 0; }
.mb0 { margin-bottom: 0; }
.mt5 {margin-top:5px;}.mt10 {margin-top:10px;}.mt15 {margin-top:15px;}.mt20 {margin-top:20px;}.mt30 {margin-top:30px;}.mt50 {margin-top:50px;}.mt100 {margin-top:100px;}
.mb5 {margin-bottom:5px;}.mb10 {margin-bottom:10px;}.mb15 {margin-bottom:15px;}.mb20 {margin-bottom:20px;}.mb30 {margin-bottom:30px;}.mb50 {margin-bottom:50px;}.mb100 {margin-bottom:100px;}
.ml5 {margin-left:5px;}.ml10 {margin-left:10px;}.ml15 {margin-left:15px;}.ml20 {margin-left:20px;}.ml30 {margin-left:30px;}.ml50 {margin-left:50px;}.ml100 {margin-left:100px;}
@@ -5745,12 +5747,16 @@ input[type="checkbox"], input[type="radio"] {
.c-w120 { width: 120px; }
.c-w140 { width: 140px; }
.c-w200 { width: 200px; }
.c-w270 { width: 270px; }
.c-h100 { height: 100px; }
.c-fff { color: #fff; }
.c-12b7f5 { color: #12b7f5; }
.c-f96565 { color: #f96565; }
.bc-12b7f5 { background-color: #12b7f5; }
.bc-f5f5fa { background-color: #f5f5fa; }
.pr { position: relative; }
.clearfix:after {visibility:hidden;display:block;font-size:0;content:" ";clear:both;height:0;}
.clearfix {zoom:1;}
.fl,.fr {display:inline;}
@@ -5758,8 +5764,11 @@ input[type="checkbox"], input[type="radio"] {
.fr {float:right;}
.c-display-ib { display: inline-block; }
.c-vam { vertical-align: middle; }
.c-vat { vertical-align: top; }
.c-tac { text-align: center; }
.c-b-r5 { border-radius: 5px; }
.c-b-r10 { border-radius: 10px; }
.c-b-r20 { border-radius: 20px; }
.c-b-c12b7f5 { border-color: #12b7f5; }
.c-border { border: 1px solid; }

js/api-service.js

@@ -9,8 +9,7 @@
		
	} else { // 测试环境配置
        server = "http://172.19.103.88:9092/wlyy/"
        //server = "http://192.168.131.127:8060/"; //逸祥
        // server = "http://192.168.131.24:8080/"; //仕杰
	    // server = "http://192.168.131.24:8080/"; //仕杰
        imserver = "http://172.19.103.88:3000/api/v2";
        socketUrl = "http://172.19.103.88:3000";
		loginUrl = "http://172.19.103.88:9092/wlyy/auth/login.html"
@@ -20,19 +19,10 @@
    userAgent = localStorage.getItem(agentName)
    //hard code userAgent for test
    //全科
    //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);
     
	if(userAgent) {
		try{
			userAgent = JSON.parse(userAgent)
		}catch(e){
			location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
		}
	} else {
		location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
	}
	
	function httpGet(url,options) {