Bladeren bron

双汇app修改

miaofuhao 5 jaren geleden
bovenliggende
commit
b47be1422d

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

2
 	var huayi = {};
2
 	var huayi = {};
3
 }
3
 }
4
 huayi.config = {
4
 huayi.config = {
5
-	//callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
5
+	callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
6
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
6
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
7
-	callcenter_url: "http://192.168.8.9:1001/",//生产环境
7
+	//callcenter_url: "http://192.168.8.9:1001/",//生产环境
8
 	socket_ip: "222.143.137.63", //ip
8
 	socket_ip: "222.143.137.63", //ip
9
 	socket_port: "8081", //端口
9
 	socket_port: "8081", //端口
10
 	menuworktime: 30000, //菜单工单数量刷新间隔
10
 	menuworktime: 30000, //菜单工单数量刷新间隔

+ 20 - 2
双汇APP-andriod/js/personal.js

232
 			dataType: 'json', 
232
 			dataType: 'json', 
233
 			success: function(res) {
233
 			success: function(res) {
234
 				if(res.state.toLowerCase() === "success") {
234
 				if(res.state.toLowerCase() === "success") {
235
-					alert(cid);
236
-				}
235
+				}				
237
 			}
236
 			}
238
 		});	
237
 		});	
239
 	},2000)
238
 	},2000)
239
+	setInterval(function () {
240
+		var pinf = plus.push.getClientInfo();
241
+		var cid = pinf.clientid;//客户端标识  
242
+		$.ajax({
243
+			type: "get",
244
+			url: huayi.config.callcenter_url + 'PushMessage/PutAppClientIdAsync',
245
+			async: false,
246
+			data: {
247
+				apptype:1,
248
+				clientid: cid,
249
+				token:localStorage.getItem("token")
250
+			},
251
+			dataType: 'json', 
252
+			success: function(res) {
253
+				if(res.state.toLowerCase() === "success") {					
254
+				}
255
+			}
256
+		});
257
+	},300000)
240
 	 
258
 	 
241
 	
259
 	
242
 })
260
 })

+ 1 - 1
双汇APP-andriod/manifest.json

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

+ 1 - 1
双汇APP-andriod/personal.html

11
 		<link rel="stylesheet" href="css/iconfont.css" /> 
11
 		<link rel="stylesheet" href="css/iconfont.css" /> 
12
 		<link rel="stylesheet" href="css/personal.css" />
12
 		<link rel="stylesheet" href="css/personal.css" />
13
 		<style>
13
 		<style>
14
-			#Report{ 
14
+			#Report{  
15
 				width: 110px;
15
 				width: 110px;
16
 				margin: 0 auto;
16
 				margin: 0 auto;
17
 				overflow: hidden;
17
 				overflow: hidden;

File diff suppressed because it is too large
+ 1504 - 1504
双汇APP-andriod/unpackage/.confirmed_dependencies


+ 2 - 0
双汇APP-andriod/workOrder/js/custom_select.js

7
         if ($('.grade-eject').hasClass('grade-w-roll')) {
7
         if ($('.grade-eject').hasClass('grade-w-roll')) {
8
             $('.grade-eject').removeClass('grade-w-roll');
8
             $('.grade-eject').removeClass('grade-w-roll');
9
 			$(this).removeClass('current');
9
 			$(this).removeClass('current');
10
+			alert("1")
10
         } else {
11
         } else {
12
+			alert("2")
11
             $('.grade-eject').addClass('grade-w-roll');
13
             $('.grade-eject').addClass('grade-w-roll');
12
 			$(this).addClass('current');
14
 			$(this).addClass('current');
13
         }
15
         }

BIN
双汇APP/img/check_true.png


+ 3 - 3
双汇APP/js/huayi.config.js

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

+ 20 - 4
双汇APP/js/personal.js

216
 			console.log(data.message);
216
 			console.log(data.message);
217
 		}
217
 		}
218
 	})
218
 	})
