Merge branch 'master' of http://192.168.1.220:10080/raolu/sr-iHealthApp

html/login/html/login.html

@@ -267,6 +267,7 @@
					mui.later(function() {
						mui.toast("登录成功");
						mui.openWindow('../../home/html/main.html', 'main', {});
						enabledDom("btn_login");
					}, 500);
				} else {
					mui.toast(res.msg);
@@ -315,7 +316,6 @@
			if(docType) {
				plus.storage.removeItem("docType");
			}
			//logout();
			plus.nativeUI.closeWaiting();
		}

html/mine/html/worktime.html

@@ -11,6 +11,10 @@
		<link rel="stylesheet" href="../../../common/cross/css/cross.css" type="text/css" />
		<link rel="stylesheet" href="../../../common/cross/css/cross.ui.css" type="text/css" />
		<style>
			body,html{
				height: 100%;
				overflow: auto;
			}
			.c-list-link{ padding: 0;}
			.c-nowrap{ line-height: 40px;}
			.demo-comtop .save{ display: block;width: 45px;height: 45px; color:#17b3ec;position: absolute;right: 10px;top: 0;}
@@ -77,7 +81,7 @@
		<div class="c-list-info tit">
			<h4 class="c-nowrap">每周排班计划:</h4>
		</div>
		<table class="cycworktime">
		<table class="cycworktime" style="margin-bottom: 40px;">
			<thead>
				<tr>
					<th></th>

html/qygl/js/concern-message.js

@@ -1,5 +1,6 @@
var lastId = 0,selt
    pageSize = 10;
var old_back = mui.back;
mui.plusReady(function(){
	self = plus.webview.currentWebview();
    getMessageList(true);
@@ -7,6 +8,12 @@ mui.plusReady(function(){
    initScroller();
});
mui.back = function(){
	var xiaoxiHtml = plus.webview.getWebviewById("xiaoxipage.html");
	 mui.fire(xiaoxiHtml, 'refresh');
	 old_back();
}
function getMessageList(isInit){
    plus.nativeUI.showWaiting();
    if(isInit){