双汇app修改

双汇APP-andriod/js/huayi.config.js

@@ -2,9 +2,9 @@ if(huayi == undefined) {
 	var huayi = {};
 }
 huayi.config = {
-	//callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
+	callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
-	callcenter_url: "http://192.168.8.9:1001/",//生产环境
+	//callcenter_url: "http://192.168.8.9:1001/",//生产环境
 	socket_ip: "222.143.137.63", //ip
 	socket_port: "8081", //端口
 	menuworktime: 30000, //菜单工单数量刷新间隔

双汇APP-andriod/js/personal.js

@@ -232,11 +232,29 @@ mui.plusReady(function() {
 			dataType: 'json', 
 			success: function(res) {
 				if(res.state.toLowerCase() === "success") {
-					alert(cid);
-				}
+				}				
 			}
 		});	
 	},2000)
+	setInterval(function () {
+		var pinf = plus.push.getClientInfo();
+		var cid = pinf.clientid;//客户端标识  
+		$.ajax({
+			type: "get",
+			url: huayi.config.callcenter_url + 'PushMessage/PutAppClientIdAsync',
+			async: false,
+			data: {
+				apptype:1,
+				clientid: cid,
+				token:localStorage.getItem("token")
+			},
+			dataType: 'json', 
+			success: function(res) {
+				if(res.state.toLowerCase() === "success") {					
+				}
+			}
+		});
+	},300000)
 	 
 	
 })

双汇APP-andriod/manifest.json

@@ -3,7 +3,7 @@
     "id" : "io.dcloud.H5E9497091", /*应用的标识，创建应用时自动生成，勿手动修改*/
     "name" : "双汇售后服务平台", /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.2.4", /*应用版本名称*/
+        "name" : "1.2.5", /*应用版本名称*/
         "code" : "83"
     },
     "description" : "", /*应用描述信息*/

双汇APP-andriod/personal.html

@@ -11,7 +11,7 @@
 		<link rel="stylesheet" href="css/iconfont.css" /> 
 		<link rel="stylesheet" href="css/personal.css" />
 		<style>
-			#Report{ 
+			#Report{  
 				width: 110px;
 				margin: 0 auto;
 				overflow: hidden;

双汇APP-andriod/workOrder/js/custom_select.js

@@ -7,7 +7,9 @@ $(document).ready(function(){
         if ($('.grade-eject').hasClass('grade-w-roll')) {
             $('.grade-eject').removeClass('grade-w-roll');
 			$(this).removeClass('current');
+			alert("1")
         } else {
+			alert("2")
             $('.grade-eject').addClass('grade-w-roll');
 			$(this).addClass('current');
         }

双汇APP/js/huayi.config.js

@@ -2,13 +2,13 @@ if(huayi == undefined) {
 	var huayi = {};
 }
 huayi.config = {
-	//callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
+	callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
-	callcenter_url: "http://192.168.8.9:1001/",//生产环境
+	//callcenter_url: "http://192.168.8.9:1001/",//生产环境
 	socket_ip: "222.143.137.63", //ip
 	socket_port: "8081", //端口
 	menuworktime: 30000, //菜单工单数量刷新间隔
-	indextime: 5000, //首页报表刷新间隔
+	indextime: 1000*10, //首页报表刷新间隔
 	arr: [
 			"<a class='xg' onclick='ckxq(data)' title='查看'>查看</a>",
 			"<a class='xg' onclick='bj(data)' title='编辑'>编辑</a>",

双汇APP/js/personal.js

@@ -216,7 +216,6 @@ mui.plusReady(function() {
 			console.log(data.message);
 		}
 	})
-	
 	setTimeout(function  clienGet() {
 		var pinf = plus.push.getClientInfo();
 		var cid = pinf.clientid;//客户端标识  
@@ -232,12 +231,29 @@ mui.plusReady(function() {
 			dataType: 'json', 
 			success: function(res) {
 				if(res.state.toLowerCase() === "success") {
-					alert(cid)
-				}
-				
+				}				
 			}
 		});	
 	},2000)
+	setInterval(function () {
+		var pinf = plus.push.getClientInfo();
+		var cid = pinf.clientid;//客户端标识  
+		$.ajax({
+			type: "get",
+			url: huayi.config.callcenter_url + 'PushMessage/PutAppClientIdAsync',
+			async: false,
+			data: {
+				apptype:1,
+				clientid: cid,
+				token:localStorage.getItem("token")
+			},
+			dataType: 'json', 
+			success: function(res) {
+				if(res.state.toLowerCase() === "success") {					
+				}
+			}
+		});
+	},300000)
 	 
 	
 })