219
-	
220
 	setTimeout(function  clienGet() {
219
 	setTimeout(function  clienGet() {
221
 		var pinf = plus.push.getClientInfo();
220
 		var pinf = plus.push.getClientInfo();
222
 		var cid = pinf.clientid;//客户端标识  
221
 		var cid = pinf.clientid;//客户端标识  
232
 			dataType: 'json', 
231
 			dataType: 'json', 
233
 			success: function(res) {
232
 			success: function(res) {
234
 				if(res.state.toLowerCase() === "success") {
233
 				if(res.state.toLowerCase() === "success") {
235
-					alert(cid)
236
-				}
237
-				
234
+				}				
238
 			}
235
 			}
239
 		});	
236
 		});	
240
 	},2000)
237
 	},2000)
238
+	setInterval(function () {
239
+		var pinf = plus.push.getClientInfo();
240
+		var cid = pinf.clientid;//客户端标识  
241
+		$.ajax({
242
+			type: "get",
243
+			url: huayi.config.callcenter_url + 'PushMessage/PutAppClientIdAsync',
244
+			async: false,
245
+			data: {
246
+				apptype:1,
247
+				clientid: cid,
248
+				token:localStorage.getItem("token")
249
+			},
250
+			dataType: 'json', 
251
+			success: function(res) {
252
+				if(res.state.toLowerCase() === "success") {					
253
+				}
254
+			}
255
+		});
256
+	},300000)
241
 	 
257
 	 
242
 	
258
 	
243
 })
259
 })

+ 9 - 4
双汇APP/manifest.json

3
     "id" : "io.dcloud.H5E9497091", /*应用的标识,创建应用时自动生成,勿手动修改*/
3
     "id" : "io.dcloud.H5E9497091", /*应用的标识,创建应用时自动生成,勿手动修改*/
4
     "name" : "双汇售后服务平台", /*应用名称,程序桌面图标名称*/
4
     "name" : "双汇售后服务平台", /*应用名称,程序桌面图标名称*/
5
     "version" : {
5
     "version" : {
6
-        "name" : "1.2.4", /*应用版本名称*/
6
+        "name" : "1.2.5", /*应用版本名称*/
7
         "code" : "83"
7
         "code" : "83"
8
     },
8
     },
9
     "description" : "", /*应用描述信息*/
9
     "description" : "", /*应用描述信息*/
71
         "Camera" : {},
71
         "Camera" : {},
72
         "Audio" : {},
72
         "Audio" : {},
73
         "Device" : {},
73
         "Device" : {},
74
-        "Contacts" : {}
74
+        "Contacts" : {},
75
+        "Push" : {}
75
     },
76
     },
76
     "plus" : {
77
     "plus" : {
77
         "splashscreen" : {
78
         "splashscreen" : {
93
                     "NSCameraUsageDescription" : "此App会在上传头像图片,处理工单服务中访问您的相机权限",
94
                     "NSCameraUsageDescription" : "此App会在上传头像图片,处理工单服务中访问您的相机权限",
94
                     "NSPhotoLibraryAddUsageDescription" : "此App会在上传头像图片,处理工单服务中访问您的相册权限",
95
                     "NSPhotoLibraryAddUsageDescription" : "此App会在上传头像图片,处理工单服务中访问您的相册权限",
95
                     "NSPhotoLibraryUsageDescription" : "此App会在上传头像图片,处理工单服务中访问您的相册权限"
96
                     "NSPhotoLibraryUsageDescription" : "此App会在上传头像图片,处理工单服务中访问您的相册权限"
96
-                }
97
+                },
98
+                "idfa" : false
97
             },
99
             },
98
             "google" : {
100
             "google" : {
99
                 "packagename" : "", /*Android应用包名,如io.dcloud.HelloH5*/
101
                 "packagename" : "", /*Android应用包名,如io.dcloud.HelloH5*/
198
                 }
200
                 }
199
             },
201
             },
