老系统对接

2018-07-12 14:08:55 +08:00
commit 5f41fe5df1
420 changed files with 50883 additions and 0 deletions
--- a/webapp/supplier/MyJsp.jsp
+++ b/webapp/supplier/MyJsp.jsp
@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Layui</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <link rel="stylesheet" href="/SinoGYS/css/layui.css">
+</head>
+<body>
+
+<form class="layui-form layui-form-pane" action="">
+  <div class="layui-form-item">
+    <label class="layui-form-label">长输入框</label>
+    <div class="layui-input-block">
+      <input type="text" name="title" autocomplete="off" placeholder="请输入标题" class="layui-input">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">短输入框</label>
+    <div class="layui-input-inline">
+      <input type="text" name="username" lay-verify="required" placeholder="请输入" autocomplete="off" class="layui-input">
+    </div>
+  </div>
+  
+</form>
+          
+
+</body>
+</html>
--- a/webapp/supplier/acceptOrRefuse.jsp
+++ b/webapp/supplier/acceptOrRefuse.jsp
@ -0,0 +1,44 @@
+<%@page import="com.sino.publicclass.base.Memory"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<html>
+<head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<link rel="stylesheet" href="/SinoGYS/css/currentOrder.css" type="text/css"/>
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+</head>
+
+<% 
+	String orderCode=request.getParameter("orderCode");
+	String rescueCode=request.getParameter("rescueCode");
+	String serviceName=request.getParameter("name");
+	int acceptFlag=Integer.parseInt(request.getParameter("acceptFlag"));
+%>
+
+<body leftmargin="0" rightmargin="0" topmargin="0" bottommargin="0">
+<form action="CurrentOrderAction.do" method=POST name = "frm">
+<input type = "hidden" name = "CMD" value="currentOrderDetail"/>
+<input type="hidden" id="orderCode" name="orderCode" value="<%=orderCode%>">
+<input type="hidden" id="rescueCode" name="rescueCode" value="<%=rescueCode%>">
+<input type="hidden" id="name" name="name" value="<%=serviceName%>">
+</form>
+
+<script type="text/javascript">
+		if(<%=acceptFlag%>==1){
+			$("form").submit();
+		}else if(<%=acceptFlag%>==2){
+			$.alert("您已成功拒绝该订单！", function() {
+			wx.closeWindow();
+        });
+		}
+		
+</script>
+</body>
+</html>
--- a/webapp/supplier/billCheck.jsp
+++ b/webapp/supplier/billCheck.jsp
@ -0,0 +1,253 @@
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE html>
+<html>
+<head>
+<title>供应商对账</title>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.">
+
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+
+</head>
+<style>
+	body, html {height:100%;}
+	.weui_search_bar{margin-top: 50px;}
+	.weui_navbar+.weui_tab_bd {padding-top: 0px;}
+</style>
+
+  <body>
+   <input type="hidden" id="count" name="count" value="">
+    <div class="weui_tab">
+      <div class="weui_navbar">
+        <div class="weui_navbar_item weui_bar_item_on" id="noAccount">待记账</div>
+		<div class="weui_navbar_item" id="waitCheck">待审核</div>
+        <div class="weui_navbar_item" id="checked">已通过</div>
+        <div class="weui_navbar_item" id="non-checked">未通过</div>
+      </div>
+      
+	   <div class="weui_search_bar" id="search_bar">
+	      <div class="weui_search_outer">
+	        <div class="weui_search_inner">
+	          <i class="weui_icon_search"></i>
+	          <input type="search" class="weui_search_input" id="search_input" placeholder="按月或编号搜索（例201701或20171207-0001 ）" required/>
+	          <input type="hidden" id="searchFlag" name="searchFlag" value="">
+	          <a href="javascript:" class="weui_icon_clear" id="search_clear"></a>
+	        </div>
+	        <label for="search_input" class="weui_search_text" id="search_text">
+	          <i class="weui_icon_search"></i>
+	          <span>搜索</span>
+	        </label>
+	      </div>
+	      <a href="javascript:" class="weui_search_cancel" id="search_cancel">取消</a>
+    	</div>
+    	
+	<div class="weui_tab_bd" >
+	      <div class="weui-pull-to-refresh-layer">
+		      <div class='pull-to-refresh-arrow'></div>
+		      <div class='pull-to-refresh-preloader'></div>
+		      <div class="down">下拉刷新</div>
+		      <div class="up">释放刷新</div>
+		      <div class="refresh">正在刷新</div>  
+	      </div>
+	      <div class="order_panel_bd_noAccount order_panel_bd"></div>
+	      <div class="order_panel_bd_waitCheck order_panel_bd"></div>
+	      <div class="order_panel_bd_checked order_panel_bd"></div>
+	      <div class="order_panel_bd_non-checked order_panel_bd"></div>
+      </div>
+    </div>
+    
+    <form action="">
+    	<input type="hidden" id="startRow" name="startRow" value=""> 
+		<input type="hidden" id="paneltype" name="paneltype" value="noAccount">
+		<input type="hidden" id="rescueCode" name="rescueCode" value="${param.rescueCode }">
+    </form>
+  </body>
+  
+  <script type="text/javascript">
+  	// $("#date").calendar();
+  	$(function(){
+  	//	findCount("noAccount");
+  		initValue("noAccount");
+		$("#paneltype").val($(".weui_bar_item_on").attr("id"));
+		initPanel("noAccount",true);
+		$("#searchFlag").val(1);
+		
+  	});
+  	
+  	//上拉刷新js
+	$(".weui_tab_bd").pullToRefresh().on("pull-to-refresh", function() {
+		var flag=$("#searchFlag").val();
+		//alert("标志==="+flag);
+		var selectPanel;
+		if(flag==1)selectPanel="noAccount";
+		if(flag==2)selectPanel="waitCheck";
+		if(flag==5)selectPanel="checked";
+		if(flag==3)selectPanel="non-checked";
+		initValue(selectPanel);
+		initPanel(selectPanel,true);
+        setTimeout(function() {
+			$(".weui_tab_bd").pullToRefreshDone();
+		}, 500);
+      });
+  	
+  	$(document).keydown(function(event){
+		if(event.keyCode==13){
+			searchByCode();
+		}
+	});
+	
+	function searchByCode(){     //模糊查询订单
+		$("#startRow").val(1);
+		var code=$("#search_input").val();
+		var flag=$("#searchFlag").val();
+		var selectPanel;
+		if(flag==1)selectPanel="noAccount";
+		if(flag==2)selectPanel="waitCheck";
+		if(flag==5)selectPanel="checked";
+		if(flag==3)selectPanel="non-checked";
+		$(".order_panel_bd_"+selectPanel).empty();
+  		$(".order_panel_bd_"+selectPanel).show();
+			$.ajax({
+			type : "POST",
+			url : "/SinoGYS/HistoryOrderAction.do?CMD=queryOrder",
+			dataType: "json",
+			data :{"code":code,"rescueCode":$("#rescueCode").val(),"searchFlag":flag,"startRow":$("#startRow").val()},
+			success : function(data) {
+				var count=data.count;
+				if (data.orderList.length == 0) {
+					loading && $.hideLoading();
+					setTimeout(function() {
+						$.toast("没有了", "text");
+					}, 300);
+					return ;
+				}
+				for ( var i in data.orderList) {
+					var orderList=data.orderList;
+					setPanel(orderList[i], selectPanel);
+				}
+				$(".order_panel_bd_" + selectPanel).append('<div class="weui_panel weui_panel_access"><a class="weui_panel_ft" onclick="queryMore()">查看更多(共'+count+'条)</a></div>');
+			},
+		});
+	}
+  	
+  	//重置数据
+  	function initValue(selectPanel){
+  		//alert("==="+selectPanel);
+  		$(".order_panel_bd").empty();
+  		$(".order_panel_bd_"+selectPanel).empty();
+  		$(".order_panel_bd_"+selectPanel).show();
+  		$("#startRow").val(1);
+  		
+  		if(selectPanel=="noAccount")$("#searchFlag").val(1);  
+  		if(selectPanel=="waitCheck")$("#searchFlag").val(2);
+  		if(selectPanel=="checked")$("#searchFlag").val(5);
+  		if(selectPanel=="non-checked")$("#searchFlag").val(3);
+  	}
+  	
+  	
+  	
+  	$(".weui_navbar_item").click(function() {
+		if (!$(this).hasClass("weui_bar_item_on")) {
+			$(".weui_bar_item_on").removeClass("weui_bar_item_on");
+			$(this).addClass("weui_bar_item_on");
+			$("#paneltype").val($(this).attr("id"));
+			$("#search_input").val("");
+			initValue($(this).attr("id"));
+			initPanel($(this).attr("id"),true);
+		//	findCount($(this).attr("id"));
+		}
+	});
+	
+	//初始化
+	function initPanel(selectPanel, loading) {
+		loading && $.showLoading();
+		$.ajax({
+			type : "POST",
+			dataType:"json",
+			url : "/SinoGYS/HistoryOrderAction.do?CMD=findAccountOrder",
+			data : $("form").serialize(),
+			success : function(data) {
+				var count=data.count;				
+				if (data.accountList.length == 0) {
+					loading && $.hideLoading();
+					setTimeout(function() {
+						$.toast("没有了", "text");
+					}, 200);
+					return ;
+				}
+				for ( var i in data.accountList) {
+					var accountList=data.accountList;
+				
+					setPanel(accountList[i], selectPanel);
+				}
+
+					$(".order_panel_bd_" + selectPanel).append('<div class="weui_panel weui_panel_access"><a class="weui_panel_ft" onclick="queryMore()">查看更多(共'+count+'条)</a></div>');
+				
+				 setTimeout(function() {
+					loading && $.hideLoading();
+				}, 300);
+			},
+			error : function(XMLHttpRequest, textStatus, errorThrown) {
+				loading && $.hideLoading();
+				$.toast("加载失败", "forbidden");
+			}
+		});
+	}
+	
+	function setPanel(order, selectPanel) {
+		var checkState;
+		var ss='<div class="weui_media_box weui_media_text"><h4 class="weui_media_title">'
+				+order.ORDER_CODE
+				+'</h4><p class="weui_media_desc">请求地址：'
+				+order.ADDRESS
+				+'</p><div style="width:375px;height:60px;"><div style="float:left;"><p class="weui_media_desc">车牌号：'
+				+order.license
+				+'</p><p class="weui_media_desc">服务内容：'
+				+order.SERVICE_NAME
+				+'</p><p class="weui_media_desc">完成状况：'
+				+(order.dispatchFlag==19?"放弃救援":"救援完成")
+				+'</p><p class="weui_media_desc">结算方式：'
+				+(order.settle_type==1?"月结":order.settle_type==2?"次结":order.settle_type==3?"现金结算":"无")
+				+'</p></div>';
+		if(selectPanel=="noAccount"){
+			checkState=1;   //未记账
+			ss=ss+'<div style="float: right;margin-right: 18%;margin-top: 5%;"><a class="weui_btn weui_btn_primary" style="width:64px;height:42px;" onclick="account('+order.ORDER_ID+','+checkState+','+order.checkId+')">记账</a></div></div></div>';
+			$(".order_panel_bd_" + selectPanel).append(ss);
+		}
+		if(selectPanel=="waitCheck"){
+			checkState=2;   //待审核
+			ss=ss+'<div style="float: right;margin-right: 18%;margin-top: 5%;"><a class="weui_btn weui_btn_primary" style="width:64px;height:42px;" onclick="account('+order.ORDER_ID+','+checkState+','+order.checkId+')">查看</a></div></div></div>';
+			$(".order_panel_bd_" + selectPanel).append(ss);
+		}
+		if(selectPanel=="checked"){
+			checkState=5;
+			ss=ss+'<div style="float: right;margin-right: 18%;margin-top: 5%;"><a class="weui_btn weui_btn_primary" style="width:64px;height:42px;"  onclick="account('+order.ORDER_ID+','+checkState+','+order.checkId+')">查看</a></div></div></div>';
+			$(".order_panel_bd_" + selectPanel).append(ss);
+		}
+		if(selectPanel=="non-checked"){
+			checkState=3;
+			ss=ss+'<div style="float: right;margin-right: 18%;margin-top: 5%;"><a class="weui_btn weui_btn_primary" style="width:64px;height:42px;" onclick="account('+order.ORDER_ID+','+checkState+','+order.checkId+')">记账</a></div></div></div>';
+			$(".order_panel_bd_" + selectPanel).append(ss);
+		}
+				
+	}
+		
+		function queryMore(){
+		 $("#startRow").val(parseInt($("#startRow").val())+1);
+		 $(".weui_panel_access").hide();
+		 initPanel($("#paneltype").val(),true);
+		
+	}
+			
+		function account(orderId,chargeType,checkId){
+			window.location.href="http://www.sinoassistance.com/jsp/clientCustomer/jsp/passAccount.jsp?orderId="+orderId+"&chargeType="+chargeType+"&checkId="+checkId;
+		}	
+  </script>
+</html>
--- a/webapp/supplier/choosePhoto.jsp
+++ b/webapp/supplier/choosePhoto.jsp
@ -0,0 +1,145 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE html >
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">  
+<link rel="stylesheet" type="text/css" href="/SinoGYS/css/weui.css">
+<link rel="stylesheet" type="text/css" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" type="text/css" href="/SinoGYS/css/base.css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script> 
+<script src="/SinoGYS/js/static/jquery.min.js"></script>  
+<script src="/SinoGYS/js/static/jquery-weui.js"></script>  
+<script src="/SinoGYS/js/static/lrz/lrz.bundle.js"></script>   
+<title>中道救援服务商管理中心</title>
+<style type="text/css">
+	.upload_btn {
+		position: relative;
+		margin-left: 8px;
+	    margin-right: auto;
+	    padding-left: 14px;
+	    padding-right: 14px;
+	    width:45%;
+	    font-size: 18px;
+	    text-align: center;
+		text-decoration: none;
+		cursor: pointer;
+		color: white;
+		box-sizing: border-box;
+	    line-height: 2.33333333;
+		border: 1px solid rgba(0, 0, 0, 0.2);
+		border-radius: 4px;
+		overflow: hidden;
+		display: inline-block;
+		*display: inline;
+		*zoom: 1
+	}
+	
+	.upload_btn  input {
+		position: absolute;
+		font-size: 100px;
+		right: 0;
+		top: 0;
+		opacity: 0;
+		filter: alpha(opacity = 0);
+		cursor: pointer
+	}
+	
+	.img_div{
+		/* border: 1px solid red; */
+		max-height: 60%;
+		width: 100%;
+		position: relative;
+		text-align: center;
+	}
+	
+	.img_div img{
+		min-height:200px;
+		max-height: 300px;
+		max-width: 100%;
+	}
+</style>
+</head>
+
+
+<body>
+		<header class="hd" style="padding: 25px 0;font-size: 16px;">
+  				<h1 class="page_title">上传照片</h1>
+		</header>
+		<div >
+			<div class="weui-row">
+		      <div class="weui-col-50 img_div img_div_1" ></div>
+		      <div class="weui-col-50 img_div img_div_2" ></div>
+		    </div>
+			<div class="weui-row">
+		      <div class="weui-col-50 img_div img_div_3" ></div>
+		    </div>
+		
+		</div>
+	
+	
+		
+	<div class="weui_btn_area" style="position: fixed;bottom: 0px;width: 90%;margin: 0 5% 18px 5%;">
+        <a class="upload_btn weui_btn_sino" href="javascript:" >拍照 <input accept="image/*" type="file" id="file"/></a>
+		<a class="upload_btn weui_btn_primary" href="javascript:" id="upload" >上传</a>
+    </div>
+    
+    
+</body>
+ 
+<script type="text/javascript">
+	
+	var data = new Array();
+	var count=0;
+	 $("#file").blur(function(){
+	 	$.hideLoading();
+	}); 
+	$("#file").click(function(){
+	 	$.showLoading();
+	}); 
+	$("#file").change(function(){
+		
+		if(count>=3){
+			$.alert( "对不起！您上传的照片已达到上限,无法继续上传！");
+		}else{
+			
+		 lrz(this.files[0], {
+		        width: 400
+		    }).then(function (rst) {
+			 if(rst.base64.length==0){
+		    	$.alert( "照片未成功选择，请重新拍照");
+		    }else{
+				data.push(rst.base64.split(",")[1]);
+				console.log(data);
+				console.log(".img_div_"+data.length);
+				var img = new Image();
+				img.onload = function () {
+					$(".img_div_"+data.length ).html(img);
+				}; 
+				img.src = rst.base64;  
+				 $.hideLoading();   
+				count=count+1;
+			}
+        });
+	  }
+	});
+	
+	$("#upload").click(function(){
+		if(data.length){
+				parent.$('#image_01').val(data[0]);
+				parent.$('#image_02').val(data[1]);
+				parent.$('#image_03').val(data[2]);
+				var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+				parent.layer.msg("上传成功");
+                parent.layer.close(index);
+		}else{
+			$.toast("没有图片", "forbidden");
+		}
+	});
+</script>
+
+</html>
--- a/webapp/supplier/companyCurrentOrderDetail.jsp
+++ b/webapp/supplier/companyCurrentOrderDetail.jsp
@ -0,0 +1,369 @@
+<%@page import="javax.sound.midi.SysexMessage"%>
+<%@page import="com.sino.rrs.entity.RcRescueVehiclePO"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page import="java.util.*"%>
+<%@ page isELIgnored="false" %>
+<html>
+<head>
+<title>订单任务详情</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="format-detection" content="telephone=yes">
+<meta http-equiv="x-rim-auto-match" content="none">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0"> 
+<link rel="stylesheet" href="/SinoGYS/css/currentOrder.css" type="text/css"/>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/option.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/orderDetail.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script> 
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/transtates.js?d=<%=new Date().getTime() %>"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+    <style type="text/css">
+		#infoCon{
+			 flex: 1;
+			 text-align: right;
+			 font-size:1rem;
+		}
+	</style>
+</head>
+
+<body>
+	<input type="hidden" id="distributeLevel" name="distributeLevel" value="">  <!--分派状态  -->
+	<form method=POST action="/SinoGYS/CurrentOrderDetailAction.do" name="frm">
+		<input TYPE="hidden" name="CMD" value="detail">
+		<input type="hidden" id="orderCode" name="orderCode" value="${detailPO.orderCode}">
+		<input type="hidden" id="serviceName" name="serviceName" value="${param.serviceName}">
+		<input type="hidden" id="address" name="address" value="${detailPO.ADDRESS}">
+		<input type="hidden" id="rescueCode" name="rescueCode" value="${detailPO.rescueCode }">
+		<input type="hidden" id="orderId" name="orderId" value="${detailPO.order_id}">
+		<input type="hidden" id="state" name="state" value="${detailPO.flag}">   <!-- 订单状态 -->
+	</form>	
+		
+	<div class="orderInfoWrapper">
+  		<ul class="orderInfoUl">
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					订单编号
+  				</div>
+  				<div class="infoCon">
+  					${detailPO.orderCode }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					服务类型
+  				</div>
+  				<div class="infoCon">
+  					${param.serviceName }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车牌号
+  				</div>
+  				<div class="infoCon">
+  					${detailPO.license }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车主姓名
+  				</div>
+  				<div class="infoCon">
+  					${detailPO.USER_NAME }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车主电话
+  				</div>
+  				<div class="infoCon">
+  					<a href="tel://">${detailPO.USER_PHONE }</a>
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车辆类型
+  				</div>
+  				<div class="infoCon">
+  					${detailPO.STYLE==null?"无":detailPO.STYLE }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					救援地点
+  				</div>
+  				<input type="text" id="infoCon" value="${detailPO.ADDRESS}">
+  				<div class="addrWrapper" onclick="mapDisplay('${detailPO.lon}','${detailPO.lat}')">
+  					<img src="/SinoGYS/images/newImage/addrIcon.png"/>
+  				</div>
+  			</li>
+  			<c:if test="${detailPO.dest_address!=null}">
+	  			<li class="orderInfoItem">
+	  				<div class="infoTitle">
+	  					目的地点
+	  				</div>
+	  				<input type="text" id="infoCon" value="${detailPO.dest_address}">
+	  				<%-- <div class="infoCon">${detailPO.dest_address}</div> --%>
+	  			</li>
+  			</c:if>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					救援状态
+  				</div>
+  				<div class="infoCon">
+  					<span id="start"></span>
+  				</div>
+  			</li>
+  			
+  			<script type="text/javascript">
+  			//	alert(typeof($("#state").val()));
+				$("#start").text($.transtate($("#state").val()));
+			</script> 
+  		</ul>
+  		
+  		<c:if test="${detailPO.staffName!=null }">
+  			<div style="position:relative;">
+  				<div class="orderInfoDriver distributeDriver clearfix">
+					<div class="infoTitle fl">
+						分派司机
+					</div>
+					<div class="infoCon" id="oldStaffName">
+	  					${detailPO.staffName}
+	  				</div>
+				</div>
+				<div class="border1px"></div>
+  			</div>
+	  		
+			<c:if test="${detailPO.flag!=null && detailPO.flag!=15 && detailPO.flag!=16 && detailPO.flag!=19}">
+				<div class="orderInfoDriver changeDistributeDriver clearfix">
+					<div class="infoTitle fl">
+						改派司机
+					</div>
+					<div class="driverArrow marTop1">
+						<img src="/SinoGYS/images/newImage/arrowBlue.png"/>
+					</div>
+				</div>
+			</c:if>
+		</c:if>
+		<c:if test="${detailPO.staffName==null }">
+			<div class="orderInfoDriver distributeDriver clearfix distributeStaff">
+					<div class="infoTitle fl">
+						分派司机
+					</div>
+					<div class="driverArrow" style="margin-top:0.7rem;">
+						<img src="/SinoGYS/images/newImage/arrowBlue.png"/>
+					</div>
+			</div>
+		</c:if>
+		
+		<div class="orderInfoDriver clearfix choosedStaffName" style="display: none;">
+			<div class="infoTitle fl">
+				司机名称
+			</div>
+			<div class="infoCon" id="choosedStaffName">
+ 				
+ 			</div>
+		</div>
+  	</div>
+  	
+  	<div class="optionDialog" style="display: none;">
+    	<div class="dialog_con dialog">
+    		<p class="dialogTitle">请选择要分派的司机</p>
+    		<ul class="dialogList"></ul>
+    		<div class="buttonWrap clearfix">
+    			<a href="#" class="cancelBtn hideBtn">取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+    			<a href="#" class="confirmBtn hideBtn">确&nbsp;&nbsp;&nbsp;&nbsp;认</a>
+    		</div>
+    	</div>
+    </div>
+</body>
+
+<script type="text/javascript" >
+// 单选
+  	$(document).on("click",".carType_listOption",function(){
+  		$('.carType_listOption').find("div.check-item").removeClass('check-item-bg2').addClass('check-item-bg')
+		$(this).find("div.check-item").removeClass('check-item-bg').addClass('check-item-bg2');
+	});
+	
+  	// 分配师傅  点击事件
+  	$(".distributeDriver").click(function(){
+  		$("#distributeLevel").val(1);
+  		queryVehicles();
+  		/* if(queryVehicles()){
+  			setTimeout('$(".optionDialog").show()',300);
+  		} */
+  	});
+  	
+  	
+  	//改派师傅
+  	$(".changeDistributeDriver").click(function(){
+  		$("#distributeLevel").val(2);
+  		queryVehicles();
+  		/* if(queryVehicles()){
+  			setTimeout('$(".optionDialog").show()',300);
+  		} */
+  	});
+  	
+  	 //查询可派的司机	
+    function queryVehicles(){
+    	$(".dialogList").empty();
+    	var str;
+    	$.getJSON("/SinoGYS/UpdateOrderStateAction.do?CMD=getVehicles",{rescueCode:$("#rescueCode").val()},function(data){
+			if(data.vehicleList!=null&&data.vehicleList.length>0){
+				for(var i in data.vehicleList){
+					if(data.vehicleList[i].dispatch_flag!=""&&data.vehicleList[i].dispatch_flag!=1&&data.vehicleList[i].dispatch_flag!=4){ 
+						str='<label for="mobike"><li class="carType_list">'+data.vehicleList[i].staff_name+'<div class="check-busy">忙</div></li></label>';
+					}else{
+						str='<label for="mobike"><li class="carType_list carType_listOption">'+data.vehicleList[i].staff_name+'<div class="check-item carType check-item-bg">'+
+						'<input id="mobike" type="radio" name="type" acceptFlag="'+data.vehicleList[i].acceptFlag+'" value="'+data.vehicleList[i].id+'"></div></li></label>';
+					}
+					$(".dialogList").append(str);
+				}
+				setTimeout('$(".optionDialog").show()',300);
+			}else{
+				alert("该服务商下没有救援师傅登陆");
+				return false;
+			}
+		});
+    }
+  	
+  	// 取消按钮 点击事件
+  	$(".cancelBtn").click(function(){
+  		$(".optionDialog").hide();
+  	});
+  	
+  	//确认 点击事件
+  	$(".confirmBtn").click(function(){
+  		if($(".check-item-bg2").length==0){
+  			alert("请先选择要指派的救援师傅");
+  		}else{
+  			var level = $("#distributeLevel").val();
+  			if(level==1){
+  				if($(".check-item-bg2").children().attr("acceptFlag")==1){
+					layer.confirm("该司机处于拒接消息状态，您还要继续下发吗？", function(){
+						 distributeDealing();
+					 });
+				}else{   //空闲
+					distributeDealing(); 
+				}
+  			}
+  			if(level==2){
+  				$.confirm("该订单正在处理中，您确定要改派司机吗？", function() {
+	  				if($(".check-item-bg2").children().attr("acceptFlag")==1){
+						layer.confirm("该司机处于拒接消息状态，您还要继续下发吗？", function(){
+							 changeDistributeDealing();
+						 });
+					}else{   //空闲
+						changeDistributeDealing(); 
+					}
+				},function(){
+					//取消操作
+				});
+  			}
+		}
+  	});
+    
+	function distributeDealing(){      //分配时候的处理
+		$.ajax({
+				async : true,
+				url : "/SinoGYS/UpdateOrderStateAction.do?CMD=distributeOrder",
+				dataType : "json",
+				type : "POST",
+				data : {
+					"rescueCode" : $("#rescueCode").val(),
+					"orderCode" : $("#orderCode").val(),
+					"orderId":$("#orderId").val(),
+					"serviceName":$("#serviceName").val(),
+					"address":$("#address").val(),
+					"id" : $(".check-item-bg2").children().val()  //显示司机id
+				},
+				success : function(jsonObject) {
+					if (jsonObject.code == "1") {
+						$(".optionDialog").hide();
+						$(".distributeStaff").hide();
+						$(".choosedStaffName").show();
+						$("#choosedStaffName").text($(".check-item-bg2").parent().text());
+						alert("成功分配订单");
+						wx.closeWindow();
+					} else if(jsonObject.code=="4"){
+							alert("该订单已被撤回,无法继续分配");
+					}else if(jsonObject.code=="5"){
+							alert("该订单已被改派,无法继续分配");
+					}else if(jsonObject.code=="19"){
+							alert("该订单已被取消,无法继续分配");
+					}
+				}
+			});
+	}
+	
+		function changeDistributeDealing(){  //改派时候的处理
+			$.ajax({
+						async : true,
+						url : "/SinoGYS/UpdateOrderStateAction.do?CMD=changeDistributeOrder",
+						dataType : "json",
+						type : "POST",
+						data : {
+							"rescueCode" : $("#rescueCode").val(),
+							"orderCode" : $("#orderCode").val(),
+							"orderId":$("#orderId").val(),
+							"serviceName":$("#serviceName").val(),
+							"address":$("#address").val(),
+							"id" : $(".check-item-bg2").children().val(),  //显示当前司机id
+							"olderVehicleName":$("#oldStaffName").text()   //显示改派前司机
+						},
+						success : function(jsonObject) {
+						//	alert(jsonObject.code);
+							if (jsonObject.code == "1") {
+								alert("成功改派司机订单");
+								wx.closeWindow();
+							} else if(jsonObject.code=="4"){
+									alert("该订单已被撤回,无法继续改派");
+							}else if(jsonObject.code=="5"){
+									alert("该订单已被改派,无法继续改派");
+							}else if(jsonObject.code=="19"){
+									alert("该订单已被取消,无法继续改派");
+							}
+							else if(jsonObject.code=="15"){
+									alert("该订单已完成,无法继续改派");
+							}
+						}
+					});
+		}
+				
+		function mapDisplay(lon,lat){
+			//获取救援车的经纬度
+			layer.open({
+						type : 2, //page层
+						title :'救援地位置',
+						shadeClose: true,
+						shade : 0.6, //遮罩透明度
+						area:['380px', '90%'],
+						moveType : 1, //拖拽风格，0是默认，1是传统拖动
+						content : '/SinoGYS/supplier/mapDisplay.jsp?lon='+lon+"&lat="+lat,
+					});
+		}
+</script>
+</html>
--- a/webapp/supplier/companyFinishedOrder.jsp
+++ b/webapp/supplier/companyFinishedOrder.jsp
@ -0,0 +1,205 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="com.sino.rrs.entity.*"%>
+<%@ page import="java.util.*"%>
+<%@ page isELIgnored="false" %>
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="format-detection" content="telephone=no"/>
+<title>我的历史案件</title>
+ <link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css"> 
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/currentOrder.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<script type="text/javascript" src="/SinoGYS/js/jquery-weui.js"></script>
+
+ <script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+<% 
+	String rescueCode=request.getParameter("rescueCode");
+%>
+<body>
+	<input type="hidden" id="paneltype" name="paneltype" value="">
+	
+	<div class="currentOrderWrapper">
+		<div class="currentOrderTitle">
+			<div class="currentOrderTitleList text-left" id="todayOrder">
+				<span class="currentOrderTitleItem">当日订单</span>
+			</div>
+			<div class="currentOrderTitleList text-center" id="weekOrder">
+				<span class="currentOrderTitleItemNon">本周订单</span>
+			</div>
+			<div class="currentOrderTitleList text-right" id="monthOrder">
+				<span class="currentOrderTitleItemNon">当月订单</span>
+			</div>
+		</div>
+		<div class="historyOrderTab"></div>
+	</div>
+	
+	
+	<!-- <div class="weui_tab">
+        <div class="weui_navbar">
+	        <div class="weui_navbar_item weui_bar_item_on" id="todayOrder">当日订单</div>
+	        <div class="weui_navbar_item" id="weekOrder">本周订单</div>
+	        <div class="weui_navbar_item" id="monthOrder">当月订单</div>
+        </div>
+        <div class="weui_tab_bd" >
+	         <div class="weui-pull-to-refresh-layer">
+		         <div class='pull-to-refresh-arrow'></div>
+		         <div class='pull-to-refresh-preloader'></div>
+		         <div class="down">下拉刷新</div>
+		         <div class="up">释放刷新</div>
+		         <div class="refresh">正在刷新</div>
+		     </div>
+		     <div style="height: auto;width: 100%;" class="orderMain"> </div>
+		</div>
+	</div> -->
+    
+    <form action="">
+    	<input type="hidden" id="startRow" name="startRow" value="">
+    	<input type="hidden" id="rescueCode" name="rescueCode" value="<%=rescueCode%>">
+    	<input type="hidden" id="beginTime" name="beginTime" value="">		
+    </form>
+</body>
+
+<script type="text/javascript">
+	$(function() {
+		$("#paneltype").val("todayOrder");
+		initValue("todayOrder");
+		orderList();
+	});
+	
+	$(".currentOrderTitleList").on('click',function(){
+		$.showLoading();
+		$(".currentOrderTitleList").children("span").removeClass('currentOrderTitleItem').addClass('currentOrderTitleItemNon');
+		$(this).children("span").removeClass('currentOrderTitleItemNon').addClass('currentOrderTitleItem');
+		$("#paneltype").val($(this).attr("id"));
+		initValue($(this).attr("id"));
+		orderList();
+	});
+	
+	 //重置数据
+	function initValue(selectPanel){
+		$("#startRow").val(1);
+		$(".historyOrderTab").empty();
+		if(selectPanel=="todayOrder"){
+			$("#beginTime").val(getFirstTimeOfDay());
+		}
+		if(selectPanel=="weekOrder"){
+			$("#beginTime").val(getFirstDayOfWeek());
+		}
+		if(selectPanel=="monthOrder"){
+			$("#beginTime").val(getFirstDayOfMonth());
+		}
+	}
+	
+	function orderList(){  //查看订单
+		$.showLoading();
+		$.ajax({
+			type : "POST",
+			url : "/SinoGYS/HistoryOrderAction.do?CMD=companyHistoryOrder",
+			dataType: "json",
+			data : $("form").serialize(),
+			success : function(data) {
+				var count=data.count;
+				if (data.historyOrderList.length == 0) {
+					$.hideLoading();
+					setTimeout($.toast("没有了","text"),300);
+					return;
+				}
+					for ( var i in data.historyOrderList) {
+						var orderList=data.historyOrderList;
+						
+						$(".historyOrderTab").append('<div class="currentOrderList"><div class="currentOrderListTitle">'+
+													'<span class="line"></span>'+orderList[i].SERVICE_NAME+'/'+(orderList[i].dispatchFlag==19?"取消救援服务":"完成救援服务")+
+													'<div class="fileBtnWrapper"><a class="fileBtn currentFile" onclick=supply('+orderList[i].ORDER_ID+','+<%=rescueCode%>+','+(orderList[i].flowId==1?"11":"111")+
+													')>现场资料 </a><a class="fileBtn otherFile" onclick=supply('+orderList[i].ORDER_ID+','+<%=rescueCode%>+','+15+')>其他资料 </a>'+
+													'</div></div><div class="currentOrderCon"><div><span>订单编号:</span> <span>'+orderList[i].ORDER_CODE+'</span></div>'+
+													'<div><span>救援地点:</span> <span>'+orderList[i].ADDRESS+'</span></div><div><span>完成时间:</span> <span>'+orderList[i].FINISHTIME.substring(0, 19)+'</span></div>'+
+													'<div><span>救援人员:</span> <span>'+(orderList[i].STAFF_NAME!=null?orderList[i].STAFF_NAME:"无")+'</span></div></div></div>');
+					}
+						
+				$(".historyOrderTab").append('<div class="weui_panel weui_panel_access" style="margin-top:0px;"><a class="weui_panel_ft" href="javascript:void(0);" onclick="queryMore()">查看更多(共'+count+'条)</a></div>');
+				setTimeout(function() {
+					 $.hideLoading();
+				}, 300);
+			},
+		});
+	}
+	
+	function supply(orderId,rescueCode,state){
+		window.location.href="/SinoGYS/supplier/connectionImg.jsp?orderId="+orderId+"&rescueCode="+rescueCode+"&state="+state;
+	}
+	
+	function queryMore(){
+		 $("#startRow").val(parseInt($("#startRow").val())+1);
+		 $(".weui_panel_access").hide();
+		 orderList();
+	}
+	
+	//时间格式化
+	function timeFormate(date){
+		if(!date||typeof(date)=="String"){
+			this.error("参数异常");
+		}
+		var y=date.getFullYear();  //年
+		var m=date.getMonth()+1;  //月
+		m = m < 10 ? "0"+m : m ;
+		var d=date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		return y+"-"+m+"-"+d;
+	}
+	
+	//获取本月第一天
+	function getFirstDayOfMonth(){
+		var date=new Date();
+		date.setDate(1);
+		return this.timeFormate(date)+" 00:00:00";
+	}
+	
+	//获取本星期第一天
+	function getFirstDayOfWeek(){
+		var date=new Date();
+		var weekday=date.getDay()||7;  //获取星期几
+		date.setDate(date.getDate()-weekday+1);
+		return this.timeFormate(date)+" 00:00:00";
+	}
+	
+	//获取当天时间
+	function getFirstTimeOfDay(){
+		var date=new Date();
+		return this.timeFormate(date)+" 00:00:00";
+	}
+	
+	 $(".weui_tab_bd").pullToRefresh().on("pull-to-refresh", function() {
+	 	//alert($("#paneltype").val());
+	 	initValue($("#paneltype").val());
+		orderList();
+        setTimeout(function() {
+          $(".weui_tab_bd").pullToRefreshDone();
+        }, 2000);
+      });
+</script>
+</html>
+
--- a/webapp/supplier/connection.jsp
+++ b/webapp/supplier/connection.jsp
@ -0,0 +1,39 @@
+<%@page import="com.sino.publicclass.base.Memory"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<html>
+<head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<link rel="stylesheet" href="/SinoGYS/css/currentOrder.css" type="text/css"/>
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/transtate.js"></script>
+</head>
+
+<% 
+	String orderId=request.getParameter("orderId");
+	String state=request.getParameter("state");
+	String rescueCode=request.getParameter("rescueCode");
+	String code=request.getParameter("code");
+%>
+
+<body leftmargin="0" rightmargin="0" topmargin="0" bottommargin="0">
+<form action="/SinoGYS/ConnectionAction.do" method=POST name = "frm">
+<input type = "hidden" name = "CMD" value="connection"/>
+<input type="hidden" id="orderId" name="orderId" value="<%=orderId%>">
+<input type="hidden" id="state" name="state" value="<%=state%>">
+<input type="hidden" id="rescueCode" name="rescueCode" value="<%=rescueCode%>">
+<input type="hidden" id="code" name="code" value="<%=code%>">
+</form>
+
+<script type="text/javascript">
+		
+		$("form").submit();
+</script>
+</body>
+</html>
--- a/webapp/supplier/connectionImg.jsp
+++ b/webapp/supplier/connectionImg.jsp
@ -0,0 +1,24 @@
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page isELIgnored="false" %>
+<html>
+<head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+</head>
+
+<body leftmargin="0" rightmargin="0" topmargin="0" bottommargin="0">
+<form action="/SinoGYS/ConnectionAction.do" method=POST name = "frm">
+<input type = "hidden" name = "CMD" value="connectionImg"/>
+<input type="hidden" id="orderId" name="orderId" value="${param.orderId}">
+<input type="hidden" id="rescueCode" name="rescueCode" value="${param.rescueCode}">
+<input type="hidden" id="state" name="state" value="${param.state}">
+</form>
+
+<script type="text/javascript">
+		$("form").submit();
+</script>
+</body>
+</html>
--- a/webapp/supplier/currentOrder.jsp
+++ b/webapp/supplier/currentOrder.jsp
@ -0,0 +1,112 @@
+<%@page import="com.sino.publicclass.base.Memory"%>
+<%@page import="com.sino.rrs.entity.RcRescueVehiclePO"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ page isELIgnored="false" %>
+<html>
+<head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">    
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/currentOrder.css" />
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+
+<body>
+<input type="hidden" id="result" name="result" value="${fn:length(list)}">
+<form action="CurrentOrderAction.do" method=POST name = "frm">
+	<input type = "hidden" name = "CMD" value="findCurrentOrderDetail"/>
+	<input type="hidden" id="orderId" name="orderId" value=""/>
+	<input type="hidden" id="orderCode" name="orderCode" value=""/>
+	<input type="hidden" id="rescueCode" name="rescueCode" value="${param.rescueCode }"/>
+	<input type="hidden" id="serviceName" name="serviceName" value=""/>
+	<input type="hidden" name="acceptFlag" id="acceptFlag" value="1"/>
+</form>
+ 
+<div class="currentOrderWrapper">
+		<div class="currentOrderTitle">
+			<span class="currentOrderTitleItem">当前接收的工单</span>
+		</div>
+		<c:forEach items="${list}" var="currentOrder" varStatus="s">
+			<div class="currentOrderList" onclick="confirm1(${currentOrder.orderId},'${currentOrder.ORDER_CODE }','${currentOrder.SERVICE_NAME}')">
+				<div class="currentOrderListTitle">
+					<span class="line"></span>
+					${currentOrder.SERVICE_NAME} / 
+					<c:choose>
+						<c:when test="${currentOrder.DISPATCH_FLAG==7 }">
+							接受任务,等待发车
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==8 }">
+							救援车发车,正在赶往现场
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==9 || currentOrder.DISPATCH_FLAG==91 }">
+							救援车到达现场
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==10 || currentOrder.DISPATCH_FLAG==11}">
+							开始作业
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==12 || currentOrder.DISPATCH_FLAG==121}">
+							开始拖车,正在拖往目的地
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==13 || currentOrder.DISPATCH_FLAG==131 ||currentOrder.DISPATCH_FLAG==132}">
+							拖车到达目的地
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==14 }">
+							作业完成待结算
+						</c:when>
+						<c:when test="${currentOrder.DISPATCH_FLAG==15 }">
+							完成救援服务
+						</c:when>
+						<c:otherwise>
+							等待分派中
+						</c:otherwise>
+					</c:choose>
+				</div>
+				<div class="currentOrderCon">
+					<div><span>合同名称:</span> <span>${currentOrder.contractName}</span></div>
+					<div><span>订单编号:</span> <span>${currentOrder.ORDER_CODE }</span></div>
+					<div><span>救援地点:</span> <span>${fn:length(currentOrder.ADDRESS)>12?fn:substring(currentOrder.ADDRESS,0,12):currentOrder.ADDRESS}</span></div>
+				</div>
+			</div>
+		</c:forEach>
+	</div>
+</body>
+
+<script type="text/javascript">
+	if($("#result").val()=="0"){
+		$.toast("没有了","text");
+	}
+	
+	function confirm1(orderId,orderCode,serviceName) {
+		$("#orderId").val(orderId);
+		$("#orderCode").val(orderCode);
+		$("#serviceName").val(serviceName);
+		$("form").submit();
+	}
+</script>
+</html>
--- a/webapp/supplier/currentOrderDetail.jsp
+++ b/webapp/supplier/currentOrderDetail.jsp
@ -0,0 +1,356 @@
+<%@page import="com.sun.org.apache.xalan.internal.xsltc.compiler.sym"%>
+<%@page import="com.sino.rrs.entity.RcRescueVehiclePO"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page isELIgnored="false" %>
+<%@ page import="java.util.*"%>
+<html>
+<head>
+<title>订单任务详情</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0"> 
+<meta name="format-detection" content="telephone=yes">
+<meta http-equiv="x-rim-auto-match" content="none">   
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/option.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/orderDetail.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/ajaxHelper.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/json2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/transtates.js?d=<%=new Date().getTime()%>"></script>
+<script type="text/javascript" src="/SinoGYS/js/jweixin-1.0.0.js"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+    <style>
+    	.inputWrapper {
+    		padding-top: 2rem;
+    	}
+    	
+    	#infoCon{
+			 flex: 1;
+			 text-align: right;
+			 font-size:1rem;
+		}
+    </style>
+</head>
+
+<body>
+	<input type="hidden" id="nextState" name="nextState" value="${param.nextState }">
+	<form id="submit" method="post" action="/SinoGYS/UpdateOrderStateAction.do?CMD=vehicleChanged">
+		<input type="hidden" id="state"  name="state" value="${list.STATE}">  <!-- 当前状态 -->
+		<input type="hidden" id="flow_id"  name="flow_id" value="${list.FLOW_ID}">
+		<input type="hidden" id="orderID"  name="orderID" value="${list.ORDER_ID}">
+		<input type="hidden" id="rescueVehicleId"  name="rescueVehicleId" value="${param.rescueVehicleId}">
+		<input type="hidden" id="lon"  name="lon" value="">
+		<input type="hidden" id="lat"  name="lat" value="">
+	</form>
+	
+	<div class="orderInfoWrapper">
+  		<ul class="orderInfoUl">
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					订单编号
+  				</div>
+  				<div class="infoCon">
+  					${list.ORDER_CODE }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					服务类型
+  				</div>
+  				<div class="infoCon">
+  					${list.SERVICE_NAME }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车牌号
+  				</div>
+  				<div class="infoCon">
+  					${list.LICENSE }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车主姓名
+  				</div>
+  				<div class="infoCon">
+  					${list.USER_NAME }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车主电话
+  				</div>
+  				<div class="infoCon">
+  					<a href="tel://${list.USER_PHONE }">${list.USER_PHONE }</a>
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车辆类型
+  				</div>
+  				<div class="infoCon">
+  					${empty list.STYLE?"无":list.STYLE}
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					救援地点
+  				</div>
+  				<input type="text" id="infoCon" value="${list.ADDRESS}">
+  				<div class="addrWrapper" onclick="mapDisplay('${list.LON}','${list.LAT}')">
+  					<img src="/SinoGYS/images/newImage/addrIcon.png"/>
+  				</div>
+  			</li>
+  			<c:if test="${not empty list.DEST_ADDRESS}">
+	  			<li class="orderInfoItem">
+	  				<div class="infoTitle">
+	  					目的地点
+	  				</div>
+	  				<input type="text" id="infoCon" value="${list.DEST_ADDRESS }">
+	  			</li>
+	  		</c:if>
+	  		
+	  		<c:if test="${not empty list.ADDRESS_ADD}">
+	  			<li class="orderInfoItem">
+	  				<div class="infoTitle">
+	  					地址补充
+	  				</div>
+	  				<input type="text" id="infoCon" value="${list.ADDRESS_ADD }">
+	  			</li>
+	  		</c:if>
+  		</ul>
+  		
+  		<c:if test="${list.MILEAGE1=='0' && list.MILEAGE2=='0' && list.STATE!=15}">
+	  		<div class="inputWrapper">
+	  			<input class="loginFormSubmit takePhoto" type="button" value="选择拍照" style="display: none;" onclick="takePhoto()">
+	  			<!--mt7-->
+	  			<input class="loginFormSubmit loginBtnActive mt35" type="button" value="下一步" onclick="confirm1(${list.STATE},${list.FLOW_ID})">
+	  		</div>	
+	  	</c:if>
+  	</div>
+	
+	<div class="optionDialog" style="display: none;">
+    	<div class="dialog_con dialog">
+    		<p class="dialogTitle">请输入救援里程数</p>
+    		<div class="dialogList mb2 mt1">
+    			<div class="carType_listDiv">
+    				<label class="clearfix" for="">AB距离</label>
+    				<input class="carType_listDivInput" type="text" id="mileAge1" placeholder="开始出发到救援地距离" />
+    			</div>
+    			<div class="carType_listDiv">
+    				<label class="clearfix" for="">BC距离</label>
+    				<input class="carType_listDivInput" type="text" id="mileAge2" placeholder="救援地到目的地距离" />
+    			</div>
+    		</div>
+    		<div class="buttonWrap clearfix">
+    			<a href="#" class="cancelBtn hideBtn">取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+    			<a href="#" class="confirmBtn hideBtn">确&nbsp;&nbsp;&nbsp;&nbsp;认</a>
+    		</div>
+    	</div>
+    </div>	
+
+</body>
+
+<script type="text/javascript">
+	 $(document).ready(function() {
+	// alert(typeof($("#nextState").val()));
+	 	$(".loginBtnActive").val($.transtate($("#nextState").val()));
+	 	if(($("#flow_id").val()==2&&$("#state").val()==131)||$("#state").val()==9){
+	 		$(".loginBtnActive").removeClass('mt35').addClass('mt7');
+	 		$(".takePhoto").show();
+	 	}
+		checkWeixinAPI();
+	});
+
+function checkWeixinAPI(){
+	var targetUrl = window.location.href;
+	var action = "/SinoGYS/ApiSignatureAction.do?CMD=signature&url="+targetUrl+"&d="+((new Date()).getTime());
+	ajaxRequest(action,function(_response){
+		var data = _response.responseTEXT;
+		if (data!=null){
+		     var obj = new Function("return" + data)();
+		      wx.config({
+			      debug: false,
+			      appId: obj.appId,
+			      timestamp: obj.timestamp,
+			      nonceStr: obj.nonce,
+			      signature: obj.signature,
+			      jsApiList:[
+                    'getLocation',
+					 'chooseImage',
+			      ],
+		 	 });	  
+		} else {
+			alert("失败");
+		}
+	},false);
+}
+	//选择上传照片
+	function takePhoto(){
+		$.alert("请先拍照，待完成订单后上传",function(){
+			wx.chooseImage({
+					sizeType: ['compressed'],
+					sourceType: ['camera'],
+		      success: function (res) {
+		         var localIds = res.localIds;
+			
+		       }
+		    });
+		});
+	}
+	
+	var state;
+	var flow_id;
+	function confirm1(state_1,flow_id_1){
+		//alert(state_1+"--===="+flow_id_1);
+		state=state_1;
+		flow_id=flow_id_1;
+		$.showLoading();
+		
+		//判断该订单是否在该师傅名下（对应服务商）
+		$.getJSON("/SinoGYS/UpdateOrderStateAction.do?CMD=vehicleChanged1",$("form").serialize(),function(data) {
+								if (data.code == false) {
+										$.alert("该订单已被取消或改派，无法继续处理",function(){
+											wx.closeWindow();
+										});
+									}else{
+										setTimeout('geteLocation()',2000);
+									}
+						});
+	}
+	
+	//获取定位结果
+    function geteLocation() {	
+		//获取司机地理位置
+		wx.getLocation({
+			success: function (res) {
+				 latitude = res.latitude; // 纬度，浮点数，范围为90 ~ -90
+				 longitude = res.longitude; // 经度，浮点数，范围为180 ~ -180。
+				var speed = res.speed; // 速度，以米/每秒计
+				var accuracy = res.accuracy; // 位置精度
+				
+				process(state,flow_id,longitude,latitude);
+			
+			},
+			fail: function(error) {
+            	
+            		$.toast("定位失败","text");
+            	
+            	process(state,flow_id,"0","0");
+        	}
+		});
+    }
+
+	//流程
+	function process(state,flow_id,longitude,latitude){
+		$.hideLoading();
+		$("#lon").val(longitude);
+		$("#lat").val(latitude);
+	//	alert(state+"===="+flow_id);
+		if(state==14){
+			if(flow_id==1){
+				$.prompt("请输入您救援过程的里程数","输入相关里程数",function(text) {
+					var tet=/^[1-9]\d*(\.\d+)?$/;
+					if (text == null|| text == "") {
+						alert("请输入里程数");
+					}else if(!tet.test(text)){
+						alert("格式不对!请重新输入！");
+					} else{
+						//提交里程数
+						$.getJSON("/SinoGYS/UpdateOrderStateAction.do?CMD=uploadOrderMileage",{orderID : $("#orderID").val(),taskOrderId:$("#taskOrderId").val(),milesage1:text,milesage2:0,rescueVehicleId:$("#rescueVehicleId").val(),state:state,flow_id:flow_id,lon:longitude,lat:latitude},function(data) {
+								if (data.code == true) {
+									$.alert("提交成功",function(){
+										wx.closeWindow();
+									});
+								}
+							});
+						 }
+
+						}, function() {
+							$.hideloading();	//取消操作
+						});
+			}else if(flow_id==2){
+				$(".optionDialog").show();
+			}
+		
+		}else{
+			$.confirm("您确定要进行此次操作吗?", function() {
+					$("#submit").submit();				
+       			}, function() {
+         				//取消操作
+       			});
+		}
+	}
+	
+    function mapDisplay(lon,lat){
+		//获取救援车的经纬度
+		layer.open({
+				type : 2, //page层
+				title : '救援地位置',
+			//	shade : 0.6, //遮罩透明度
+				area:['360px','90%'],
+				moveType : 1, //拖拽风格，0是默认，1是传统拖动
+				content : '/SinoGYS/supplier/mapDisplay.jsp?lon='+lon+"&lat="+lat,
+				});
+		}
+		
+	// 取消按钮 点击事件
+  	$(".cancelBtn").click(function(){
+  		$(".optionDialog").hide();
+  	});
+  	
+  	//确认 点击事件
+  	$(".confirmBtn").click(function(){
+  		var tet=/^[1-9]\d*(\.\d+)?$/;
+		if ($("#mileAge1").val() == null|| $("#mileAge1").val() == ""|| $("#mileAge2").val() == null|| $("#mileAge2").val() == "") {
+			alert("请输入里程数");
+		}else if(!tet.test($("#mileAge1").val())&&!tet.test($("#mileAge2").val())){
+			alert("格式不对!请重新输入！");
+		} else {
+			//提交里程数
+			$.getJSON("/SinoGYS/UpdateOrderStateAction.do?CMD=uploadOrderMileage",
+							{	orderID : $("#orderID").val(),
+								taskOrderId:$("#taskOrderId").val(),
+								rescueVehicleId:$("#rescueVehicleId").val(),
+								milesage1 : $("#mileAge1").val(),
+								milesage2 : $("#mileAge2").val(),
+								state:state,  
+								flow_id:flow_id,
+								lon:longitude,
+								lat:latitude,
+							},
+							function(data) {
+								if (data.code == true) {
+								$.alert("提交成功",function(){
+										wx.closeWindow();
+									});
+								}
+							});
+			}
+  	});	
+	
+</script>
+</html>
--- a/webapp/supplier/finishedOrderDetail.jsp
+++ b/webapp/supplier/finishedOrderDetail.jsp
@ -0,0 +1,100 @@
+<%@page import="com.sino.rrs.entity.RcRescueVehiclePO"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<html>
+<head>
+<title>订单任务详情</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">    
+<link rel="stylesheet" type="text/css" href="http://hb.qq.com/chenz/m_join/css/wx.css">
+<link rel="stylesheet" type="text/css" href="http://jiaojing.qq.com/css/mobiscroll.multiple.min1.css">
+<link rel="stylesheet" href="/SinoGYS/css/currentOrder.css" type="text/css"/>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-2.1.4.js"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+</head>
+<script type="text/javascript">
+function confirm(){
+	window.history.go(-1);
+}
+</script>
+<%
+	String orderCode=request.getParameter("orderCode");
+	String serviceName=request.getParameter("serviceName");
+	Map<String,Object> data = (Map<String,Object>) request.getAttribute("detailPO");
+%>
+
+<body leftmargin="0" rightmargin="0" topmargin="0" bottommargin="0" background="#f2f3f5">
+		<div class = "content3" style="margin-top:10px;height: 100%;margin-bottom: 20%;">
+			 <header class='demos-header' style="padding: 20px 0;">
+      			<h1 class="demos-title" style="font-size: 36px;margin-top: -15px;">历史订单详情</h1>
+    		</header>
+    		<div class="weui_cell">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">订单编号:</div>
+				<div class="weui_cell_ft">
+					<p style="margin-left: 20px;"><%=orderCode%></p>
+				</div>
+			</div>
+			<div class="weui_cell">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">服务类型:</div>
+				<div class="weui_cell_ft">
+					<p style="margin-left: 20px;"><%=serviceName%></p>
+				</div>
+			</div>
+			<div class="weui_cell">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">车牌号码:</div>
+				<div class="weui_cell_ft">
+					<p style="margin-left: 20px;"><%=data.get("license")%></p>
+				</div>
+			</div>
+			
+			<div class="weui_cell">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">车主姓名:</div>
+				<div class="weui_cell_ft">
+					<p style="margin-left: 20px;"><%=data.get("USER_NAME")%></p>
+				</div>
+			</div>
+			
+			<div class="weui_cell">
+			   <div class="weui_cell_bd weui_cell_primary" style="flex:none;">车主电话:</div>
+				<div class="weui_cell_ft">
+					<p style="margin-left: 20px;"><%=data.get("USER_PHONE")%></p>
+				</div>
+			</div>
+			<div class="weui_cell">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">救援地点:</div>
+				<div class="weui_cell_ft">
+					<table style="margin-left: 20px;color: #888;"><tr><td><%=data.get("address")%></td></tr></table>
+				</div>
+			</div>
+			<%if(data.get("dest_address")==null||data.get("dest_address").toString().equals("")){ %>
+			<% } else {%>
+				<div class="weui_cell" id="a">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">目的地点:</div>
+				<div class="weui_cell_ft">
+					<table style="margin-left: 20px;color: #888;"><tr><td><%=data.get("dest_address")%></td></tr></table>
+				</div>
+			</div>
+				<%} %>
+			<div class="weui_cell">
+				<div class="weui_cell_bd weui_cell_primary" style="flex:none;">救援状态:</div>
+				<div class="weui_cell_ft">
+				  <%if(Integer.parseInt(data.get("flag").toString())==1){ %>
+	          		<p style="margin-left: 20px;"><%="救援公司放弃救援"%></p>
+	          	  <%}else{ %>
+	          	  	<p style="margin-left: 20px;"><%="完成救援服务"%></p>
+	          	  <%} %>
+				</div>
+			</div>
+		</div>
+		<div class="weui_btn_area" style="position: fixed;bottom: 0px;width: 90%;margin: 0 5% 18px 5%;">
+    		<a href="javascript:;" class="weui_btn weui_btn_primary"  onclick="confirm()">返回</a>
+    	</div>
+		
+</body>
+</html>
--- a/webapp/supplier/mapDisplay.jsp
+++ b/webapp/supplier/mapDisplay.jsp
@ -0,0 +1,65 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
+<title>道路救援</title>
+<link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
+<style type="text/css">
+	#weui_btn_primary{
+		background-color: #6CF;
+		float: right;
+		margin-top: 10%;
+	}
+	.container{
+		margin-top: 15%;
+	}
+    .amap-marker .marker-route {
+        position: absolute;
+        width: 40px;
+        height: 44px;
+        color: #e90000;
+        background: url("/SinoGYS/images/point.png") no-repeat;
+    }
+    .amap-marker .marker-marker-bus-from {
+        background-position: -120px -0px;
+    }
+</style>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3"></script>
+<script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
+</head>
+<%
+	String lon=request.getParameter("lon");
+	String lat=request.getParameter("lat");
+	
+ %>
+ 
+ <script type="text/javascript">
+ 	function goback(){
+ 		window.history.go(-1);
+ 	}
+ </script>
+<body>
+<input>
+<div>
+	<div id="top"><a class="weui_btn weui_btn_mini weui_btn_primary" onclick="goback()">返回</a></div>
+	<div id="container"></div>
+</div>
+<script type="text/javascript">
+    var map = new AMap.Map("container", {
+        resizeEnable: true,
+        center: [<%=lon%>, <%=lat%>],//地图中心点
+        zoom: 13 //地图显示的缩放级别
+    });    
+    var marker = new AMap.Marker({ //添加自定义点标记
+        map: map,
+        position: [<%=lon%>, <%=lat%>], //基点位置
+        offset: new AMap.Pixel(-17, -42), //相对于基点的偏移位置
+        draggable: false,  //是否可拖动
+        content: '<div class="marker-route marker-marker-bus-from"></div>'   //自定义点标记覆盖物内容
+    });
+</script>
+</body>
+</html>						
--- a/webapp/supplier/over.jsp
+++ b/webapp/supplier/over.jsp
@ -0,0 +1,38 @@
+<%@page import="com.sino.publicclass.base.Memory"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<html>
+<head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<link rel="stylesheet" href="/SinoGYS/css/currentOrder.css" type="text/css"/>
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/transtates.js"></script>
+</head>
+
+<% 
+	String orderCode=request.getParameter("orderCode");
+	String rescueCode=request.getParameter("rescueCode");
+	String serviceName=request.getParameter("serviceName");
+	int rescueVehicleId=Integer.parseInt(request.getParameter("rescueVehicleId"));
+%>
+
+<body leftmargin="0" rightmargin="0" topmargin="0" bottommargin="0">
+<form action="CurrentOrderAction.do" method=POST name = "frm">
+<input type = "hidden" name = "CMD" value="vehicleCurrentOrderDetail"/>
+<input type="hidden" id="orderCode" name="orderCode" value="<%=orderCode%>">
+<input type="hidden" id="rescueCode" name="rescueCode" value="<%=rescueCode%>">
+<input type="hidden" id="serviceName" name="serviceName" value="<%=serviceName%>">
+<input type="hidden" id="rescueVehicleId" name="rescueVehicleId" value="<%=rescueVehicleId%>">
+</form>
+
+<script type="text/javascript">
+		$("form").submit();
+</script>
+</body>
+</html>
--- a/webapp/supplier/photo.jsp
+++ b/webapp/supplier/photo.jsp
@ -0,0 +1,139 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page isELIgnored="false" %>
+<%@ page import="com.sino.weixin.oauth.util.*"%>
+<%@ page import="java.util.*"%>
+<!DOCTYPE html >
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">  
+<title>照片上传</title>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/uploadPhoto.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/ajaxHelper.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/json2.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+
+ <script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+
+<body>
+	<form >
+		<input type="hidden" id="orderId" name="orderId" value="${param.orderId}">
+		<input type="hidden" id="state" name="state" value="${param.state}">
+		<input type="hidden" id="image_0" name="image_0" value="">
+		<input type="hidden" id="image_1" name="image_1" value="">
+		<input type="hidden" id="image_2" name="image_2" value="">
+		<input type="hidden" id="image_3" name="image_3" value="">
+	</form>
+	
+	<div class="uploadWrapper">
+		<div class="uploadTitle">
+			照片最多上传4张
+		</div>
+		<div class="photoWrapper clearfix">
+			<div class="photo">
+				
+			</div>
+			<div class="imgWrapper" id="chooseImage">
+					<a href="#"><img src="/SinoGYS/images/newImage/addIcon.png" /></a>
+			</div>
+		</div>
+		
+		
+		<div class="inputWrapper">
+  			<input class="loginFormSubmit loginBtnActive" type="button" value="确       定">
+  		</div>
+	</div>
+</body>
+
+<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"> </script>
+<script>
+$(document).ready(function() {
+	checkWeixinApi();
+});
+
+
+function checkWeixinApi(){
+	var targetUrl = window.location.href;
+	var action = "/SinoGYS/ApiSignatureAction.do?CMD=signature&url="+targetUrl+"&d="+((new Date()).getTime());
+	ajaxRequest(action,function(_response){
+		var data = _response.responseTEXT;
+		if (data!=null){
+		     var obj = new Function("return" + data)();
+		      wx.config({
+			      debug: false,
+			      appId: obj.appId,
+			      timestamp: obj.timestamp,
+			      nonceStr: obj.nonce,
+			      signature: obj.signature,
+			      jsApiList:[
+			        'chooseImage',
+			        'uploadImage',
+			      ]
+		 	 });	  
+		} else {
+			alert("失败");
+		}
+	},false);
+}
+
+var url=new Array();
+function showImage(data,i){
+	var imageUrl=null;
+    imageUrl = "http://file.api.weixin.qq.com/cgi-bin/media/get?access_token=<%=Constants.ACCESS_TOKEN  %>&media_id="+data;
+    console.log(imageUrl);
+    $(".photo").append('<div class="imgWrapper"><img src="'+imageUrl+'"/><input type="hidden" name="img_div" value="'+data+'"></div>');
+ } 
+ 
+  
+$(".loginBtnActive").click(function(){
+	var images=document.getElementsByName("img_div");
+	for(var i=0;i<images.length;i++){
+		$("#image_"+i).val(images[i].value);
+	}
+	
+	$.ajax({
+	        async: true,
+	        url:"/SinoGYS/DownLoadImageAction.do?CMD=upload",
+	        dataType: "json",
+	        type: "POST",
+	        data: $("form").serialize(),
+	        success: function (jsonObject) {
+				if(jsonObject.code==true){
+					$.alert("成功上传照片",function(){
+						window.history.go(-2);
+					});
+				}else{
+					$.alert("照片上传失败，请重新上传",function(){
+						window.history.go(-2);
+					});
+				}
+	        }
+	});
+});
+ 
+</script>
+<script src="/SinoGYS/js/weixin-api-6.1_1.js?d=<%=new Date().getTime() %>"> </script>
+</html>
--- a/webapp/supplier/photo2.jsp
+++ b/webapp/supplier/photo2.jsp
@ -0,0 +1,167 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE html >
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">  
+<link rel="stylesheet" type="text/css" href="/SinoGYS/css/weui.css">
+<link rel="stylesheet" type="text/css" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" type="text/css" href="/SinoGYS/css/base.css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script> 
+<script src="/SinoGYS/js/static/jquery.min.js"></script>  
+<script src="/SinoGYS/js/static/jquery-weui.js"></script>  
+<script src="/SinoGYS/js/static/lrz/lrz.bundle.js"></script> 
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>  
+<title>中道救援服务商管理中心</title>
+<style type="text/css">
+	.upload_btn {
+		position: relative;
+		margin-left: 8px;
+	    margin-right: auto;
+	    padding-left: 14px;
+	    padding-right: 14px;
+	    width:45%;
+	    font-size: 18px;
+	    text-align: center;
+		text-decoration: none;
+		cursor: pointer;
+		color: white;
+		box-sizing: border-box;
+	    line-height: 2.33333333;
+		border: 1px solid rgba(0, 0, 0, 0.2);
+		border-radius: 4px;
+		overflow: hidden;
+		display: inline-block;
+		*display: inline;
+		*zoom: 1
+	}
+	
+	.upload_btn  input {
+		position: absolute;
+		font-size: 100px;
+		right: 0;
+		top: 0;
+		opacity: 0;
+		filter: alpha(opacity = 0);
+		cursor: pointer
+	}
+	
+	.img_div{
+		/* border: 1px solid red; */
+		max-height: 60%;
+		width: 100%;
+		position: relative;
+		text-align: center;
+	}
+	
+	.img_div img{
+		min-height:200px;
+		max-height: 300px;
+		max-width: 100%;
+	}
+</style>
+</head>
+
+<%
+	int state=Integer.parseInt(request.getParameter("state"));
+	int flow_id=Integer.parseInt(request.getParameter("flow_id"));
+	String rescueCode=request.getParameter("rescueCode");
+	int orderID=Integer.parseInt(request.getParameter("orderId"));
+	double lon=Double.parseDouble(request.getParameter("lon"));
+	double lat=Double.parseDouble(request.getParameter("lat"));
+	int rescueVehicleId=Integer.parseInt(request.getParameter("rescueVehicleId")); 
+	System.out.print(lon+"经纬度"+lat);
+
+ %>
+
+<body>
+		<header class="hd" style="padding: 25px 0;font-size: 16px;">
+  				<h1 class="page_title">上传照片</h1>
+		</header>
+		<div >
+			<div class="weui-row">
+		      <div class="weui-col-50 img_div img_div_1" ></div>
+		      <div class="weui-col-50 img_div img_div_2" ></div>
+		    </div>
+			<div class="weui-row">
+		      <div class="weui-col-50 img_div img_div_3" ></div>
+		    </div>
+		
+		</div>
+	
+	
+		
+	<div class="weui_btn_area" style="position: fixed;bottom: 0px;width: 90%;margin: 0 5% 18px 5%;">
+        <a class="upload_btn weui_btn_sino" href="javascript:" >上传 <input accept="image/*" type="file" id="file"/></a>
+		<a class="upload_btn weui_btn_primary" href="javascript:" id="upload" >确定</a>
+    </div>
+    
+    <form action="/SinoGYS/UpdateOrderStateAction.do" method=POST name = "frm">
+		<input type = "hidden" name = "CMD" value="queryCurrentFlow"/>
+		<input type="hidden" id="state" name="state" value="<%=state%>">
+		<input type="hidden" id="flow_id" name="flow_id" value="<%=flow_id%>">
+		<input type="hidden" id="rescueCode" name="rescueCode" value="<%=rescueCode%>">
+		<input type="hidden" id="orderID" name="orderID" value="<%=orderID%>">
+		<input type="hidden" id="lon" name="lon" value="<%=lon%>">
+		<input type="hidden" id="lat" name="lat" value="<%=lat%>">
+		<input type="hidden" id="rescueVehicleId" name="rescueVehicleId" value="<%=rescueVehicleId%>">
+		<input type="hidden" id="image_01" name="image_01" value="">
+		<input type="hidden" id="image_02" name="image_02" value="">
+		<input type="hidden" id="image_03" name="image_03" value="">
+	</form>
+    
+</body>
+ 
+<script type="text/javascript">
+	
+	var data = new Array();
+	var count=0;
+	/* $("#file").blur(function(){
+	 	$.hideLoading();
+	}); 
+	$("#file").click(function(){
+	 	$.showLoading();
+	}); */
+	$("#file").change(function(){
+		if(count>=3){
+			$.alert( "对不起！您上传的照片已达到上限,无法继续上传！");
+			
+		}else{
+			$.showLoading();
+		 lrz(this.files[0], {
+		        width: 800
+		    }).then(function (rst) {
+		    data.push(rst.base64.split(",")[1]);
+		    console.log(data);
+		    console.log(".img_div_"+data.length);
+		    var img = new Image();
+		   
+            img.onload = function () {
+                $(".img_div_"+data.length ).html(img);
+            }; 
+            img.src = rst.base64;  
+            $.hideLoading();  
+            count=count+1;
+        });
+	  }
+	});
+	
+	$("#upload").click(function(){
+		if(data.length){
+			$("#image_01").val(data[0]);
+			$("#image_02").val(data[1]);
+			$("#image_03").val(data[2]);
+		//	var index = window.parent.getlay(); //调用父页面的getlay方法得到layer的index
+		//	alert("此时窗口索引"+index);
+			$("form").submit();
+		}else{
+			$.toast("没有图片", "forbidden");
+		}
+	});
+</script>
+
+</html>
--- a/webapp/supplier/point.jsp
+++ b/webapp/supplier/point.jsp
@ -0,0 +1,39 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page import="java.util.*"%>
+<%@ page isELIgnored="false"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>订单详情</title>
+<meta charset="utf8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.">
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/css/demos.css" type="text/css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/json2.js" type="text/javascript"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+</head>
+
+<%
+	String message=request.getParameter("message");
+ %>
+<script type="text/javascript">
+	$().ready(function(){
+		$.alert("<%=message%>", function() {
+			wx.closeWindow();
+        });
+	});
+</script>
+<body>
+	
+</body>
+</html>
--- a/webapp/supplier/power.jsp
+++ b/webapp/supplier/power.jsp
@ -0,0 +1,33 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page import="java.util.*"%>
+<%@ page isELIgnored="false"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>订单详情</title>
+<meta charset="utf8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.">
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/css/demos.css" type="text/css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+</head>
+
+<script type="text/javascript">
+	$().ready(function(){
+		$.alert("不好意思！您无权限进行此操作！", function() {
+			wx.closeWindow();
+        });
+	});
+</script>
+<body>
+	
+</body>
+</html>
--- a/webapp/supplier/queryKeyCode.jsp
+++ b/webapp/supplier/queryKeyCode.jsp
@ -0,0 +1,115 @@
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<html>
+<head>
+<title>照片上传</title>
+<meta charset="utf-8">
+
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.
+">
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<style>
+	.weui_icon_search:before{line-height:38px;}
+	.weui_icon_clear:before{line-height:38px;}
+	.weui_search_cancel{line-height:38px;}
+</style>
+</head>
+
+<%
+	String rescueCode=request.getParameter("rescueCode");
+	String code=request.getParameter("code");
+	System.out.print("--=====可以走到此时");
+ %>
+
+<script type="text/javascript">
+	$().ready(function(){
+	//	alert(<%=code%>);
+		var inputCode='<%=code%>';
+		if(inputCode.length == 0){
+			return;
+		}else{
+			$("#search_text").hide();
+			$(".weui_search_inner").show();
+			$("#search_cancel").show();
+			$("#search_input").val(inputCode);
+			searchByCode();
+		}
+	});
+
+	function searchByCode(){
+		var code=$("#search_input").val();
+		$.showLoading();
+		$.ajax({
+			type : "POST",
+			url : "/SinoGYS/ConnectionAction.do?CMD=queryOrder",
+			dataType: "json",
+			data :{"code":code,"rescueCode":<%=rescueCode%>},
+			
+			success : function(data) {
+				$("#orderMain").empty();
+				if (data.finishOrderList.length==0) {
+				        $.hideLoading();
+						$.toast("没有该订单","text");
+						return;
+				}
+				$.hideLoading();
+				for ( var i in data.finishOrderList) {
+				var orderList=data.finishOrderList;
+				$(".orderMain").append('<div class="weui_panel " style="margin-top:0px;"><div class="weui_panel_bd"><div class="weui_media_box weui_media_text">'+
+	          								'<div><div style="float:left;width: 75%;"><p style="color: #999;font-size: 15px;line-height: 18px;padding-left: 2%">订单编号:'+orderList[i].taskOrderCode+'</p>'+
+								            '<p style="color: #999;font-size: 15px;line-height: 18px;padding-left: 2%">服务类型:'+orderList[i].SERVICE_NAME+'</p>'+
+								            '<p style="color: #999;font-size: 15px;padding-left: 2%">救援地点:'+orderList[i].ADDRESS.substring(0,10)+'...</p>'+
+							            	'<p style="color: #999;font-size: 15px;padding-left: 2%;line-height: 18px;">完成时间:'+orderList[i].FINISHTIME.substring(0, 19)+'</p>'+
+	        								'</div><div style="text-align: center;width: 25%;float:right;"><img src="/SinoGYS/images/111.png" onclick="photoDisplay('+orderList[i].taskOrderId+','+orderList[i].ORDER_ID+')"></div></div></div></div></div>');
+				}
+			},
+		});
+		
+	}
+
+	$(document).keydown(function(event){ 
+		if(event.keyCode === 13){
+			searchByCode();
+			$('.weui_search_input').blur();
+		}
+
+	}); 
+	
+	function photoDisplay(taskOrderId,orderId){
+		alert(taskOrderId+"--"+orderId);
+		var inputCode=$("#search_input").val();
+		window.location.href="/SinoGYS/supplier/connectionImg.jsp?orderId="+orderId+"&taskOrderId="+taskOrderId+"&rescueCode="+<%=rescueCode%>;
+	}
+</script>
+  
+  <body >
+	<input type="hidden" id="count" name="count" value="qwe">
+    <div class="weui_search_bar" id="search_bar" style="height: 54px;">
+      <div class="weui_search_outer">
+		
+
+        <div class="weui_search_inner">
+          <i class="weui_icon_search"  style="top:1px;line-height:38px;"></i>
+          <input style="font-size:18px;padding:8px 0" type="search" class="weui_search_input" id="search_input" placeholder="订单编号" required/>
+          <a href="javascript:" class="weui_icon_clear" id="search_clear"></a>
+        </div>
+        <label for="search_input" class="weui_search_text" id="search_text">
+          <i class="weui_icon_search"></i>
+          <span style="font-size:20px;">搜索</span>
+        </label>
+      </div>
+      <a style="line-hight:38px;" class="weui_search_cancel" id="search_cancel" onclick="searchByCode()">搜索</a>
+
+
+    </div>
+  	
+  	<div style="height: auto;width: 100%;" class="orderMain" id="orderMain"> </div>
+  </body>
+</html>
--- a/webapp/supplier/realPosition.jsp
+++ b/webapp/supplier/realPosition.jsp
@ -0,0 +1,81 @@
+<%@page import="com.sino.publicclass.base.Memory"%>
+<%@page import="com.sino.rrs.entity.RcRescueVehiclePO"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<html>
+<!-- <head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">    
+<link rel="stylesheet" href="/SinoGYS/css/currentOrder.css" type="text/css"/>
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+</head> -->
+<script type="text/javascript">
+	setInterval("getCurrentPosition()", 500000);
+	function getCurrentPosition(){
+		console.log("控制机=========");
+	<%-- 	<% System.out.print("控制台---------");%> --%>
+	}
+</script>
+
+
+<body leftmargin="0" rightmargin="0" topmargin="0" bottommargin="0">
+</body>
+</html>
+
+<%-- <%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@ page import="java.util.*"%>
+<html>
+<head> 
+<title>位置显示</title> 
+</head>
+<body>
+<script>
+	setInterval("getCurrentPosition()", 50000);
+	function getCurrentPosition(){
+		window.location.reload("/SinoGYS/supplier/realPosition.jsp");
+	}
+
+	if (navigator.geolocation)
+	{
+		navigator.geolocation.getCurrentPosition(showPosition,showError);
+	}
+	else
+	{
+		alert("该浏览器不支持定位。");
+	}
+
+function showPosition(position)
+{
+	/* x.innerHTML="纬度: " + position.coords.latitude + 
+	"<br>经度: " + position.coords.longitude;	 */
+	alert("经纬度"+position.coords.longitude+"/////"+position.coords.latitude);    //
+}
+function showError(error)
+{
+	switch(error.code) 
+	{
+		case error.PERMISSION_DENIED:
+			alert("用户拒绝对获取地理位置的请求。");
+			break;
+		case error.POSITION_UNAVAILABLE:
+			alert("位置信息是不可用的。");
+			break;
+		case error.TIMEOUT:
+			alert("请求用户地理位置超时。");
+			break;
+		case error.UNKNOWN_ERROR:
+			alert("未知错误。");
+			break;
+	}
+}
+</script>
+</body>
+</html> --%>
--- a/webapp/supplier/remote.jsp
+++ b/webapp/supplier/remote.jsp
@ -0,0 +1,20 @@
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    
+    <title>错误</title>
+    
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+
+  </head>
+  
+  <body>
+    	<h2 style="text-align: ceter;margin: 30% 20% 30% 20%;">您当前网络出现异常,请联系相应人员进行案件追踪 </h2>
+  </body>
+</html>
--- a/webapp/supplier/rescueJoinUs.jsp
+++ b/webapp/supplier/rescueJoinUs.jsp
@ -0,0 +1,141 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>信息绑定</title>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+<link rel="stylesheet" href="/SinoGYS/css/sweetalert.css" type="text/css"></link>
+<script type="text/javascript" src="/SinoGYS/js/sweetalert.min.js"></script>
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+
+<style>
+	body{background-color: #fbf9fe;}
+	.page_title{text-align: center;color: #61AE00;margin-top: 5%;}
+</style>
+
+</head>
+
+<body>
+	<div class="hd">
+   		 <h1 class="page_title">加入我们</h1>
+	</div>
+	
+<form >
+	<div class="weui_cells weui_cells_form">
+        <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">公司名称</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input class="weui_input" id="rescueCompanyName" name="rescueCompanyName" type="text" value="" placeholder="请输入公司名称">
+            </div>
+        </div>
+      
+	   <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">公司地址</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input class="weui_input" id="companyAddress" name="companyAddress" type="text" value="" placeholder="请输入公司地址">
+            </div>
+        </div>
+		 <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">联系人</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input class="weui_input" id="userName" name="userName" type="text" value="" placeholder="请输入联系人">
+            </div>
+        </div>
+		 <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">联系方式</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input class="weui_input" id="userPhone" name="userPhone" type="tel" value=""  placeholder="请输入联系电话">
+            </div>
+        </div>
+      </div>
+      
+      
+      <div class="weui_cells weui_cells_form">
+      	<!-- <div>公司车辆情况（数量）</div> -->
+        <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">平板拖车数量</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input style="padding-left: 25%;" class="weui_input" id="tuoche" name="tuoche" type="number" value="0" placeholder="请输入数量">
+            </div>
+        </div>
+      
+	   <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">吊车数量</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input style="padding-left: 25%;" class="weui_input" id="diaoche" name="diaoche" type="number" value="0" placeholder="请输入数量">
+            </div>
+        </div>
+		 <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">抢修车数量</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input style="padding-left: 25%;" class="weui_input" id="qiangxiuche" name="qiangxiuche" type="number" value="0" placeholder="请输入数量">
+            </div>
+        </div>
+		 <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">特殊车辆</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input style="padding-left: 25%;" class="weui_input" id="privateChe" name="privateChe" type="number" value="0"  placeholder="请输入数量">
+            </div>
+        </div>
+
+       <div class="weui_cell">
+            <div class="weui_cell_hd"><label class="weui_label">服务范围</label></div>
+            <div class="weui_cell_bd weui_cell_primary">
+                <input class="weui_input" id="serviceRange" name="serviceRange" type="text" value="" placeholder="请输入您的服务区域">
+            </div>
+        </div>
+      </div>
+        
+</form>
+   	 
+   	 
+	<div class="weui_btn_area" style="background-color: #61AE00;">
+        <a class="weui_btn weui_btn_sino"  id="showTooltips">加入我们</a>
+    </div>
+    
+    
+</body>
+<script type="text/javascript">
+	$("#showTooltips").click(function(){
+		var rescueCompanyName=$("#rescueCompanyName").val();
+		var companyAddress=$("#companyAddress").val();
+		var userName=$("#userName").val();
+		var userPhone=$("#userPhone").val();
+		var tuoche=$("#tuoche").val();
+		var diaoche=$("#diaoche").val();
+		var qiangxiuche=$("#qiangxiuche").val();
+		var privateChe=$("#privateChe").val();
+		var serviceRange=$("#serviceRange").val();
+		if(rescueCompanyName==""||companyAddress==""||userName==""||userPhone==""||tuoche==""
+		||diaoche==""||qiangxiuche==""||privateChe==""||serviceRange==""){
+			alert("请将信息填写完整");
+		}else{
+			 $.ajax({
+				   type: "POST",
+				   dataType:"json",
+				   url: "/SinoGYS/HistoryOrderAction.do?CMD=sendJoinUsMail",
+				   data:$("form").serialize(),
+				   success: function(data){
+					 //  alert(data);
+				  		if(data.flag==true){
+				  			alert("您的信息我们已收到，稍后会有负责人与您联系");
+				  			wx.closeWindow();
+				  		}
+				   },
+				   error:function(XMLHttpRequest, textStatus, errorThrown){
+				   		$.toast("请求出错", "forbidden");
+				   }
+				});
+		}
+	});
+</script>
+</html>
--- a/webapp/supplier/updatePhone.jsp
+++ b/webapp/supplier/updatePhone.jsp
@ -0,0 +1,51 @@
+<%@ page language="java" pageEncoding="utf-8"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE HTML>
+<html>
+  <head>
+ 	<meta charset="utf-8">
+	<title>修改信息</title>
+	<meta name="viewport"content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+	<meta name="format-detection" content="telephone=no">
+	<meta name="format-detection" content="email=no">
+	<link rel="stylesheet" href="/SinoGYS/css/updatePhone.css" type="text/css"></link>
+	<link rel="stylesheet" href="/SinoGYS/css/sweetalert.css" type="text/css"></link>
+	<script type="text/javascript" src="/SinoGYS/js/sweetalert.min.js"></script>
+	<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+	<script type="text/javascript">
+		$().ready(function(){
+			$("#phone").focus();
+			var isMobile=/^(?:13\d|15\d|18\d)\d{5}(\d{3}|\*{3})$/; 
+			$("#btn").click(function(){
+			if($("#phone").val()!=$("#tag").val()){
+				if(!isMobile.test($("#phone").val())){
+					swal("失败", "请输入正确的手机号码，例如:13612348888", "error");
+					return;
+				}else{
+					$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=update",{id : $("#hidden").val(),phone:$("#phone").val()},function(data) {
+							if(data.code==true)	{
+								alert("手机号码修改成功");
+							}					
+					});
+				}
+				/* window.location.href="/SinoGYS/RescueVehicleAction.do?CMD=update&id="+$("#hidden").val()+"&type=phone&value="+$("#phone").val(); */
+			}
+			});
+        });
+	</script>
+  </head>
+  <body>
+ 	<div id="head">
+ 		<div id="p">
+ 			<h3>手机号码</h3><a id="btn">保存</a>
+ 		</div>
+ 	</div> 
+ 	<div id="form">
+ 			<input id="hidden"   type="hidden" value="${param.id}">
+ 			<input id="tag"   type="hidden" value="${param.phone}">
+  			<input id="phone" name="phone"  type="tel" value="${param.phone}">
+  		<hr color="#4AFE14" size="1"/>
+  		<label id="info">请输入您的新手机号码</label>
+  	</div>
+  </body>
+</html>
--- a/webapp/supplier/uploadPhoto.jsp
+++ b/webapp/supplier/uploadPhoto.jsp
@ -0,0 +1,143 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page isELIgnored="false" %>
+<%@ page import="com.sino.weixin.oauth.util.*"%>
+<!DOCTYPE html >
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<title>照片上传</title>  
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/uploadPhoto.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/ajaxHelper.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/json2.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+
+<%
+	String rescueCode=request.getParameter("rescueCode");
+	String code=request.getParameter("code");
+	System.out.print(code+"此时状态");
+ %>
+
+<body>
+	<form >
+		<input type="hidden" id="orderId" name="orderId" value="${param.orderId}">
+		<input type="hidden" id="state" name="state" value="${param.state}">
+		<input type="hidden" id="image_0" name="image_0" value="">
+		<input type="hidden" id="image_1" name="image_1" value="">
+		<input type="hidden" id="image_2" name="image_2" value="">
+		<input type="hidden" id="image_3" name="image_3" value="">
+	</form>
+	
+    <div class="uploadWrapper">
+		<div class="uploadTitle">
+			照片最多上传4张
+		</div>
+		<div class="photoWrapper clearfix">
+			<div class="photo">
+				
+			</div>
+			<div class="imgWrapper" id="chooseImage">
+				<a href="#"><img src="/SinoGYS/images/newImage/addIcon.png" /></a>
+			</div>
+		</div>
+		<div class="inputWrapper">
+  			<input class="loginFormSubmit loginBtnActive" type="button" value="确       定">
+  		</div>
+	</div>
+</body>
+
+<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"> </script>
+<script>
+$(document).ready(function() {
+	checkWeixinApi();
+	
+});
+
+
+function checkWeixinApi(){
+	var targetUrl = window.location.href;
+	var action = "/SinoGYS/ApiSignatureAction.do?CMD=signature&url="+targetUrl+"&d="+((new Date()).getTime());
+	ajaxRequest(action,function(_response){
+		var data = _response.responseTEXT;
+		if (data!=null){
+		     var obj = new Function("return" + data)();
+		      wx.config({
+			      debug: false,
+			      appId: obj.appId,
+			      timestamp: obj.timestamp,
+			      nonceStr: obj.nonce,
+			      signature: obj.signature,
+			      jsApiList:[
+			        'chooseImage',
+			        'uploadImage',
+			      ]
+		 	 });	  
+		} else {
+			alert("失败");
+		}
+	},false);
+}
+
+function showImage(data,i){
+	var imageUrl=null;
+    imageUrl = "http://file.api.weixin.qq.com/cgi-bin/media/get?access_token=<%=Constants.ACCESS_TOKEN  %>&media_id="+data;
+    console.log(imageUrl);
+    $(".photo").append('<div class="imgWrapper"><img src="'+imageUrl+'"/><input type="hidden" name="img_div" value="'+data+'"></div>');
+ } 
+ 
+  
+$(".loginBtnActive").click(function(){
+	$.showLoading("上传中...");
+	var images=document.getElementsByName("img_div");
+	//alert(images.length);
+	for(var i=0;i<images.length;i++){
+		$("#image_"+i).val(images[i].value);
+	}
+	
+	$.ajax({
+	        async: true,
+	        url:"/SinoGYS/DownLoadImageAction.do?CMD=upload",
+	        dataType: "json",
+	        type: "POST",
+	        data: $("form").serialize(),
+	        success: function (jsonObject) {
+				if(jsonObject.code==true){
+					$.hideLoading();
+					alert("成功上传照片");
+					window.location.href="http://www.sino-assist.com:8099/jsp/clientCustomer/jsp/takePhoto.jsp?rescueCode="+<%=rescueCode%>+"&code="+"<%=code%>";
+				//	window.location.href="http://www.sinoassistance.com:8380/jsp/clientCustomer/jsp/takePhoto.jsp?rescueCode="+<%=rescueCode%>+"&code="+"<%=code%>";
+				}
+	        }
+	});
+});
+
+ 
+</script>
+<script src="/SinoGYS/js/weixin-api-6.1_1.js?d=2018030559859"> </script>
+ 
+
+</html>
--- a/webapp/supplier/userManInfo.jsp
+++ b/webapp/supplier/userManInfo.jsp
@ -0,0 +1,96 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<%@ page isELIgnored="false" %>
+<%@page import="com.sino.rrs.entity.RcRescueCompanyPO"%>
+<html>
+<head>
+<meta charset="utf-8">
+<title>个人信息</title>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+<meta name="format-detection" content="telephone=no">
+<meta name="format-detection" content="email=no">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/myInfo.css" />
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/demos.css">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+
+ <script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+
+<%
+	String weixinUserId=request.getParameter("weixinUserId");
+	String openId=request.getParameter("openId");
+	String acceptFlag=request.getParameter("flag");
+ %>
+
+<body>
+	<input type="hidden" id="weixinUserId" name="weixinUserId" value="<%=weixinUserId%>">
+	<div class="infoWrapper">
+  		<ul class="myInfo">
+  			<li>
+  				公司名称
+  				<div class="rightInfo">
+  					<a href="#" class="infoItem">${companyInfo.companyName }</a>
+  				</div>
+  			</li>
+  			<li>
+  				 接受通知
+  				<%if(Integer.parseInt(acceptFlag)==0){ %>
+				        <div class="rightInfo">
+				          <input class="weui_switch" style='margin-top:0.7rem' type="checkbox" onclick="checkbox(this,'<%=openId %>')" checked>
+				        </div>
+				<%}else{ %>
+				        <div class="rightInfo">
+				          <input class="weui_switch" style='margin-top:0.7rem' type="checkbox" onclick="checkbox(this,'<%=openId %>')">
+				        </div>
+				<%} %>
+  			</li>
+  		</ul>
+  		<div class="inputWrapper">
+  			<input class="loginFormSubmit loginBtnActive" type="button" value="退       出">
+  		</div>	
+  	</div>
+</body>
+<script type="text/javascript">
+	function checkbox(o,openId){
+		if(o.checked){
+			//被选中，打开(接受通知，可以收到模板消息)
+			$.getJSON("/SinoGYS/CompanyOrVehicleNoticeAction.do?CMD=updateCompanyNotice",{acceptFlag:0,openId:openId});  //更改状态为0
+		}else{
+			//关闭(不接受模板消息)
+			$.getJSON("/SinoGYS/CompanyOrVehicleNoticeAction.do?CMD=updateCompanyNotice",{acceptFlag:1,openId:openId});  //更改状态为1
+		}
+	}
+	
+	$(".loginBtnActive").on("click",function(){
+		$.confirm("您确定要退出当前用户吗？",function(){
+			$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=modifyIdentity",{weixinUserId:$("#weixinUserId").val()},function(data){
+  				if(data.code==true){    //服务商退出
+  					window.location.href="/SinoGYS/supplier/userRegister.jsp?weixinUserId="+$("#weixinUserId").val();
+  				}
+		 	});  					 
+  			},function(){
+  				//取消操作
+  		 });
+	});
+</script>
+</html>
--- a/webapp/supplier/userRegister.jsp
+++ b/webapp/supplier/userRegister.jsp
@ -0,0 +1,292 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>信息绑定</title>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/login.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/option.css" />
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<script type="text/javascript" src="/SinoGYS/js/sweetalert.min.js"></script>
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+
+ <script type="text/javascript">
+     var ohtml=document.documentElement;
+     function getWidth(){
+         var screenWidth=ohtml.clientWidth;
+         if(screenWidth<320){
+             ohtml.style.fontSize="13.3333px";
+         }else if(screenWidth>1080){
+             ohtml.style.fontSize="45px";
+         }else{
+             ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+         }
+     }
+     getWidth();
+     window.onresize=function(){
+         getWidth();
+     };
+</script>
+</head>
+<%
+String weixinUserId = request.getParameter("weixinUserId");
+System.out.println("=======>>>"+weixinUserId);
+if(weixinUserId==null||weixinUserId.equals("")){
+	weixinUserId = request.getAttribute("weixinUserId").toString();
+}
+
+%>
+<body>
+<form>
+<input type="hidden" name="weixinUserId"  id="weixinUserId" value="<%=weixinUserId%>"/>
+<input type="hidden" id="identity" name="identity" value="">
+<input type="hidden" id="vehicleId" name="vehicleId" value="">
+	<div class="loginWrapperBg"></div>
+    <div class="loginWrapper" style="display: none;">
+        <div class="loginTitle">
+            <img src="/SinoGYS/images/newImage/zdLoginLogo.png" alt="">
+            <p class="bindRole">供应商绑定</p>
+            <div class="checkItem">
+                <img class="checkImg" src="/SinoGYS/images/newImage/check.png" alt="">
+               	 救援司机
+            </div>
+        </div>
+        <div class="loginForm">
+            <div class="loginFormItem">
+                <div class="itemTitle">
+                  	登录名
+                </div>
+                <input class="itemInput" id="loginName" name="loginName" placeholder="请输入登录名">
+
+            </div>
+            <div class="loginFormItem">
+                <div class="itemTitle">
+                    密&nbsp;&nbsp;&nbsp;&nbsp;码
+                </div>
+                <input class="itemInput" id="password" name="password" placeholder="请输入登录密码">
+            </div>
+        </div>
+        <input class="loginFormSubmit loginBtnActive btn_bind_wap1" type="button" value="确       定" />
+    </div>
+    
+    <div class="loginWrapper">
+        <div class="loginTitle">
+            <img src="/SinoGYS/images/newImage/trailer.png" alt="">
+            <p class="bindRole">救援司机绑定</p>
+            <div class="checkItem">
+                <img class="checkImg" src="/SinoGYS/images/newImage/check.png" alt="">
+               	 供应商
+            </div>
+        </div>
+        <div class="loginForm">
+            <div class="loginFormItem">
+                <div class="itemTitle">
+                   	司机姓名
+                </div>
+                <input class="itemInput" id="name" name="name" placeholder="请输入姓名">
+            </div>
+            <div class="loginFormItem">
+                <div class="itemTitle">
+                    	手机号码
+                </div>
+                <input class="itemInput" type='tel' id="phone" name="phone" placeholder="请输入手机号码">
+            </div>
+            <div class="loginFormItem">
+                <div class="itemTitle">
+                    	服务编号
+                </div>
+                <input class="itemInput" id="rescueCode" name="rescueCode" placeholder="请输入服务商编号">
+            </div>
+            <div class="loginFormItem selectCar">
+                <div class="itemTitle">
+                    	选择车辆
+                </div>
+                <span class="vehicleName"></span>
+                <div class="arrowPosition">
+					<img class="arrow" src="/SinoGYS/images/newImage/arrow.png" alt="">
+				</div>
+            </div>
+        </div>
+        <input class="loginFormSubmit loginBtnActive btn_bind_wap2" type="button" value="确       定" />
+    </div>
+    
+    <div class="optionDialog" style="display: none;">
+    	<div class="dialog_con dialog">
+    		<p class="dialogTitle">请选择车辆</p>
+    		<ul class="dialogList"></ul>
+    		<div class="buttonWrap clearfix">
+    			<a href="#" class="cancelBtn hideBtn">取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+    			<a href="#" class="confirmBtn hideBtn">确&nbsp;&nbsp;&nbsp;&nbsp;认</a>
+    		</div>
+    	</div>
+    </div>
+    <script type="text/javascript">
+	$(function(){
+		 $.alert("请选择您的身份！", "提示！");
+	});
+	
+	function chooseVehicle(){
+		$(".dialogList").empty();
+		var rescueCode=$("#rescueCode").val();
+		if(rescueCode==""){
+			alert("请输入服务商编号");
+			return false;
+		}else{
+			$.ajax({
+				        async: true,
+				        url:"/SinoGYS/RescueVehicleAction.do?CMD=checkLoginName",
+				        dataType: "json",
+				        type: "POST",
+				        data: {"rescueCode":$("#rescueCode").val()},
+				        success: function (jsonObject) {
+				        	var flag=jsonObject.code;
+				        	if (flag==true) {
+										$.getJSON(
+												"/SinoGYS/RescueVehicleAction.do?CMD=queryRescueVehicle",
+												{rescueCode : $("#rescueCode").val()},
+												function(data) {
+													var list = data.vehicleList;
+													if(list!=null&&list.length>0){
+														for ( var i in list) {
+															console.log(list[i].ID);
+															$(".dialogList")
+																.append(
+																		'<label for="mobike"><li class="carType_list" name="'+list[i].NAME+'">'+list[i].NAME+
+																		'<div class="check-item carType check-item-bg">'+
+																		'<input id="mobike" type="radio" name="type" value="'+list[i].ID+'">'+
+																		'</div></li></label>');
+													  		}
+													  		setTimeout('$(".optionDialog").show()',300);
+													}else{
+    													alert("该服务商下没有可用车辆");
+													}
+													
+												});
+							} else{
+								swal("不存在该服务商,请确认后重新输入");
+								return false;
+							}
+						},
+						
+					});
+			return true;		
+		}
+	}
+	
+	$().ready(function() {
+		$(".btn_bind_wap1").click(function() {
+			var loginName = $("#loginName").val();
+			var password = $("#password").val();
+			alert(loginName+"==="+password);
+			if (loginName == "" || password == "") {
+				alert("请输入完整信息");
+			} else {
+				$.ajax({
+					async : true,
+					url : "/SinoGYS/RescueVehicleAction.do?CMD=managerRegist",
+					dataType : "json",
+					type : "POST",
+					data : {
+						"loginName" : $("#loginName").val(),
+						"password" : $("#password").val(),
+						"weixinUserId" : $("#weixinUserId").val(),
+						"identity":2
+					},
+					success : function(jsonObject) {
+						//alert(jsonObject.code);
+						if (jsonObject.code == true) {
+							alert("注册成功");
+							wx.closeWindow();
+
+						} else {
+							alert("绑定失败", "信息输入有误", "error");
+							return false;
+						}
+					},
+					error : function(result, status) {
+						return false;
+					}
+				});
+			}
+		});
+	});
+	
+	$().ready(function() {
+		$(".btn_bind_wap2").click(function() {
+			var name = $("#name").val();
+			var phone = $("#phone").val();
+			var rescueCode = $("#rescueCode").val();
+			if (name == "" || password == "" || rescueCode == "") {
+				alert("请输入完整信息");
+			} else {
+				$.ajax({
+					async : true,
+					url : "/SinoGYS/RescueVehicleAction.do?CMD=regist",
+					dataType : "json",
+					type : "POST",
+					data : {
+						"name" : $("#name").val(),
+						"phone" : $("#phone").val(),
+						"rescueCode" : $("#rescueCode").val(),
+						"weixinUserId" : $("#weixinUserId").val(),
+						"vehicleId" : $("#vehicleId").val(),
+						"vehicleName":$(".vehicleName").text(),
+					},
+					success : function(jsonObject) {
+						if (jsonObject.code == true) {
+							alert("注册成功");
+							wx.closeWindow();
+
+						} else {
+							alert("绑定失败", "信息输入有误", "error");
+							return false;
+						}
+					},
+				});
+			}
+		});
+	});
+    	// 单选
+    	$(document).on("click",'.carType_list',function(){
+    		$('.carType_list').find("div.check-item").removeClass('check-item-bg2').addClass('check-item-bg');
+			$(this).find("div.check-item").removeClass('check-item-bg').addClass('check-item-bg2');
+		});
+		
+    	// 选择车辆  点击事件
+    	$(".selectCar").click(function(){
+    		chooseVehicle();
+    			
+    	});
+    	
+    	// 取消点击事件
+    	$(".cancelBtn").click(function(){
+    		$(".optionDialog").hide();
+    	});
+    	
+    	//确认按钮
+		$(".confirmBtn").click(function(){
+			$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=choosedVehicleName",
+				{vehicleID:$(".check-item-bg2").children().val()}, function(data){
+				if(data.code>0){  //被选择过
+					alert("该车辆已被绑定，请重新选择！");	
+				}else{
+					$(".optionDialog").hide();
+					$("#vehicleId").val($(".check-item-bg2").children().val());
+    				$(".vehicleName").text($(".check-item-bg2").parent().attr("name"));
+				}
+			});
+    	});
+		
+		$(".checkItem").on("click",function(){
+			$(this).parents(".loginWrapper").hide().siblings(".loginWrapper").show();
+		});
+    </script>       
+</form>    
+</body>
+</html>
--- a/webapp/supplier/vehicleCurrentOrder.jsp
+++ b/webapp/supplier/vehicleCurrentOrder.jsp
@ -0,0 +1,102 @@
+<%@page import="com.sino.publicclass.base.Memory"%>
+<%@ page contentType="text/html" pageEncoding="utf-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="java.util.*"%>
+<html>
+<head>
+<title>订单管理</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/currentOrder.css" />
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+
+<body>
+	<input type="hidden" id="result" name="result" value="${list }">
+	<div class="currentOrderWrapper">
+		<div class="currentOrderTitle">
+			<span class="currentOrderTitleItem">当前接收的工单</span>
+		</div>
+		<c:if test="${not empty list}">
+			<form action="ReceiveOrderAction.do" method=POST name = "frm">
+				<input type = "hidden" name = "CMD" value="queryVehicleOrder"/>
+				<input type="hidden" id="orderId" name="orderId" value="${list.ORDER_ID}">
+				<input type="hidden" id="rescueVehicleId" name="rescueVehicleId" value="${param.rescueVehicleId}">
+			</form>
+			<div class="currentOrderList" onclick="confirm1()">
+				<div class="currentOrderListTitle">
+					<span class="line"></span>
+					${list.SERVICE_NAME} / 
+					<c:choose>
+						<c:when test="${list.STATE==7 }">
+							接受任务,等待发车
+						</c:when>
+						<c:when test="${list.STATE==8 }">
+							救援车发车,正在赶往现场
+						</c:when>
+						<c:when test="${list.STATE==9 || list.STATE==91 }">
+							救援车到达现场
+						</c:when>
+						<c:when test="${list.STATE==10 || list.STATE==11}">
+							开始作业
+						</c:when>
+						<c:when test="${list.STATE==12 || list.STATE==121}">
+							开始拖车,正在拖往目的地
+						</c:when>
+						<c:when test="${list.STATE==13 || list.STATE==131 ||list.STATE==132}">
+							拖车到达目的地
+						</c:when>
+						<c:when test="${list.STATE==14 }">
+							作业完成待结算
+						</c:when>
+						<c:when test="${list.STATE==15 }">
+							完成救援服务
+						</c:when>
+						<c:otherwise>
+							等待分派中
+						</c:otherwise>
+					</c:choose>
+				</div>
+				<div class="currentOrderCon">
+					<div><span>订单编号:</span> <span>${list.ORDER_CODE }</span></div>
+					<div><span>救援地点:</span> <span>${fn:length(list.ADDRESS)>12?fn:substring(list.ADDRESS,0,12):list.ADDRESS}</span></div>
+				</div>
+			</div>
+		</c:if>
+	</div>
+</body>
+
+<script type="text/javascript">
+	if($("#result").val()==""){
+		$.toast("没有了","text");
+	}
+	
+	function confirm1(){
+		$("form").submit();
+	}
+</script>
+</html>
--- a/webapp/supplier/vehicleFinishedOrder.jsp
+++ b/webapp/supplier/vehicleFinishedOrder.jsp
@ -0,0 +1,192 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.util.*"%>
+<%@ page isELIgnored="false"%>
+<html lang="en">
+<%
+	String weixinUserId = (String)request.getAttribute("weixinUserId");
+	String rescueCode=request.getParameter("rescueCode");
+    String rescueVehicleId = request.getParameter("rescueVehicleId");
+ %>
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<meta name="viewport"
+	content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="format-detection" content="telephone=no" />
+<title>我的历史案件</title>
+
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/currentOrder.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script type="text/javascript" src="/SinoGYS/layer/skin/layer.css"></script>
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<script type="text/javascript" src="/SinoGYS/js/jquery-weui.js"></script>
+<script src="/SinoGYS/js/ajaxHelper.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+</script>
+</head>
+
+<body >
+	<input type="hidden" id="paneltype" name="paneltype" value="">
+	<div class="currentOrderWrapper">
+		<div class="currentOrderTitle">
+			<div class="currentOrderTitleList text-left" id="todayOrder">
+				<span class="currentOrderTitleItem">当日订单</span>
+			</div>
+			<div class="currentOrderTitleList text-center" id="weekOrder">
+				<span class="currentOrderTitleItemNon">本周订单</span>
+			</div>
+			<div class="currentOrderTitleList text-right" id="monthOrder">
+				<span class="currentOrderTitleItemNon">当月订单</span>
+			</div>
+		</div>
+		<div class="historyOrderTab"></div>
+	</div>
+
+	<form action="">
+		<input type="hidden" id="startRow" name="startRow" value=""> 
+		<input type="hidden" id="rescueVehicleId" name="rescueVehicleId" value="<%=rescueVehicleId%>">
+		<input type="hidden" id="beginTime" name="beginTime" value="">
+	</form>
+</body>
+
+<script type="text/javascript">
+	$(function() {
+		$("#paneltype").val("todayOrder");
+		initValue("todayOrder");
+		orderList();
+	});
+	
+	$(".currentOrderTitleList").on('click',function(){
+		$.showLoading();
+		$(".currentOrderTitleList").children("span").removeClass('currentOrderTitleItem').addClass('currentOrderTitleItemNon');
+		$(this).children("span").removeClass('currentOrderTitleItemNon').addClass('currentOrderTitleItem');
+		$("#paneltype").val($(this).attr("id"));
+		initValue($(this).attr("id"));
+		orderList();
+	});
+	 
+	 //重置数据
+	function initValue(selectPanel){
+		$("#startRow").val(1);
+		$(".historyOrderTab").empty();
+		if(selectPanel=="todayOrder"){
+			$("#beginTime").val(getFirstTimeOfDay());
+		}
+		if(selectPanel=="weekOrder"){
+			$("#beginTime").val(getFirstDayOfWeek());
+		}
+		if(selectPanel=="monthOrder"){
+			$("#beginTime").val(getFirstDayOfMonth());
+		}
+	}
+	
+	function orderList(){  //查看订单
+		$.showLoading();
+		$.ajax({
+			type : "POST",
+			url : "/SinoGYS/HistoryOrderAction.do?CMD=vehicleHistoryOrder",
+			dataType: "json",
+			data : $("form").serialize(),
+			
+			success : function(data) {
+				$.hideLoading();
+				var count=data.count;
+				if (data.historyOrderList.length == 0) {
+					$.hideLoading();
+					setTimeout($.toast("没有了","text"),300);
+					return;
+				}
+					for ( var i in data.historyOrderList) {
+					var orderList=data.historyOrderList;
+					
+					$(".historyOrderTab").append('<div class="currentOrderList"><div class="currentOrderListTitle">'+
+													'<span class="line"></span>'+orderList[i].SERVICE_NAME+'/'+(orderList[i].dispatchFlag==19?"取消救援服务":"完成救援服务")+
+													'<div class="fileBtnWrapper"><a class="fileBtn currentFile" onclick=supply('+orderList[i].ORDER_ID+','+<%=rescueCode%>+','+(orderList[i].flowId==1?"11":"111")+
+													')>现场资料 </a><a class="fileBtn otherFile" onclick=supply('+orderList[i].ORDER_ID+','+<%=rescueCode%>+','+15+')>其他资料 </a>'+
+													'</div></div><div class="currentOrderCon"><div><span>订单编号:</span> <span>'+orderList[i].ORDER_CODE+'</span></div>'+
+													'<div><span>救援地点:</span> <span>'+orderList[i].ADDRESS+'</span></div><div><span>完成时间:</span> <span>'+orderList[i].FINISHTIME.substring(0, 19)+'</span></div>'+
+													'</div></div>');
+					}
+						
+				$(".orderMain").append('<div class="weui_panel weui_panel_access" style="margin-top:0px;"><a class="weui_panel_ft" href="javascript:void(0);" onclick="queryMore()">查看更多(共'+count+'条)</a></div>');
+			},
+		});
+	}
+	
+	function supply(orderId,rescueCode,state){
+		window.location.href="/SinoGYS/supplier/connectionImg.jsp?orderId="+orderId+"&rescueCode="+rescueCode+"&state="+state;
+	}
+	
+	function queryMore(){
+		 $("#startRow").val(parseInt($("#startRow").val())+1);
+		 $(".weui_panel_access").hide();
+		 orderList();
+	}
+	
+	//时间格式化
+	function timeFormate(date){
+		if(!date||typeof(date)=="String"){
+			this.error("参数异常");
+		}
+		var y=date.getFullYear();  //年
+		var m=date.getMonth()+1;  //月
+		m = m < 10 ? "0"+m : m ;
+		var d=date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		return y+"-"+m+"-"+d;
+	}
+	
+	//获取本月第一天
+	function getFirstDayOfMonth(){
+		var date=new Date();
+		date.setDate(1);
+		return this.timeFormate(date)+" 00:00:00";
+	}
+	
+	//获取本星期第一天
+	function getFirstDayOfWeek(){
+		var date=new Date();
+		var weekday=date.getDay()||7;  //获取星期几
+		date.setDate(date.getDate()-weekday+1);
+		return this.timeFormate(date)+" 00:00:00";
+	}
+	
+	//获取当天时间
+	function getFirstTimeOfDay(){
+		var date=new Date();
+		return this.timeFormate(date)+" 00:00:00";
+	}
+	
+	 $(".weui_tab_bd").pullToRefresh().on("pull-to-refresh", function() {
+	 	alert($("#paneltype").val());
+	 	initValue($("#paneltype").val());
+		orderList();
+        setTimeout(function() {
+          $(".weui_tab_bd").pullToRefreshDone();
+        }, 2000);
+      });
+      
+</script>
+</html>
+
+
--- a/webapp/supplier/vehicleManInfo.jsp
+++ b/webapp/supplier/vehicleManInfo.jsp
@ -0,0 +1,202 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<%@ page isELIgnored="false" %>
+<%@page import="com.sino.rrs.entity.RcRescueVehiclePO"%>
+<html>
+<head>
+<meta charset="utf-8">
+<title>个人信息</title>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+<meta name="format-detection" content="telephone=no">
+<meta name="format-detection" content="email=no">
+<link rel="stylesheet" href="/SinoGYS/css/salesManInfo.css" type="text/css"></link>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/option.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/myInfo.css" />
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+
+ <script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+</head>
+
+<%
+	String weixinUserId=request.getParameter("weixinUserId");
+	String openId=request.getParameter("openId");
+	String acceptFlag=request.getParameter("flag"); %>
+
+<body>
+	<input type="hidden" id="rescueCode" name="rescueCode" value="${vehicleInfo.comapny_login_name}">
+	<input type="hidden" id="id" name="id" value="${vehicleInfo.id}">
+	<div class="infoWrapper">
+  		<ul class="myInfo">
+  			<li>
+  				司机姓名
+  				<div class="rightInfo">
+  					<a href="#" class="infoItem">${vehicleInfo.staff_name }</a>
+  				</div>
+  			</li>
+  			<li>
+  				手机号码
+  				<div class="rightInfo">
+	  				<a href="/SinoGYS/supplier/updatePhone.jsp?phone=${vehicleInfo.staff_phone }&id=${vehicleInfo.id }" class="infoItem">${vehicleInfo.staff_phone }</a>
+	  				<a class="arrowPosition">
+						<img class="arrow" src="/SinoGYS/images/newImage/arrow.png" alt="">
+					</a>
+  				</div>
+  				
+  			</li>
+  			<li class="selectCar">
+  				车辆名称
+  				<div class="rightInfo">
+	  				<a href="#" class="infoItem vehicle_name">${vehicleInfo.vehicle_name }</a>
+	  				<a class="arrowPosition">
+						<img class="arrow" src="/SinoGYS/images/newImage/arrow.png" alt="">
+					</a>
+  				</div>
+  				
+  			</li>
+  			<li>
+  				接受通知
+  				<%if(Integer.parseInt(acceptFlag)==0){ %>
+				        <div class="rightInfo">
+				          <input class="weui_switch" style='margin-top:0.7rem' type="checkbox" onclick="checkbox(this,'${vehicleInfo.staff_name}')" checked>
+				        </div>
+				<%}else{ %>
+				        <div class="rightInfo">
+				          <input class="weui_switch" style='margin-top:0.7rem' type="checkbox" onclick="checkbox(this,'${vehicleInfo.staff_name}')">
+				        </div>
+				<%} %>
+  			</li>
+  		</ul>
+  		
+  		<div class="inputWrapper" onclick="modifyIdentity('<%=weixinUserId%>')">
+  			<input class="loginFormSubmit loginBtnActive" type="button" value="退       出">
+  		</div>	
+  	</div>
+  	
+  	<div class="optionDialog" style="display: none;">
+    	<div class="dialog_con dialog">
+    		<p class="dialogTitle">请选择车辆</p>
+    		<ul class="dialogList">
+    			<!-- <label for="mobike">
+	    			<li class="carType_list">
+	    				车辆1 
+		            	<div class="check-item carType check-item-bg">
+		        			<input id="mobike" type="radio" name="type" value="车辆1">
+		        		</div>
+	    			</li>
+    			</label> -->
+    		</ul>
+    		<div class="buttonWrap clearfix">
+    			<a href="#" class="cancelBtn hideBtn">取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+    			<a href="#" class="confirmBtn hideBtn">确&nbsp;&nbsp;&nbsp;&nbsp;认</a>
+    		</div>
+    	</div>
+    </div>
+    
+</body>
+
+<script type="text/javascript">
+	function checkbox(o,staffName){
+			if(o.checked){
+				//被选中，打开(接受通知，可以收到模板消息)
+				$.getJSON("/SinoGYS/CompanyOrVehicleNoticeAction.do?CMD=updateVehicleNotice",{acceptFlag:0,staffName:staffName});  //更改状态为0
+			}else{
+				//关闭(不接受模板消息)
+				$.getJSON("/SinoGYS/CompanyOrVehicleNoticeAction.do?CMD=updateVehicleNotice",{acceptFlag:1,staffName:staffName});  //更改状态为1
+			}
+		}
+		
+		function modifyIdentity(weixinUserId){
+		$.confirm("您确定要退出当前用户吗？",function(){
+			$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=modifyIdentity",{weixinUserId:weixinUserId},function(data){
+  				if(data.code==false){    //司机退出
+  					window.location.href="/SinoGYS/supplier/userRegister.jsp?weixinUserId="+weixinUserId;
+  				}
+  												
+		 	});  					 
+  			},function(){
+  				//取消操作
+  		 });
+	}
+
+		function chooseVehicle(){
+			$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=queryRescueVehicle",
+						{rescueCode : $("#rescueCode").val()},
+						function(datas) {
+							var list = datas.vehicleList;
+							if(list!=null&&list.length>0){
+								for ( var i in list) {
+								console.log(list[i].ID);
+								$(".dialogList").append(
+									'<label for="mobike"><li class="carType_list" vehicle_name="'+list[i].NAME+'">'+list[i].NAME+
+									'<div class="check-item carType check-item-bg"><input id="mobike" type="radio" name="type" value="'+list[i].ID+'">'+
+									'</div></li></label>');
+								}
+							}else{
+								alert("该服务商没添加车辆");
+								return;
+							}
+						});
+						return true;
+		}
+				
+		// 单选
+    	$(document).on("click",".carType_list",function(){
+    		$('.carType_list').find("div.check-item").removeClass('check-item-bg2').addClass('check-item-bg');
+			$(this).find("div.check-item").removeClass('check-item-bg').addClass('check-item-bg2');
+		});
+		
+    	// 选择车辆  点击事件
+    	$(".selectCar").click(function(){
+    		if(chooseVehicle()){
+    			setTimeout('$(".optionDialog").show()',300);
+    		}else{
+    			alert("该服务商没添加车辆");
+    		}
+    	});
+    	
+    	// 取消点击事件
+    	$(".cancelBtn").click(function(){
+    		$(".optionDialog").hide();
+    	});
+    	
+    	//确认按钮
+		$(".confirmBtn").click(function(){
+			//判断选择的车辆是否被绑定
+			$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=choosedVehicleName",
+			{vehicleID:$(".check-item-bg2").children().val()}, function(data){
+				if(data.code>0){  //被选择过
+					alert("该车辆已被绑定，请重新选择！");	
+				}else{
+					$.getJSON("/SinoGYS/RescueVehicleAction.do?CMD=updateVehicle",{id : $("#id").val() ,vehicleID:$(".check-item-bg2").children().val(),vehicle_name:$(".check-item-bg2").parent().attr("vehicle_name")},function(data) {
+						if(data.code==true)	{
+							alert("车辆信息修改成功");
+							$(".vehicle_name").text($(".check-item-bg2").parent().attr("vehicle_name"));
+							$(".optionDialog").hide();
+						}					
+					});
+				}
+			});
+    	});
+</script>
+</html>
+
--- a/webapp/supplier/weixinDetail.jsp
+++ b/webapp/supplier/weixinDetail.jsp
@ -0,0 +1,209 @@
+<%@page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page import="java.util.*"%>
+<%@ page isELIgnored="false" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>订单详情</title>
+<meta charset="utf8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.">
+<script src="/SinoGYS/js/jquery-1.7.2.js" type="text/javascript"></script>
+<script src="/SinoGYS/js/jquery-weui.js"></script>
+<link rel="stylesheet" href="/SinoGYS/weixincss/weui.min.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/weixincss/jquery-weui.css" type="text/css">
+<link rel="stylesheet" href="/SinoGYS/css/newCss/reset.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/option.css" />
+<link rel="stylesheet" href="/SinoGYS/css/newCss/orderDetail.css" />
+<script type="text/javascript" src="/SinoGYS/layer/layer.js"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+
+<script type="text/javascript">
+        var ohtml=document.documentElement;
+        function getWidth(){
+            var screenWidth=ohtml.clientWidth;
+            if(screenWidth<320){
+                ohtml.style.fontSize="13.3333px";
+            }else if(screenWidth>1080){
+                ohtml.style.fontSize="45px";
+            }else{
+                ohtml.style.fontSize=screenWidth/(1080/45)+"px";
+            }
+        }
+        getWidth();
+        window.onresize=function(){
+            getWidth();
+        };
+    </script>
+	
+	<style type="text/css">
+		#infoCon{
+			 flex: 1;
+			 text-align: right;
+			 font-size:1rem;
+		}
+	</style>	
+ </head>
+  <body>
+  	<form action="/SinoGYS/CurrentOrderAction.do" method="post">
+  		<input type = "hidden" name = "CMD" value="acceptOrRecvOrder"/>
+	 	<input type="hidden" name="templeteId" id="templeteId" value="${param.templeteId}">
+	 	<input type="hidden" name="orderId" id="orderId" value="${list.ORDER_ID }"/>
+	 	<input type="hidden" name="rescueCode" id="rescueCode" value="${list.rescueCode }"/>
+	 	<input type="hidden" name="orderCode" id="orderCode" value="${list.ORDER_CODE }"/>
+	 	<input type="hidden" name="serviceName" id="serviceName" value="${list.SERVICE_NAME }"/>
+	 	<input type="hidden" name="acceptFlag" id="acceptFlag" value=""/>
+	 </form>	
+	 
+	 <div class="orderInfoWrapper">
+  		<p class="newOrderAsk">${list.flag=='0'?"您有新订单，是否接收？":"您已接受该订单" }</p>
+  		<ul class="orderInfoUl noPadding">
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					合同名称
+  				</div>
+  				<div class="infoCon">
+  					${list.CONTRACTING_NAME}
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					订单编号
+  				</div>
+  				<div class="infoCon">
+  					${list.ORDER_CODE }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					服务类型
+  				</div>
+  				<div class="infoCon">
+  					${list.SERVICE_NAME }
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车辆类型
+  				</div>
+  				<div class="infoCon">
+  					${list.STYLE==""?"无":list.STYLE}
+  				</div>
+  			</li>
+  			<c:if test="${list.flag!='0'}">
+  				<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车主姓名
+  				</div>
+  				<div class="infoCon">
+  					${list.USER_NAME}
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车主电话
+  				</div>
+  				<div class="infoCon">
+  					<a href="tel://${list.USER_PHONE }">${list.USER_PHONE}</a>
+  				</div>
+  			</li>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车牌号码
+  				</div>
+  				<div class="infoCon">
+  					${list.LICENSE}
+  				</div>
+  			</li>
+  			</c:if>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					事发地址
+  				</div>
+  				<input type="text" id="infoCon" value="${list.ADDRESS}">
+  				<div class="addrWrapper" onclick="mapDisplay('${list.LON}','${list.LAT}')">
+  					<img src="/SinoGYS/images/newImage/addrIcon.png"/>
+  				</div>
+  			</li>
+  			<c:if test="${not empty list.DEST_ADDRESS}">
+	  			<li class="orderInfoItem">
+	  				<div class="infoTitle">
+	  					目的地址
+	  				</div>
+	  				<input type="text" id="infoCon" value="${list.DEST_ADDRESS}">
+	  			</li>
+	  		</c:if>
+  			<li class="orderInfoItem">
+  				<div class="infoTitle">
+  					车辆位于
+  				</div>
+  				<div class="infoCon">
+  					${list.ADDRESS_PROPERTY}
+  				</div>
+  			</li>
+  			<c:if test="${not empty list.ADDRESS_ADD}">
+	  			<li class="orderInfoItem">
+	  				<div class="infoTitle">
+	  					备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注
+	  				</div>
+	  				<input type="text" id="infoCon" value="${list.ADDRESS_ADD}">
+	  			</li>
+	  		</c:if>
+  		</ul>
+  		
+  		<c:if test="${list.flag=='0' }">
+	  		<div class="inputWrapper pd17">
+	  			<input class="loginFormSubmit loginBtnActive" type="button" value="接受" onclick="confirm1(1)">
+	  			<input class="loginFormSubmit  mt7" type="button" value="拒绝" onclick="confirm1(2)">
+	  		</div>
+	  	</c:if>
+	  	<c:if test="${list.flag=='1' }">
+	  		<div class="inputWrapper pd17" style='margin-bottom:2rem'>
+	  			<input class="loginFormSubmit loginBtnActive" type="button" value="下一步" onclick="next('${list.ORDER_CODE}','${list.rescueCode }','${list.SERVICE_NAME }')">
+	  		</div>
+	  	</c:if>	
+  	</div>
+    
+  </body>
+  
+  <script type="text/javascript">
+	function mapDisplay(lon,lat){
+		//获取救援车的经纬度
+		layer.open({
+					type : 2, //page层
+					title :'救援地位置',
+					shadeClose: true,
+					shade : 0.6, //遮罩透明度
+					area:['95%', '90%'],
+					moveType : 1, //拖拽风格，0是默认，1是传统拖动
+					content : '/SinoGYS/supplier/mapDisplay.jsp?lon='+lon+"&lat="+lat,
+				});
+	}
+
+	function confirm1(acceptFlag){
+		$("#acceptFlag").val(acceptFlag);
+		
+		if(acceptFlag==1){  //接受
+			$.confirm("您确定要接受案件?", function() {
+				$("form").submit();
+        	}, function() {
+          		//取消操作
+        	});
+		}else if(acceptFlag==2){
+			$.confirm("您确定要拒绝该案件?", function() {
+				$("form").submit();
+        	}, function() {
+          		//取消操作
+        	});
+		}
+		 	  
+	} 
+	
+	function next(orderCode,rescueCode,name){
+		window.location.href="/SinoGYS/CurrentOrderAction.do?CMD=findCurrentOrderDetail"+"&orderCode="+orderCode+"&rescueCode="+rescueCode+"&serviceName="+name;
+	}
+
+</script>
+</html>