双汇APP/manifest.json

@@ -3,7 +3,7 @@
     "id" : "io.dcloud.H5E9497091", /*应用的标识，创建应用时自动生成，勿手动修改*/
     "name" : "双汇售后服务平台", /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.2.4", /*应用版本名称*/
+        "name" : "1.2.5", /*应用版本名称*/
         "code" : "83"
     },
     "description" : "", /*应用描述信息*/
@@ -71,7 +71,8 @@
         "Camera" : {},
         "Audio" : {},
         "Device" : {},
-        "Contacts" : {}
+        "Contacts" : {},
+        "Push" : {}
     },
     "plus" : {
         "splashscreen" : {
@@ -93,7 +94,8 @@
                     "NSCameraUsageDescription" : "此App会在上传头像图片，处理工单服务中访问您的相机权限",
                     "NSPhotoLibraryAddUsageDescription" : "此App会在上传头像图片，处理工单服务中访问您的相册权限",
                     "NSPhotoLibraryUsageDescription" : "此App会在上传头像图片，处理工单服务中访问您的相册权限"
-                }
+                },
+                "idfa" : false
             },
             "google" : {
                 "packagename" : "", /*Android应用包名，如io.dcloud.HelloH5*/
@@ -198,7 +200,10 @@
                 }
             },
             "plugins" : {
-                "ad" : {}
+                "ad" : {},
+                "push" : {
+                    "unipush" : {}
+                }
             }
         },
         "adid" : "128026090911",

双汇APP/workOrder/Work-list.html

@@ -14,6 +14,9 @@
 		<link rel="stylesheet" href="css/Work-list.css" />
 		<link rel="stylesheet" href="css/custom_select.css" />
 	</head>
+	<style>
+		
+	</style>
 	<body>
 		<!-- End screening -->
 		<div class="grade-eject">
@@ -27,7 +30,7 @@
 		    </div>
 		    <!--<div class="all_check"><img src="../img/all_check.png"/></div>-->
 		</div>
-		
+		<div class="grade-eject_bj"></div>
 		<header class="mui-bar mui-bar-nav" style="padding-right: 15px;color: #fff;">
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 			<h1 class="mui-center mui-title"><span class="Totle-box" style="color: #FFFFFF;"></span><span class="Totle" style="color: #FFFFFF;"></span></h1>

双汇APP/workOrder/Work-listClass.html

@@ -12,30 +12,46 @@
 		<link href="../css/mui.poppicker.css" rel="stylesheet" />
 		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
 		<link rel="stylesheet" href="css/Work-list.css" />
+		<link rel="stylesheet" href="css/custom_select.css" />
 	</head>
 	<body>