200
             "plugins" : {
202
             "plugins" : {
201
-                "ad" : {}
203
+                "ad" : {},
204
+                "push" : {
205
+                    "unipush" : {}
206
+                }
202
             }
207
             }
203
         },
208
         },
204
         "adid" : "128026090911",
209
         "adid" : "128026090911",

+ 4 - 1
双汇APP/workOrder/Work-list.html

14
 		<link rel="stylesheet" href="css/Work-list.css" />
14
 		<link rel="stylesheet" href="css/Work-list.css" />
15
 		<link rel="stylesheet" href="css/custom_select.css" />
15
 		<link rel="stylesheet" href="css/custom_select.css" />
16
 	</head>
16
 	</head>
17
+	<style>
18
+		
19
+	</style>
17
 	<body>
20
 	<body>
18
 		<!-- End screening -->
21
 		<!-- End screening -->
19
 		<div class="grade-eject">
22
 		<div class="grade-eject">
27
 		    </div>
30
 		    </div>
28
 		    <!--<div class="all_check"><img src="../img/all_check.png"/></div>-->
31
 		    <!--<div class="all_check"><img src="../img/all_check.png"/></div>-->
29
 		</div>
32
 		</div>
30
-		
33
+		<div class="grade-eject_bj"></div>
31
 		<header class="mui-bar mui-bar-nav" style="padding-right: 15px;color: #fff;">
34
 		<header class="mui-bar mui-bar-nav" style="padding-right: 15px;color: #fff;">
32
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
35
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
33
 			<h1 class="mui-center mui-title"><span class="Totle-box" style="color: #FFFFFF;"></span><span class="Totle" style="color: #FFFFFF;"></span></h1>
36
 			<h1 class="mui-center mui-title"><span class="Totle-box" style="color: #FFFFFF;"></span><span class="Totle" style="color: #FFFFFF;"></span></h1>

+ 29 - 9
双汇APP/workOrder/Work-listClass.html

12
 		<link href="../css/mui.poppicker.css" rel="stylesheet" />
12
 		<link href="../css/mui.poppicker.css" rel="stylesheet" />
13
 		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
13
 		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
14
 		<link rel="stylesheet" href="css/Work-list.css" />
14
 		<link rel="stylesheet" href="css/Work-list.css" />
15
+		<link rel="stylesheet" href="css/custom_select.css" />
15
 	</head>
16
 	</head>
16
 	<body>
17
 	<body>
18
+		<div class="grade-eject">
19
+		    <ul class="grade-w clickArea" id="gradew">
20
+		    </ul>
21
+		    <ul class="grade-t clickArea" id="gradet">
22
+		    </ul>
23
+		    <div class="recet_button clickArea">
24
+		    	<button class="btn_class resBtn">重置</button>
25
+		    	<button class="btn_class tureBtn">确定</button>
26
+		    </div>
27
+		    <!--<div class="all_check"><img src="../img/all_check.png"/></div>-->
28
+		</div>
29
+		<div class="grade-eject_bj"></div>
17
 		<header class="mui-bar mui-bar-nav" style="padding-right: 15px;color: #fff;">
30
 		<header class="mui-bar mui-bar-nav" style="padding-right: 15px;color: #fff;">
18
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
31
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
19
 			<h1 class="mui-center mui-title"><span class="Totle-box" style="color: #FFFFFF;"></span><span class="Totle"></span></h1>
32
 			<h1 class="mui-center mui-title"><span class="Totle-box" style="color: #FFFFFF;"></span><span class="Totle"></span></h1>
20
-			<a class=" mui-icon-tiajia mui-pull-right tjyh" style="color: #fff;" id="DW">
21
-				办事处筛选
33
+			<a class=" mui-icon-tiajia mui-pull-right tjyh Regional" style="color: #fff;" id="DW">
34
+				办事处筛选 
22
 			</a>
35
 			</a>
23
 		</header>
36
 		</header>
24
 		<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed" style="margin-top: 43px;">
