fix

双汇APP-h5/Common/js/setting_manage.js

@@ -22,9 +22,7 @@ mui.init({
 		}
 	},
 	beforeback: function() {
-		var list = plus.webview.currentWebview().opener();
-		//refresh是A页面自定义事件
-		mui.fire(list, 'refreshPer');
+		console.log("返回上一页")
 		//返回true,继续页面关闭逻辑
 		return true;
 	}
@@ -162,24 +160,11 @@ function Ajax() {
 $('.tabalList').on('tap', '.xg_manage', function() {
 	var id = $(this).attr('data-index');
 	var name = $(this).attr('data-name');
+	var targetUrl = 'xg_manage.html?name=' + encodeURIComponent(name) + '&id=' + encodeURIComponent(id);
 	mui.openWindow({
-		id: 'xg_manage',
-		url: 'xg_manage.html',
+		id:'xg_manage',
+		url: targetUrl,
 		createNew: true,
-		show: {
-			aniShow: 'pop-in'
-		},
-		styles: {
-			popGesture: 'hide'
-		},
-		waiting: {
-			autoShow: true
-		},
-		extras: {
-			name: name,
-			nameid: id,
-			token: localStorage.getItem('token')
-		}
 	});
 })
 $('.tjyh').on('tap', function() {
@@ -187,17 +172,5 @@ $('.tjyh').on('tap', function() {
 		id: 'tj_manage',
 		url: 'tj_manage.html',
 		createNew: true,
-		show: {
-			aniShow: 'pop-in'
-		},
-		styles: {
-			popGesture: 'hide'
-		},
-		waiting: {
-			autoShow: false
-		},
-		extras: {
-			token: localStorage.getItem('token')
-		}
 	});
 })

双汇APP-h5/Common/js/tj_manage.js

@@ -1,8 +1,5 @@
 mui.init({
 	beforeback: function() {
-		var list = plus.webview.currentWebview().opener();
-		//refresh是A页面自定义事件
-		mui.fire(list, 'refresh');
 		//返回true,继续页面关闭逻辑
 		return true;
 	}
@@ -10,9 +7,8 @@ mui.init({
 
 //初始化单页的区域滚动
 mui('.mui-scroll-wrapper').scroll();
-mui.plusReady(function() {
-
-	//	产品代码
+window.onload = function () {
+	//	部门数据
 	var Product = [];
 	$.ajax({
 		type: "get",
@@ -76,7 +72,7 @@ mui.plusReady(function() {
 			var F_Product = doc.getElementById('F_ProductType');
 			showUserPickerButton2.addEventListener('tap', function(event) {
 				userPicker2.show(function(items) {
-
+	
 					if (items[2].text == undefined) {
 						if (items[1].text == undefined) {
 							F_Product.value = items[0].text;
@@ -105,7 +101,8 @@ mui.plusReady(function() {
 			}, false);
 		})
 	})(mui, document);
-})
+}
+
 $('#xgPassword').on('tap', function() {
 
 	//	alert($('.F_UserName').val());
@@ -138,9 +135,14 @@ $('#xgPassword').on('tap', function() {
 				if (data.state == "success") {
 
 					mui.alert('账号' + data.data.F_UserCode + '--密码' + data.data.F_Password, '添加成功',
+						
 						function() {
-							var wobj = plus.webview.getWebviewById("Setting_manage");
-							wobj.reload(true);
+							mui.openWindow({
+								id: 'Setting_manage',
+								url: 'Setting_manage.html',
+								createNew: true,
+							});
+							
 						});
 
 				} else {

双汇APP-h5/Common/js/xg_manage.js

@@ -1,8 +1,6 @@
 mui.init({
 	beforeback: function() {　　　　
-		var list = plus.webview.currentWebview().opener();　　　　
-		//refresh是A页面自定义事件
-		mui.fire(list, 'refresh');
+		
 		//返回true,继续页面关闭逻辑
 		return true;
 	}
@@ -11,11 +9,12 @@ var F_RoleId = localStorage.getItem('F_RoleId');
 var F_UserCode = localStorage.getItem('F_UserCode');
 //初始化单页的区域滚动
 mui('.mui-scroll-wrapper').scroll();
-mui.plusReady(function() {
-	
-	var wv = plus.webview.currentWebview();
-	var nameid = wv.nameid;
-	var name = wv.name;
+
+window.onload = function () {
+	// 获取传递的参数
+	var name = getQueryString('name');
+	var nameid = getQueryString('id');
+	console.log(name,nameid)
 	// 角色
 	var roleList = []
 	$.ajax({
@@ -74,7 +73,7 @@ mui.plusReady(function() {
 		error: function(xhr, type, errorThrown) {
 			//异常处理；
 		}
-
+	
 	});
 	//	产品代码
 	var Product = [];
@@ -142,7 +141,9 @@ mui.plusReady(function() {
 			}, false);
 		})
 	})(mui, document);
-})
+}
+
+
 $('#deteBtn').on('tap', function() {
 	var btnArray = ['否', '是'];
 	var zhxx=$('.rolname').val();
@@ -159,8 +160,12 @@ $('#deteBtn').on('tap', function() {
 				},
 				success: function(data) {
 					if(data.state == "success") {
-						var wobj = plus.webview.getWebviewById("Setting_manage");
-						wobj.reload(true);
+						mui.openWindow({
+							id: 'Setting_manage',
+							url: 'Setting_manage.html',
+							createNew: true,
+						});
+						
 					} else {
 						mui.toast(data.message);
 					}
@@ -200,8 +205,11 @@ $('#xgPassword').on('tap', function() {
 						if(data.state == "success") {
 							mui.toast('修改成功！');
 							setTimeout(function () {
-								var wobj = plus.webview.getWebviewById("Setting_manage");
-								wobj.reload(true);
+								mui.openWindow({
+									id: 'Setting_manage',
+									url: 'Setting_manage.html',
+									createNew: true,
+								});
 							},1500)
 						} else {
 							mui.toast(data.message);

双汇APP-h5/Common/xg_manage.html

@@ -98,4 +98,5 @@
 	<script src="../js/mui.view.js "></script>
 	<script src="../js/app.js"></script>
 	<script src="js/xg_manage.js"></script>
+	<script src="../js/utils/index.js"></script>
 </html>

双汇APP-h5/Setting-1.html

@@ -8,6 +8,7 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<link rel="stylesheet" href="css/mui.min.css">
+		<link rel="stylesheet" href="./css/iconfont.css" />
 		<link rel="stylesheet" href="css/setting.css" />
 	</head>
 
@@ -17,7 +18,7 @@
 			<div class="mui-view">
 				<div class="mui-navbar" style="display: none;">
 				</div>
-				<div class="mui-pages" style="top: 0;">啊啊啊
+				<div class="mui-pages" style="top: 0;">
 				</div>
 			</div>
 		</div>
@@ -77,7 +78,21 @@
 			<input type="hidden" id="Vb" />
 			<!--页面主内容区结束-->
 		</div>
-
+		<nav class="mui-bar mui-bar-tab">
+		
+			<a class="mui-tab-item" href="personal.html" index="0">
+				<span class="mui-icon iconfont icon-gongzuojiaoban"></span>
+				<span class="mui-tab-label">我的任务</span>
+			</a>
+			<a class="mui-tab-item" href="tab-phone.html" index="1">
+				<span class="mui-icon iconfont icon-tongxunlu"></span>
+				<span class="mui-tab-label">通讯录</span>
+			</a>
+			<a class="mui-tab-item mui-active" href="Setting-1.html" index="2">
+				<span class="mui-icon iconfont icon-yonghu"></span>
+				<span class="mui-tab-label">我的</span>
+			</a>
+		</nav>
 		<!--常见问题-->
 	</body>
 	<script src="js/mui.min.js "></script>
@@ -85,5 +100,6 @@
 	<script src="js/jquery-1.8.js"></script>
 	<script src="js/huayi.config.js"></script>
 	<script src="js/mui.view.js "></script>
+	<script src="js/utils/menu.js"></script>
 	<script src="js/setting.js"></script>
 </html>

双汇APP-h5/js/personal.js

@@ -1,21 +1,15 @@
 mui.init();
 
 var token = localStorage.getItem("token"); //获取本地存储
-mui.plusReady(function() {
-	console.log(1)
+window.onload = function () {
 	ajaxRefresh();
-	
-	setTimeout(function() {
-		clienGet();
-		upData(); //监测版本号更新APP indexOutTime
-	},huayi.config.indexOutTime);
 	setInterval(function() {ajaxRefresh()},60*1000);
-	setInterval(function() {clienGet()},huayi.config.indextime); 
-})
+}
 
 window.addEventListener('refreshPer', function(e) { //点返回按钮时执行刷新
 	ajaxRefresh();
 });
+
 //权限判断
 $.ajax({
 	data: {
@@ -188,6 +182,7 @@ function ajaxRefresh() {
 	});
 }
 
+
 //一级查看-待处理列表
 $(".work-list").on('tap', function() {
 	var index = $(this).attr('index');
@@ -244,93 +239,10 @@ $(".work-CJ").on('tap', function() {
 		}
 	});
 })
-function  clienGet() {
-	var pinf = plus.push.getClientInfo();
-	var cid = pinf.clientid;//客户端标识   
-	if (plus.device.model.indexOf('iPhone') > -1) {
-		var apptype=2;
-	}else{
-		var apptype=1;
-	}
-	$.ajax({
-		type: "get",
-		url: huayi.config.callcenter_url + 'PushMessage/PutAppClientIdAsync',
-		async: false,
-		data: {
-			apptype:apptype,
-			clientid: cid,
-			token:localStorage.getItem("token")
-		},
-		dataType: 'json', 
-		success: function(res) {
-			if(res.state.toLowerCase() === "success") {
-			}				
-		}
-	});	
-}
 
-function upData() {
-	// 版本更新
-	var Code_;
-	var NewCode_;
-	plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
-		console.log("当前应用版本：" + wgtinfo.version + "---" + plus.runtime.version);
-		localStorage.setItem("Code", wgtinfo.version) //缓存保存版本号;
-		Code_ = localStorage.getItem("Code");
-		$('.update').text(Code_);
-	});	
-	if (plus.device.model.indexOf('iPhone') > -1) {
-		typeUp=1;
-	}else{
-		typeUp=0; 
-	}
-	//检查更新
-	var server = huayi.config.callcenter_url + "ApplicationsVersion/GetAndroid"; //获取升级描述文件服务器地址	
-	mui.ajax(server, {
-		data: {
-			type:typeUp,
-			isNew: true, 
-			token: token
-		},
-		dataType: 'json', //服务器返回json格式数据
-		type: 'post', //HTTP请求类型
-		timeout: 10000, //超时时间设置为10秒；
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'
-		},
-		success: function(data) { 
-			if (data.state == "success") {
-				NewCode_ = data.data.F_VersionCode;
-				localStorage.setItem("Code", NewCode_);//缓存保存版本号;
-				if(NewCode_&&Code_){
-					if (Code_ != NewCode_) {
-						var Codes = localStorage.setItem("Code", NewCode_);
-						console.log(Codes);
-						plus.nativeUI.confirm("发现新版本", function(event) {
-							var tapIndex = event.index; 
-							if (tapIndex == 0) { 
-								if (typeUp==1) {
-									plus.runtime.openURL(data.data.F_Url);
-								}else{
-									plus.runtime.openURL(data.data.FileUrl[0].F_Url);
-								}
-							} else {
-								mui.toast("取消更新");
-							}
-						}, "提示", ["立即更新", "取消"])
-					}
-				}
-				
 
-			} else {
-				mui.toast(data.message);
 
-			}
 
-		},
-		error: function(data) {
-			//异常处理；
-			console.log(data.message);
-		}
-	})
-}
+
+
+

双汇APP-h5/js/setting.js

@@ -45,90 +45,8 @@ function adminTx() {
 
 
 //		//检测网络连接
-mui.plusReady(function() {
+window.onload = function () {
 	adminTx();
-	var Code_;
-	var NewCode_;
-	var server = huayi.config.callcenter_url + "ApplicationsVersion/GetAndroid?"; //获取升级描述文件服务器地址
-	document.addEventListener("netchange", wainshow, false);
-	plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
-		//				$("#Vb").text(wgtinfo.version);
-		//			 var 
-		//							$('.update').text(Code_);
-		console.log("当前应用版本：" + wgtinfo.version + "---" + plus.runtime.version);
-		localStorage.setItem("Code", wgtinfo.version) //缓存保存版本号;
-		Code_ = localStorage.getItem("Code");
-		$('.update').text(Code_);
-
-		//			Gx();
-	});
-	//检查更新
-	document.getElementById("update").addEventListener('tap', function() {
-		if (plus.device.model.indexOf('iPhone') > -1) {
-			typeUp=1;
-		}else{
-			typeUp=0; 
-		}
-		var server = huayi.config.callcenter_url + "ApplicationsVersion/GetAndroid?"; //获取升级描述文件服务器地址
-		mui.ajax(server, {
-			data: {
-				type:typeUp,
-				isNew: true,
-				token: a
-			},
-			dataType: 'json', //服务器返回json格式数据
-			type: 'post', //HTTP请求类型
-			timeout: 10000, //超时时间设置为10秒；
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'
-			},
-			success: function(data) {
-				if(data.state == "success") {
-					NewCode_ = data.data.F_VersionCode;
-					
-					localStorage.setItem("Code", NewCode_); //缓存保存版本号;
-					if(Code_ != NewCode_) {
-						var Codes = localStorage.setItem("Code", NewCode_);
-						console.log(Codes);
-						plus.nativeUI.confirm("发现新版本", function(event) {
-							var tapIndex = event.index;
-							if(tapIndex == 0) {
-								if (typeUp==1) {
-									plus.runtime.openURL(data.data.F_Url);
-								}else{
-									plus.runtime.openURL(data.data.FileUrl[0].F_Url);
-								}
-							} else {
-								mui.toast("取消更新");
-							}
-						}, "提示", ["立即更新", "取消", ])
-					}
-
-				} else {
-					mui.toast(data.message);
-
-				}
-
-			},
-			error: function(data) {
-				//异常处理；
-				console.log(data.message);
-			}
-		})
-	});
-	var backcount = 0;
-	mui.back = function() {
-		if(mui.os.ios) return;
-		if(backcount > 0) {
-			if(window.plus) plus.runtime.quit();
-			return;
-		};
-		mui.toast('再按一次退出应用');
-		backcount++;
-		setTimeout(function() {
-			backcount = 0;
-		}, 2000);
-	};
 	//用户管理
 	$("#management").on('tap', function() {
 		mui.openWindow({
@@ -156,16 +74,8 @@ mui.plusReady(function() {
 			
 		});
 	})
-
-});
-//检测网络连接
-function wainshow() {
-	if(plus.networkinfo.getCurrentType() == plus.networkinfo.CONNECTION_NONE) {
-		mui.toast("网络异常，请检查网络设置！");
-	} else {
-		mui.toast("网络连接");
-	}
 }
+
 //常见问题
 document.getElementById('Question').addEventListener('tap', function() {
 	

双汇APP-h5/js/utils/index.js

@@ -0,0 +1,8 @@
+function getQueryString(name) {
+	var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+	var r = window.location.search.substr(1).match(reg);
+	if (r != null) {
+		return decodeURIComponent(r[2]);
+	}
+	return null;
+}

双汇APP-h5/js/utils/menu.js

@@ -0,0 +1,19 @@
+//一级查看-待处理列表
+$(".mui-tab-item").on('tap', function() {
+	var url = $(this).attr('href');
+	var index = $(this).attr('index');
+	mui.openWindow({
+		id: url,
+		url: url,
+		createNew: true,
+		show: {
+			autoShow: false
+		},
+		waiting: {
+			autoShow: true //自动显示等待框，默认为true
+		},
+		extras: {
+			index: index,
+		}
+	});
+})

双汇APP-h5/personal.html

@@ -11,6 +11,9 @@
 		<link rel="stylesheet" href="css/iconfont.css" />
 		<link rel="stylesheet" href="css/personal.css" />
 		<style>
+			.mui-content {
+			    touch - action: none;
+			}
 			#Report {
 				width: 110px;
 				margin: 0 auto;
@@ -369,9 +372,26 @@
 			</div>
 
 		</div>
+		<nav class="mui-bar mui-bar-tab">
+		
+			<a class="mui-tab-item mui-active" href="personal.html" index="0">
+				<span class="mui-icon iconfont icon-gongzuojiaoban"></span>
+				<span class="mui-tab-label">我的任务</span>
+			</a>
+			<a class="mui-tab-item" href="tab-phone.html" index="1">
+				<span class="mui-icon iconfont icon-tongxunlu"></span>
+				<span class="mui-tab-label">通讯录</span>
+			</a>
+			<a class="mui-tab-item" href="Setting-1.html" index="2">
+				<span class="mui-icon iconfont icon-yonghu"></span>
+				<span class="mui-tab-label">我的</span>
+			</a>
+		</nav>
 	</body>
 	<script src="js/mui.min.js "></script>
 	<script src="js/zepto.js"></script>
 	<script src="js/huayi.config.js"></script>
+	<script src="js/utils/menu.js"></script>
 	<script src="js/personal.js"></script>
+	
 </html>

双汇APP-h5/tab-phone.html

@@ -70,11 +70,27 @@
 			
 			<!--右上角弹出菜单-->
 		</div>
+		<nav class="mui-bar mui-bar-tab">
+		
+			<a class="mui-tab-item" href="personal.html" index="0">
+				<span class="mui-icon iconfont icon-gongzuojiaoban"></span>
+				<span class="mui-tab-label">我的任务</span>
+			</a>
+			<a class="mui-tab-item mui-active" href="tab-phone.html" index="1">
+				<span class="mui-icon iconfont icon-tongxunlu"></span>
+				<span class="mui-tab-label">通讯录</span>
+			</a>
+			<a class="mui-tab-item" href="Setting-1.html" index="2">
+				<span class="mui-icon iconfont icon-yonghu"></span>
+				<span class="mui-tab-label">我的</span>
+			</a>
+		</nav>
 		<input hidden="hidden" type="text" id='DWResult' class="ui-alert type_con" data-index="" readonly="readonly" />
 		<script src="./js/mui.min.js"></script>
 		<script src="./js/zepto.js"></script>
 		<script src="./js/huayi.config.js"></script>
 		<script src="./js/huayi.http.js"></script>
+		<script src="js/utils/menu.js"></script>
 		<script src="js/tab.js"></script>
 	</body>