+		<div class="grade-eject">
+		    <ul class="grade-w clickArea" id="gradew">
+		    </ul>
+		    <ul class="grade-t clickArea" id="gradet">
+		    </ul>
+		    <div class="recet_button clickArea">
+		    	<button class="btn_class resBtn">重置</button>
+		    	<button class="btn_class tureBtn">确定</button>
+		    </div>
+		    <!--<div class="all_check"><img src="../img/all_check.png"/></div>-->
+		</div>
+		<div class="grade-eject_bj"></div>
 		<header class="mui-bar mui-bar-nav" style="padding-right: 15px;color: #fff;">
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 			<h1 class="mui-center mui-title"><span class="Totle-box" style="color: #FFFFFF;"></span><span class="Totle"></span></h1>
-			<a class=" mui-icon-tiajia mui-pull-right tjyh" style="color: #fff;" id="DW">
-				办事处筛选
+			<a class=" mui-icon-tiajia mui-pull-right tjyh Regional" style="color: #fff;" id="DW">
+				办事处筛选 
 			</a>
 		</header>
 		<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed" style="margin-top: 43px;">
 			<li class="mui-table-view-cell">
 				<div class="mui-input-row mui-search ">
 					<input type="search" class="mui-input-clear go_search search Width" placeholder="请输入关键字" style="margin-bottom: 0;">							
+					
 				</div>
 			</li>
+			
 		</ul>
-		<div id="slider" class="mui-slider" style="margin-top:0px; z-index: 333; background: #FFFFFF;">
+		
+		<div id="slider"  style="margin-top:0px; background: #FFFFFF; z-index:30; position: absolute; top: 99px;">			
 			<div id="mui_list" class="mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-				<a class="mui-control-item mui-active" data-index="1">
-					处理中<span class="clzTotle"></span>
-				</a>
-				<a class="mui-control-item" data-index="2">
+				<div class="mui-control-item mui-active" data-index="1">
+					处理中<span class="clzTotle"></span> 
+				</div>
+				<div class="mui-control-item" data-index="2">
 					已完成<span class="ywcTotle"></span>
-				</a>
+				</div>
 			</div>
 		</div>
 		<div class="mui-content mui-scroll-wrapper" id="pullrefresh" style="margin-top: 100px;">
@@ -52,13 +68,17 @@
 		<input hidden="hidden" type="text" id='DWResult' class="ui-alert type_con" data-index="" readonly="readonly" />
 			<!--右上角弹出菜单-->
 		</div>
+		<input id="AreaId" type="hidden" />
+		<input id="OfficeId" type="hidden" />
 		<script src="../js/mui.min.js"></script>
 		<script src="../js/mui.poppicker.js"></script>
 		<script src="../js/mui.picker.min.js"></script>
 		<script src="../js/zepto.js"></script>
-		<script src="../js/jquery-1.8.js"></script>
 		<script src="../js/huayi.config.js"></script>
+		<script src="../js/huayi.http.js"></script>
 		<script src="js/Work-listClass.js"></script>
+		<script src="../js/jquery-1.8.js"></script>
+		<script src="js/custom_select.js"></script>
 	</body>
 		
 </html>

双汇APP/workOrder/css/Work-list.css