37
 		<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed" style="margin-top: 43px;">
25
 			<li class="mui-table-view-cell">
38
 			<li class="mui-table-view-cell">
26
 				<div class="mui-input-row mui-search ">
39
 				<div class="mui-input-row mui-search ">
27
 					<input type="search" class="mui-input-clear go_search search Width" placeholder="请输入关键字" style="margin-bottom: 0;">							
40
 					<input type="search" class="mui-input-clear go_search search Width" placeholder="请输入关键字" style="margin-bottom: 0;">							
41
+					
28
 				</div>
42
 				</div>
29
 			</li>
43
 			</li>
44
+			
30
 		</ul>
45
 		</ul>
31
-		<div id="slider" class="mui-slider" style="margin-top:0px; z-index: 333; background: #FFFFFF;">
46
+		
47
+		<div id="slider"  style="margin-top:0px; background: #FFFFFF; z-index:30; position: absolute; top: 99px;">			
32
 			<div id="mui_list" class="mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
48
 			<div id="mui_list" class="mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
33
-				<a class="mui-control-item mui-active" data-index="1">
34
-					处理中<span class="clzTotle"></span>
35
-				</a>
36
-				<a class="mui-control-item" data-index="2">
49
+				<div class="mui-control-item mui-active" data-index="1">
50
+					处理中<span class="clzTotle"></span> 
51
+				</div>
52
+				<div class="mui-control-item" data-index="2">
37
 					已完成<span class="ywcTotle"></span>
53
 					已完成<span class="ywcTotle"></span>
38
-				</a>
54
+				</div>
39
 			</div>
55
 			</div>
40
 		</div>
56
 		</div>
41
 		<div class="mui-content mui-scroll-wrapper" id="pullrefresh" style="margin-top: 100px;">
57
 		<div class="mui-content mui-scroll-wrapper" id="pullrefresh" style="margin-top: 100px;">
52
 		<input hidden="hidden" type="text" id='DWResult' class="ui-alert type_con" data-index="" readonly="readonly" />
68
 		<input hidden="hidden" type="text" id='DWResult' class="ui-alert type_con" data-index="" readonly="readonly" />
53
 			<!--右上角弹出菜单-->
69
 			<!--右上角弹出菜单-->
54
 		</div>
70
 		</div>
71
+		<input id="AreaId" type="hidden" />
72
+		<input id="OfficeId" type="hidden" />
55
 		<script src="../js/mui.min.js"></script>
73
 		<script src="../js/mui.min.js"></script>
56
 		<script src="../js/mui.poppicker.js"></script>
74
 		<script src="../js/mui.poppicker.js"></script>
57
 		<script src="../js/mui.picker.min.js"></script>
75
 		<script src="../js/mui.picker.min.js"></script>
58
 		<script src="../js/zepto.js"></script>
76
 		<script src="../js/zepto.js"></script>
59
-		<script src="../js/jquery-1.8.js"></script>
60
 		<script src="../js/huayi.config.js"></script>
77
 		<script src="../js/huayi.config.js"></script>
78
+		<script src="../js/huayi.http.js"></script>
61
 		<script src="js/Work-listClass.js"></script>
79
 		<script src="js/Work-listClass.js"></script>
80
+		<script src="../js/jquery-1.8.js"></script>
81
+		<script src="js/custom_select.js"></script>
62
 	</body>
82
 	</body>
63
 		
83
 		
64
 </html>
84
 </html>

+ 1 - 0
双汇APP/workOrder/css/Work-list.css

270
 	top: 10px;
270
 	top: 10px;
271
 	height: 20px;
271
 	height: 20px;
272
 	line-height: 20px;
272
 	line-height: 20px;
273
+	z-index: 334;
273
 }
274
 }
274
 .mui-icon-tiajia img{
275
 .mui-icon-tiajia img{
275
 	width: 100%;
276
 	width: 100%;

+ 143 - 0
双汇APP/workOrder/css/custom_select.css

1
+/* screening */
2
+ul li{
3
+	list-style: none;
4
+	padding: 0;
5
+	margin: 0;
6
+}
7
+*{ box-sizing:border-box; padding:0px; margin:0px;}
8
+div.screening{
9
+    width: 100%;
10
+    overflow: hidden;
11
+    background: #fff;
12
+    /*position: fixed;*/
13
+    z-index: 44444;
14
+}
15
+div.screening>ul{
16
+    margin: 0;
17
+    padding: 0;
18
+    list-style-type: none;
19
+    border-bottom: solid 1px #d3d3d3;
20
+    overflow: hidden;
21
+}
22
+div.screening>ul>li{
23
+    float: left;
24
+	 font-size:0.75em;
25
+    width: 25%;
26
+    text-align: center;
27
+    line-height: 3rem;
28
+    border-left: solid 1px #d3d3d3;
29
+    
30
+}
31
+div.screening>ul>li>span{
32
+	background: url("../images/on_1.png") no-repeat right center; background-size:0.75em; padding-right:15px;
33
+	}
34
+div.screening>ul>.current>span{
35
+    background: url("../images/on_2.png") no-repeat  right center;background-size:0.75em; color:#3cb9f3;
36
+}
37
+
38
+/* grade */
39
+.meishi22,.grade-eject,.Category-eject,.Sort-eject{
40
+    position:fixed;
41
+    top: -65%;
42
+    width: 100%;
43
+    height: 63%;
44
+    z-index: 1;
45
+    -webkit-transition-duration: 0.4s;
46
+}
47
+
48
+.meishi22>ul,.grade-eject>ul,.Category-eject>ul,.Sort-eject>ul{
49
+    margin: 0;
50
+    padding: 0;
51
+    overflow: auto;
52
+    height: 100%;
53
+    width: 100%;
54
+    -webkit-transition-duration: 0.4s;
55
+}
56
+.meishi22>ul>li,.grade-eject>ul>li,.Category-eject>ul>li,.Sort-eject>ul>li{
57
+	height: 3rem;
58
+    line-height: 3rem;
59
+    font-size: 0.75em;
60
+    padding-left: 1rem;
61
+    border-bottom: solid 1px #eee;
62
+}
63
+.meishi22>ul.meishia-w,.grade-eject>ul.grade-w,.Category-eject>ul.Category-w{
64
+    background: #fff;
65
+    position: absolute;
66
+    z-index: 1; 
67
+}
68
+.meishi22>ul.meishia-t,.grade-eject>ul.grade-t,.Category-eject>ul.Category-t{
69
+    background: #eee;
70
+    position: absolute;
71
+    z-index: 2;
72
+    left: 100%;
73
+}
74
+.meishi22>ul.meishia-t>li,.grade-eject>ul.grade-t>li,.Category-eject>ul.Category-t>li{
75
+    border-bottom: solid 1px #e5e5e5;
76
+}
77
+.meishi22>ul.meishia-s,.grade-eject>ul.grade-s,.Category-eject>ul.Category-s{
78
+    background: #fff;
79
+    position: absolute;
80
+    z-index: 3;
81
+    left: 100%;
82
+    list-style-type: none;
83
+}
84
+.meishi22>ul.meishia-s>li,.grade-eject>ul.grade-s>li,.Category-eject>ul.Category-s>li{
85
+    border-bottom: solid 1px #eee;
86
+    margin-left: 1rem;
87
+    padding: 0;
88
+}
89
+.grade-w-roll{
90
+    position: fixed;
91
+    content: "";
92
+    width: 100%;
93
+    height: 60%;
94
+    display: block;
95
+    background:#FFFFFF;
96
+    top: 40px;
97
+	z-index: 333;
98
+}
99
+.grade-eject_bj{
100
+	position: fixed;
101
+	content: "";
102
+	width: 100%;
103
+	height: 100%;
104
+	display: none;
105
+	background:rgba(0,0,0,0.2);
106
+	top: 40px;
107
+	z-index: 331;
108
+}
109
+.grade-w li,.grade-t li{
110
+	position: relative;
111
+}
112
+.check_active{
113
+	background: #EEEEEE;
114
+}
115
+.grade-w img,.grade-t img{
116
+	display: none;
117
+	position: absolute;
118
+	width: 20px;
119
+	height: 20px;
120
+	right: 52%;
121
+	top: 10px;
122
+}
123
+.all_check img{
124
+	position: absolute;
125
+	width: 20px;
126
+	height: 20px;
127
+	top: 10px;
128
+	right: 30px;
129
+	z-index: 1212;
130
+}
131
+.recet_button{
132
+	width: 100%;
133
+	background: #FFFFFF;
134
+	height: 50px;
135
+	border-top: 1px solid #EEEEEE;
136
+	position: absolute;
137
+	bottom: -51px;
138
+	z-index: 11;
139
+}
140
+.btn_class{
141
+	margin-top: 5px;
142
+	margin-left: 25%;
143
+}

+ 5 - 3
双汇APP/workOrder/js/Work-list.js

81
 
81
 
82
 			setTimeout(function() {
82
 			setTimeout(function() {
83
 				//alert(areaList+"--"+officeList)
83
 				//alert(areaList+"--"+officeList)
84
-				mui('#pullrefresh').pullRefresh().endPullupToRefresh((page++ >= Math.ceil(total / 10)));
84
+				mui('#pullrefresh').pullRefresh().endPullupToRefresh((page++ >= Math.ceil(total / 10)));				
85
 				mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
85
 				mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
86
 					data: {
86
 					data: {
87
 						token: token,
87
 						token: token,
105
 							total = 0;
105
 							total = 0;
106
 						}
106
 						}
107
 						var imgnum;
107
 						var imgnum;
108
-						$(".Totle").text('(' + total + ')');
109
-						
108
+						$(".Totle").text('(' + total + ')');						
110
 						for(var i = 0; i < data.rows.length; i++) {
109
 						for(var i = 0; i < data.rows.length; i++) {
111
 							var a = data.rows[i].F_Content;
110
 							var a = data.rows[i].F_Content;
112
 							var c = data.rows[i].F_WorkState;
111
 							var c = data.rows[i].F_WorkState;
199
 		function Ajax() {
198
 		function Ajax() {
200
 			areaD();
199
 			areaD();
201
 			officeD();
200
 			officeD();
201
+			
202
 			$(".orderLi").remove();
202
 			$(".orderLi").remove();
203
 			page=1;
203
 			page=1;
204
 			pageSize=10;
204
 			pageSize=10;
312
 	    	if ($('.grade-eject').hasClass('grade-w-roll')) {
312
 	    	if ($('.grade-eject').hasClass('grade-w-roll')) {
313
 	            $('.grade-eject').removeClass('grade-w-roll');
313
 	            $('.grade-eject').removeClass('grade-w-roll');
314
 				$(this).removeClass('current');
314
 				$(this).removeClass('current');
315
+				setTimeout(function() {$(".grade-eject_bj").hide()},400)
315
 	        } else {
316
 	        } else {
316
 	            $('.grade-eject').addClass('grade-w-roll');
317
 	            $('.grade-eject').addClass('grade-w-roll');
317
 				$(this).addClass('current'); 
318
 				$(this).addClass('current'); 
319
+				setTimeout(function() {$(".grade-eject_bj").show()},400)
318
 	        }
320
 	        }
319
 	    })
321
 	    })
320
 
322
 

+ 3 - 1
双汇APP/workOrder/js/Work-listClass.js

313
 				}
313
 				}
314
 			})
314
 			})