@@ -270,6 +270,7 @@ ul {
 	top: 10px;
 	height: 20px;
 	line-height: 20px;
+	z-index: 334;
 }
 .mui-icon-tiajia img{
 	width: 100%;

双汇APP/workOrder/css/custom_select.css

@@ -0,0 +1,143 @@
+/* screening */
+ul li{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+*{ box-sizing:border-box; padding:0px; margin:0px;}
+div.screening{
+    width: 100%;
+    overflow: hidden;
+    background: #fff;
+    /*position: fixed;*/
+    z-index: 44444;
+}
+div.screening>ul{
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    border-bottom: solid 1px #d3d3d3;
+    overflow: hidden;
+}
+div.screening>ul>li{
+    float: left;
+	 font-size:0.75em;
+    width: 25%;
+    text-align: center;
+    line-height: 3rem;
+    border-left: solid 1px #d3d3d3;
+    
+}
+div.screening>ul>li>span{
+	background: url("../images/on_1.png") no-repeat right center; background-size:0.75em; padding-right:15px;
+	}
+div.screening>ul>.current>span{
+    background: url("../images/on_2.png") no-repeat  right center;background-size:0.75em; color:#3cb9f3;
+}
+
+/* grade */
+.meishi22,.grade-eject,.Category-eject,.Sort-eject{
+    position:fixed;
+    top: -65%;
+    width: 100%;
+    height: 63%;
+    z-index: 1;
+    -webkit-transition-duration: 0.4s;
+}
+
+.meishi22>ul,.grade-eject>ul,.Category-eject>ul,.Sort-eject>ul{
+    margin: 0;
+    padding: 0;
+    overflow: auto;
+    height: 100%;
+    width: 100%;
+    -webkit-transition-duration: 0.4s;
+}
+.meishi22>ul>li,.grade-eject>ul>li,.Category-eject>ul>li,.Sort-eject>ul>li{
+	height: 3rem;
+    line-height: 3rem;
+    font-size: 0.75em;
+    padding-left: 1rem;
+    border-bottom: solid 1px #eee;
+}
+.meishi22>ul.meishia-w,.grade-eject>ul.grade-w,.Category-eject>ul.Category-w{
+    background: #fff;
+    position: absolute;
+    z-index: 1; 
+}
+.meishi22>ul.meishia-t,.grade-eject>ul.grade-t,.Category-eject>ul.Category-t{
+    background: #eee;
+    position: absolute;
+    z-index: 2;
+    left: 100%;
+}
+.meishi22>ul.meishia-t>li,.grade-eject>ul.grade-t>li,.Category-eject>ul.Category-t>li{
+    border-bottom: solid 1px #e5e5e5;
+}
+.meishi22>ul.meishia-s,.grade-eject>ul.grade-s,.Category-eject>ul.Category-s{
+    background: #fff;
+    position: absolute;
+    z-index: 3;
+    left: 100%;
+    list-style-type: none;
+}
+.meishi22>ul.meishia-s>li,.grade-eject>ul.grade-s>li,.Category-eject>ul.Category-s>li{
+    border-bottom: solid 1px #eee;
+    margin-left: 1rem;
+    padding: 0;
+}
+.grade-w-roll{
+    position: fixed;
+    content: "";
+    width: 100%;
+    height: 60%;
+    display: block;
+    background:#FFFFFF;
+    top: 40px;
+	z-index: 333;
+}
+.grade-eject_bj{
+	position: fixed;
+	content: "";
+	width: 100%;
+	height: 100%;
+	display: none;
+	background:rgba(0,0,0,0.2);
+	top: 40px;
+	z-index: 331;
+}
+.grade-w li,.grade-t li{
+	position: relative;
+}
+.check_active{
+	background: #EEEEEE;
+}
+.grade-w img,.grade-t img{
+	display: none;
+	position: absolute;
+	width: 20px;
+	height: 20px;
+	right: 52%;
+	top: 10px;
+}
+.all_check img{
+	position: absolute;
+	width: 20px;
+	height: 20px;
+	top: 10px;
+	right: 30px;
+	z-index: 1212;
+}
+.recet_button{
+	width: 100%;
+	background: #FFFFFF;
+	height: 50px;
+	border-top: 1px solid #EEEEEE;
+	position: absolute;
+	bottom: -51px;
+	z-index: 11;
+}
+.btn_class{
+	margin-top: 5px;
+	margin-left: 25%;
+}

双汇APP/workOrder/js/Work-list.js

@@ -81,7 +81,7 @@ window.onload = function() {
 
 			setTimeout(function() {
 				//alert(areaList+"--"+officeList)
-				mui('#pullrefresh').pullRefresh().endPullupToRefresh((page++ >= Math.ceil(total / 10)));
+				mui('#pullrefresh').pullRefresh().endPullupToRefresh((page++ >= Math.ceil(total / 10)));				
 				mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
 					data: {
 						token: token,
@@ -105,8 +105,7 @@ window.onload = function() {
 							total = 0;
 						}
 						var imgnum;
-						$(".Totle").text('(' + total + ')');
-						
+						$(".Totle").text('(' + total + ')');						
 						for(var i = 0; i < data.rows.length; i++) {
 							var a = data.rows[i].F_Content;
 							var c = data.rows[i].F_WorkState;
@@ -199,6 +198,7 @@ window.onload = function() {
 		function Ajax() {
 			areaD();
 			officeD();
+			
 			$(".orderLi").remove();
 			page=1;
 			pageSize=10;
@@ -312,9 +312,11 @@ window.onload = function() {
 	    	if ($('.grade-eject').hasClass('grade-w-roll')) {
 	            $('.grade-eject').removeClass('grade-w-roll');
 				$(this).removeClass('current');
+				setTimeout(function() {$(".grade-eject_bj").hide()},400)
 	        } else {
 	            $('.grade-eject').addClass('grade-w-roll');
 				$(this).addClass('current'); 
+				setTimeout(function() {$(".grade-eject_bj").show()},400)
 	        }
 	    })
 

双汇APP/workOrder/js/Work-listClass.js

@@ -313,7 +313,7 @@ window.onload = function() {
 				}
 			})
 		}
-		$('#mui_list').on('tap', 'a', function() {
+		$('#mui_list').on('tap', '.mui-control-item', function() {
 			index=$(this).index();
 			$("#pullrefresh").find(".mui-scroll_1").hide();
 			$("#pullrefresh").find(".mui-scroll_1").eq(index).show();
@@ -324,9 +324,11 @@ window.onload = function() {
 	    	if ($('.grade-eject').hasClass('grade-w-roll')) {
 	            $('.grade-eject').removeClass('grade-w-roll');
 				$(this).removeClass('current');
+				setTimeout(function() {$(".grade-eject_bj").hide()},400)
 	        } else {
 	            $('.grade-eject').addClass('grade-w-roll');
 				$(this).addClass('current'); 
+				setTimeout(function() {$(".grade-eject_bj").show()},400)
 	        }
 	    })
 		$('.order_list').on('tap', '.order', function() {

双汇APP/workOrder/js/custom_select.js

@@ -2,27 +2,33 @@ var areaList=[];
 var officeList=[];
 var areaId="",officeId="";
 $(document).ready(function(){
-    $(".Regional").click(function(){
-    	event.stopPropagation();
-        if ($('.grade-eject').hasClass('grade-w-roll')) {
-            $('.grade-eject').removeClass('grade-w-roll');
+	$('.Regional').on('tap', function() {				
+		if ($('.grade-eject').hasClass('grade-w-roll')) {			
+		    $('.grade-eject').removeClass('grade-w-roll');
 			$(this).removeClass('current');
-        } else {
-            $('.grade-eject').addClass('grade-w-roll');
-			$(this).addClass('current');
-        }
-        cleanList();
-    });
+			setTimeout(function() {$(".grade-eject_bj").hide()},400)
+			;
+		} else {			
+		   $(".grade-eject").addClass("grade-w-roll");
+		   setTimeout(function() {$(".grade-eject_bj").show()},400)		   
+		}
+		cleanList();
+	})
     $(".resBtn").click(function(){
 		cleanList();
 	})
-	$(document).click(function(event) {
-		var _con = $('.clickArea'); // 设置目标区域
-		if(!_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
-			$('.grade-eject').removeClass('grade-w-roll');
-			$(this).removeClass('current');
-		}
-	});
+	$('.grade-eject_bj').on('tap', function() {
+		$('.grade-eject').removeClass('grade-w-roll');
+		setTimeout(function() {$(".grade-eject_bj").hide()},400)	
+		cleanList(); 
+	})
+	// $(document).click(function(event) {
+	// 	var _con = $('.clickArea'); // 设置目标区域
+	// 	if(!_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
+	// 		$('.grade-eject').removeClass('grade-w-roll');
+	// 		$(this).removeClass('current');
+	// 	}
+	// });
     function cleanList () {
     	areaList=[],officeList=[],areaId="",officeId="";
     	$(this).removeClass("check_active");