315
 		}
315
 		}
316
-		$('#mui_list').on('tap', 'a', function() {
316
+		$('#mui_list').on('tap', '.mui-control-item', function() {
317
 			index=$(this).index();
317
 			index=$(this).index();
318
 			$("#pullrefresh").find(".mui-scroll_1").hide();
318
 			$("#pullrefresh").find(".mui-scroll_1").hide();
319
 			$("#pullrefresh").find(".mui-scroll_1").eq(index).show();
319
 			$("#pullrefresh").find(".mui-scroll_1").eq(index).show();
324
 	    	if ($('.grade-eject').hasClass('grade-w-roll')) {
324
 	    	if ($('.grade-eject').hasClass('grade-w-roll')) {
325
 	            $('.grade-eject').removeClass('grade-w-roll');
325
 	            $('.grade-eject').removeClass('grade-w-roll');
326
 				$(this).removeClass('current');
326
 				$(this).removeClass('current');
327
+				setTimeout(function() {$(".grade-eject_bj").hide()},400)
327
 	        } else {
328
 	        } else {
328
 	            $('.grade-eject').addClass('grade-w-roll');
329
 	            $('.grade-eject').addClass('grade-w-roll');
329
 				$(this).addClass('current'); 
330
 				$(this).addClass('current'); 
331
+				setTimeout(function() {$(".grade-eject_bj").show()},400)
330
 	        }
332
 	        }
331
 	    })
333
 	    })
332
 		$('.order_list').on('tap', '.order', function() {
334
 		$('.order_list').on('tap', '.order', function() {

+ 23 - 17
双汇APP/workOrder/js/custom_select.js

2
 var officeList=[];
2
 var officeList=[];
3
 var areaId="",officeId="";
3
 var areaId="",officeId="";
4
 $(document).ready(function(){
4
 $(document).ready(function(){
5
-    $(".Regional").click(function(){
6
-    	event.stopPropagation();
7
-        if ($('.grade-eject').hasClass('grade-w-roll')) {
8
-            $('.grade-eject').removeClass('grade-w-roll');
5
+	$('.Regional').on('tap', function() {				
6
+		if ($('.grade-eject').hasClass('grade-w-roll')) {			
7
+		    $('.grade-eject').removeClass('grade-w-roll');
9
 			$(this).removeClass('current');
8
 			$(this).removeClass('current');
10
-        } else {
11
-            $('.grade-eject').addClass('grade-w-roll');
12
-			$(this).addClass('current');
13
-        }
14
-        cleanList();
15
-    });
9
+			setTimeout(function() {$(".grade-eject_bj").hide()},400)
10
+			;
11
+		} else {			
12
+		   $(".grade-eject").addClass("grade-w-roll");
13
+		   setTimeout(function() {$(".grade-eject_bj").show()},400)		   
14
+		}
15
+		cleanList();
16
+	})
16
     $(".resBtn").click(function(){
17
     $(".resBtn").click(function(){
17
 		cleanList();
18
 		cleanList();
18
 	})
19
 	})
19
-	$(document).click(function(event) {
20
-		var _con = $('.clickArea'); // 设置目标区域
21
-		if(!_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
22
-			$('.grade-eject').removeClass('grade-w-roll');
23
-			$(this).removeClass('current');
24
-		}
25
-	});
20
+	$('.grade-eject_bj').on('tap', function() {
21
+		$('.grade-eject').removeClass('grade-w-roll');
22
+		setTimeout(function() {$(".grade-eject_bj").hide()},400)	
23
+		cleanList(); 
24
+	})
25
+	// $(document).click(function(event) {
26
+	// 	var _con = $('.clickArea'); // 设置目标区域
27
+	// 	if(!_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
28
+	// 		$('.grade-eject').removeClass('grade-w-roll');
29
+	// 		$(this).removeClass('current');
30
+	// 	}
31
+	// });
26
     function cleanList () {
32
     function cleanList () {
27
     	areaList=[],officeList=[],areaId="",officeId="";
33
     	areaList=[],officeList=[],areaId="",officeId="";
28
     	$(this).removeClass("check_active");
34
     	$(this).removeClass("check_active");