initial

.classpath

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.jstl_1.2.1">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="WEB-INF/lib"/>
+			<attribute name="owner.project.facets" value="jst.web.jstl"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
+</classpath>

.project

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FangYuan</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.settings/.jsdtscope

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebRoot"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary/StandardBrowser/html5"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="FangYuan">
+        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="FangYuan"/>
+        <property name="java-output-path" value="/FangYuan/WebRoot/WEB-INF/classes"/>
+    </wb-module>
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v7.0"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="jst.web.jstl" version="1.2.1"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

.tern-project

@@ -0,0 +1,14 @@
+{
+  "plugins": {
+    "guess-types": {
+      
+    },
+    "outline": {
+      
+    }
+  },
+  "libs": [
+    "ecma5",
+    "browser"
+  ]
+}

WebRoot/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

WebRoot/WEB-INF/el-common.tld

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+        version="2.1">
+
+    <tlib-version>1.0</tlib-version>
+    <short-name>el</short-name>
+    <uri>http://mycompany.com</uri>
+
+    <function>
+        <name>toJsonString</name>
+
+        <function-class>com.suyuan.tag.ElFunctions</function-class>
+        <function-signature>java.lang.String toJsonString(java.lang.Object)</function-signature>
+        
+        <example>${el:toJsonString(value)}</example>
+    </function>
+
+</taglib>

WebRoot/WEB-INF/html/fulebao.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>领先共享汽车</title><script src=https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js></script><script src=http://res.wx.qq.com/open/js/jweixin-1.2.0.js></script><link href=./static/suyuan/css/app.ee893eb1c5d8e9a9acf98d1988a9cf2a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/suyuan/js/manifest.436b506c12f3da6d30ea.js></script><script type=text/javascript src=./static/suyuan/js/vendor.5cdc228f7cf43abbb4bd.js></script><script type=text/javascript src=./static/suyuan/js/app.c1f78658d30fcfe259b1.js></script></body></html>

WebRoot/WEB-INF/html/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><script src=http://cdn.ronghub.com/RongIMLib-2.2.5.min.js></script><script src=http://res.wx.qq.com/open/js/jweixin-1.2.0.js></script><title>领先共享汽车</title><link href=./static/css/app.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.20da385aac468e93612b.js></script><script type=text/javascript src=./static/js/vendor.490d61f73c8727e6a790.js></script><script type=text/javascript src=./static/js/app.0132ffb3ed000f506705.js></script></body></html>

WebRoot/WEB-INF/jsp/dailogue.jsp

@@ -0,0 +1,369 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<link rel="stylesheet" href="${pageContext.request.contextPath }/css/dailogue.css">
+<script src="http://cdn.ronghub.com/RongIMLib-2.2.0.min.js"></script>
+<script src="../js/jquery.min.js"></script>
+<script src="../js/dropload.min.js"></script>
+<link rel="stylesheet" href="../css/reset.css">
+<script src="${pageContext.request.contextPath }/js/jquery.min.js"></script>
+
+<title>与 ${name} 的聊天</title>
+</head>
+<body>
+<input type="hidden" id="self" name="self" value="${self}"/>
+<input type="hidden" id="other" name="other" value="${other}"/>
+<input type="hidden" id="selfDir" name="selfDir" value="${selfDir}"/>
+<input type="hidden" id="otherDir" name="selfDir" value="${otherDir}"/>
+<!-- 对话列表 -->
+		<ul class="pushChat">
+			
+		</ul>
+
+	<!-- 发送框 -->
+		<header>
+			<textarea placeholder="说点什么…"></textarea>
+			<section><img src="../images/send.png" id="send"></section>
+		</header>
+		<div id="beforeheader"></div>
+
+	<script src="${pageContext.request.contextPath }/js/dropload.min.js"></script>
+	<script>
+	//下拉加载
+	$('.pushChat').dropload({
+	    scrollArea : window,
+	    loadUpFn : function(me){
+	    	loadMore();
+	    	setTimeout(function(){
+                 me.resetload();
+             },1000);
+	    }
+	});
+	
+var timer;
+	$('textarea').focusin(function(){
+		clearInterval(timer);   
+		timer = setInterval(function(){
+			if($('textarea').val().length > 0) {
+				$('#send').attr('src','../images/send-ed.png');
+			} else {
+				$('#send').attr('src','../images/send.png');
+			}
+		},10);
+	});
+	
+	
+		var userid = $("#self").val();
+		var touserid = $('#other').val();
+		
+		
+		$(document).ready(function(){
+	    	initRongYun();
+	  });
+	  
+var _rongKey =  userid;
+
+function initRongYun(){
+	
+	
+	$.ajax({
+		url:'../rong/getToken',
+		type:'get',
+		data:{rongKey:_rongKey},
+		success:function(e){
+			// 初始化。
+			 RongIMClient.init(e.appKey);
+			// 设置连接监听状态 （ status 标识当前连接状态）
+			 // 连接状态监听器
+			 RongIMClient.setConnectionStatusListener({
+			    onChanged: function (status) {
+			        switch (status) {
+			            //链接成功
+			            case RongIMLib.ConnectionStatus.CONNECTED:
+			                console.log('链接成功');
+			                break;
+			            //正在链接
+			            case RongIMLib.ConnectionStatus.CONNECTING:
+			                console.log('正在链接');
+			                break;
+			            //重新链接
+			            case RongIMLib.ConnectionStatus.DISCONNECTED:
+			                console.log('断开连接');
+			                break;
+			            //其他设备登录
+			            case RongIMLib.ConnectionStatus.KICKED_OFFLINE_BY_OTHER_CLIENT:
+			                console.log('其他设备登录');
+			                break;
+			              //网络不可用
+			            case RongIMLib.ConnectionStatus.NETWORK_UNAVAILABLE:
+			              console.log('网络不可用');
+			              break;
+			            }
+			    }});
+
+			 // 消息监听器
+			 RongIMClient.setOnReceiveMessageListener({
+			    // 接收到的消息
+			    onReceived: function (message) {
+			        // 判断消息类型
+			        switch(message.messageType){
+			            case RongIMClient.MessageType.TextMessage:
+			                   // 发送的消息内容将会被打印
+			                console.log(message.content.content);
+			                   if(userid!=message.senderUserId){
+			                	   
+			                	   var li = '<li class="dailogue friend" friendid="'+touserid+'"><img src="'+$('#otherDir').val()+'"  onerror="javascript:this.src=\'../images/shadow.jpg\'" class="headicon-other"><span class="left-trangle"></span><span class="left">'+message.content.content+'</span><div style="clear:both;"></div><div class="margin"></div></li>';
+			               		$('.pushChat').append(li);
+			               		gotobottom();
+			                   }
+			                break;
+			            case RongIMClient.MessageType.VoiceMessage:
+			                // 对声音进行预加载                
+			                // message.content.content 格式为 AMR 格式的 base64 码
+			                RongIMLib.RongIMVoice.preLoaded(message.content.content);
+			                break;
+			            case RongIMClient.MessageType.ImageMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.DiscussionNotificationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.LocationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.RichContentMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.DiscussionNotificationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.InformationNotificationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.ContactNotificationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.ProfileNotificationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.CommandNotificationMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.CommandMessage:
+			                // do something...
+			                break;
+			            case RongIMClient.MessageType.UnknownMessage:
+			                // do something...
+			                break;
+			            default:
+			                // 自定义消息
+			                // do something...
+			        }
+			    }
+			});
+			 
+			
+			 var token = e.token;
+
+			 // 连接融云服务器。
+			       RongIMClient.connect(token, {
+			         onSuccess: function(userId) {
+			           console.log("Login successfully." + userId);
+			         },
+			         onTokenIncorrect: function() {
+			           console.log('token无效');
+			         },
+			         onError:function(errorCode){
+			               var info = '';
+			               switch (errorCode) {
+			                 case RongIMLib.ErrorCode.TIMEOUT:
+			                   info = '超时';
+			                   break;
+			                 case RongIMLib.ErrorCode.UNKNOWN_ERROR:
+			                   info = '未知错误';
+			                   break;
+			                 case RongIMLib.ErrorCode.UNACCEPTABLE_PaROTOCOL_VERSION:
+			                   info = '不可接受的协议版本';
+			                   break;
+			                 case RongIMLib.ErrorCode.IDENTIFIER_REJECTED:
+			                   info = 'appkey不正确';
+			                   break;
+			                 case RongIMLib.ErrorCode.SERVER_UNAVAILABLE:
+			                   info = '服务器不可用';
+			                   break;
+			               }
+			               console.log(errorCode+":"+info);
+			             }
+			       });	
+			
+		}
+		
+	
+	});
+		  
+	
+	   
+		  
+ }
+	
+	
+		// 发送按钮
+			$('section').on('click',function(){
+				var cont = $('textarea').val();
+				if(cont == ''){alert('请输入内容');}
+					else{
+						
+
+						// 定义消息类型,文字消息使用 RongIMLib.TextMessage
+					       var msg = new RongIMLib.TextMessage({content:cont,extra:"附加信息"});
+					       //或者使用RongIMLib.TextMessage.obtain 方法.具体使用请参见文档
+					       //var msg = RongIMLib.TextMessage.obtain("hello");
+					       var conversationtype = RongIMLib.ConversationType.PRIVATE; // 私聊
+					       var targetId = touserid; // 目标 Id
+					       RongIMClient.getInstance().sendMessage(conversationtype, targetId, msg, {
+					                      // 发送消息成功
+					                      onSuccess: function (message) {
+					                          //message 为发送的消息对象并且包含服务器返回的消息唯一Id和发送消息时间戳
+					                          var li = '<li class="dailogue self" userid="'+userid+'"><a href="../main/'
+												+userid+'" ><img src="'+$('#selfDir').val()+'" onerror="javascript:this.src=\'../images/shadow.jpg\'" class="headicon-self"></a><span class="right-trangle"></span><span class="right">'+cont+'</span><div style="clear:both;"></div><div class="margin"></div></li>';
+												$('ul').append(li);
+												$('textarea').val('');
+					                          console.log("Send successfully");
+					                      },
+					                      onError: function (errorCode,message) {
+					                          var info = '';
+					                          switch (errorCode) {
+					                              case RongIMLib.ErrorCode.TIMEOUT:
+					                                  info = '超时';
+					                                  break;
+					                              case RongIMLib.ErrorCode.UNKNOWN_ERROR:
+					                                  info = '未知错误';
+					                                  break;
+					                              case RongIMLib.ErrorCode.REJECTED_BY_BLACKLIST:
+					                                  info = '在黑名单中，无法向对方发送消息';
+					                                  break;
+					                              case RongIMLib.ErrorCode.NOT_IN_DISCUSSION:
+					                                  info = '不在讨论组中';
+					                                  break;
+					                              case RongIMLib.ErrorCode.NOT_IN_GROUP:
+					                                  info = '不在群组中';
+					                                  break;
+					                              case RongIMLib.ErrorCode.NOT_IN_CHATROOM:
+					                                  info = '不在聊天室中';
+					                                  break;
+					                              default :
+					                                  info = x;
+					                                  break;
+					                          }
+					                          console.log('发送失败:' + info);
+					                      }
+					                  }
+					              );
+					       
+						$.ajax({
+							url:'../chatInfo/save',
+							type:'post',
+							data:{userId:userid,toUserId:touserid,content:cont,contentType:1,state:0},
+							success:function(msg){
+								//alert(msg.msg);
+							}
+						});
+
+					}
+			});
+
+		// 接收消息
+			 var page = 0;
+			function message(){
+				page += 1;
+				$.ajax({
+					url:'../chatInfo/page',
+					type:'get',
+					data:{
+						"pageNumber" : 5,
+						"currentPage" : page,
+						toUserId:touserid,
+						userId:userid
+					},
+					success:function(data){
+						var mes = data.data.pp;
+						var li ='';
+						for (var i = mes.length-1; i >= 0; i--) {
+							if(mes[i].userId == userid){
+								li = '<li class="dailogue self" userid="'+mes[i].userId+'" infoid="'+mes[i].infoId+'"><a href="../main/'
+								+userid+'" ><img src="'+$('#selfDir').val()+'" onerror="javascript:this.src=\'../images/shadow.jpg\'" class="headicon-self"></a><span class="right-trangle"></span><span class="right">'+mes[i].content+'</span><div style="clear:both;"></div><div class="margin"></div></li>';
+							}else{
+								li = '<li class="dailogue friend" friendid="'+mes[i].userId+'" infoid="'+mes[i].infoId+'"><a href="../main/'
+								+touserid+'" ><img src="'+$('#otherDir').val()+'"  onerror="javascript:this.src=\'../images/shadow.jpg\'" class="headicon-other"></a><span class="left-trangle"></span><span class="left">'+mes[i].content+'</span><div style="clear:both;"></div><div class="margin"></div></li>';
+							}
+							// 每隔十条信息显示时间
+							if(i%10 == 0){
+								var time = '<li class="time"><time>'+mes[i].time+'</time></li>';
+							$('ul').append(time);
+							}
+
+							$('ul').append(li);
+						};
+						gotobottom();
+					}
+				});
+				//setInterval('message', 3000);
+			
+			}
+			$('document').ready(message);
+
+function gotobottom(){
+	var maxheight = $(document).height() - 20;
+	$(document.body).animate({
+		scrollTop : maxheight
+	}, 10);
+}
+$('#send').click(gotobottom);
+
+function loadMore(){
+	 page += 1;
+	$.ajax({
+		url:'../chatInfo/page',
+		type:'get',
+		data:{
+			"pageNumber" : 5,
+			"currentPage" : page,
+			 toUserId:touserid,
+			 userId:userid
+		},
+		success:function(data){
+			var mes = data.data.pp;
+			var li ='';
+			for (var i = 0; i <= mes.length-1; i++) {
+				if(mes[i].userId == userid){
+					li = '<li class="dailogue self" userid="'+mes[i].userId+'" infoid="'+mes[i].infoId+'"><a href="../main/'
+					+userid+'" ><img src="'+$('#selfDir').val()+'" onerror="javascript:this.src=\'../images/shadow.jpg\'" class="headicon-self"></a><span class="right-trangle"></span><span class="right">'+mes[i].content+'</span><div style="clear:both;"></div><div class="margin"></div></li>';
+				}else{
+					li = '<li class="dailogue friend" friendid="'+mes[i].userId+'" infoid="'+mes[i].infoId+'"><a href="../main/'
+					+touserid+'" ><img src="'+$('#otherDir').val()+'"  onerror="javascript:this.src=\'../images/shadow.jpg\'" class="headicon-other"></a><span class="left-trangle"></span><span class="left">'+mes[i].content+'</span><div style="clear:both;"></div><div class="margin"></div></li>';
+				}
+				// 每隔十条信息显示时间
+				if(i%10 == 0){
+					var time = '<li class="time"><time>'+mes[i].time+'</time></li>';
+				$('ul').prepend(time);
+				}
+
+				$('ul').prepend(li);
+			};
+		}
+	});
+}
+
+</script>
+
+
+</body>
+</html>

WebRoot/WEB-INF/jsp/newAdmin/adminInfo.jsp

@@ -0,0 +1,137 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="分组">
+                    <el-input v-model="row_info.groupId"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="用户名">
+                    <el-input v-model="row_info.userName"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="密码">
+                    <el-input v-model="row_info.password"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../adminInfo/getAdminInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '1-1',
+                user: {
+                    id: '5-2',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.userName) {
+                    this.$message.warning('请填写用户名');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../adminInfo/update' : '../adminInfo/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/adminInfos.jsp

@@ -0,0 +1,155 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}管理员</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="groupId"
+                label="分组"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="userName"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="password"
+                label="密码"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '1-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../adminInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'adminInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../adminInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'adminInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/authenticationInfos.jsp

@@ -0,0 +1,328 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <div class="num"> 共{{totalNumber}}认证</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="isForeign"
+                label="是否外籍"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="licenseCard"
+                label="驾驶证号"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                label="驾驶证"
+                align="center">
+
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realLicenseImg">
+            </template>
+
+        </el-table-column>
+        <el-table-column
+                label="驾照状态"
+                align="center"
+                width="150"
+                inline-template >
+
+            <div>
+
+                <el-button v-if="row.licenseStatus==0" size="small" @click="passLicense(row)">通过</el-button>
+                <el-button v-if="row.licenseStatus==0" size="small" type="danger"  @click="failLicense(row)">失败</el-button>
+                <span v-if="row.licenseStatus==1">成功</span>
+                <span v-if="row.licenseStatus==2">失败</span>
+            </div>
+
+        </el-table-column>
+
+        <el-table-column
+                prop="realName"
+                label="真实姓名"
+                align="center">
+        </el-table-column>
+
+        <el-table-column
+                prop="idCard"
+                label="身份证"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                label="身份证正面"
+                align="center">
+
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realIdCardFace">
+            </template>
+        </el-table-column>
+        <el-table-column
+                label="身份证背面"
+                align="center">
+
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realIdCardBack">
+            </template>
+
+        </el-table-column>
+
+        <el-table-column
+                label="身份证状态"
+                align="center"
+                width="150"
+                inline-template >
+
+            <div>
+
+                <el-button v-if="row.idStatus==0" size="small" @click="passId(row)">通过</el-button>
+                <el-button v-if="row.idStatus==0" size="small" type="danger"  @click="failId(row)">失败</el-button>
+                <span v-if="row.idStatus==1">成功</span>
+                <span v-if="row.idStatus==2">失败</span>
+            </div>
+
+        </el-table-column>
+
+        <el-table-column
+                :context="_self"
+                width="80"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '16-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../authenticationInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'authenticationInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../authenticationInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'labelInfo';
+            },
+            passLicense: function (row) {
+                this.$confirm('确定要通过驾照吗?', '提示', {
+                    confirmButtonText: '添加',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../authenticationInfo/pass',
+                        data: {
+                            id : row.id,
+                            typeFlag : 0,
+
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+
+            },
+            failLicense : function (row) {
+                this.$confirm('确定要失败驾照吗?', '提示', {
+                    confirmButtonText: '添加',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../authenticationInfo/fail',
+                        data: {
+                            id : row.id,
+                            typeFlag : 0,
+
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            passId: function (row) {
+                this.$confirm('确定要通过身份证吗?', '提示', {
+                    confirmButtonText: '添加',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../authenticationInfo/pass',
+                        data: {
+                            id : row.id,
+                            typeFlag : 1,
+
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+
+            },
+            failId: function (row) {
+                this.$confirm('确定要失败身份证吗?', '提示', {
+                    confirmButtonText: '添加',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../authenticationInfo/fail',
+                        data: {
+                            id : row.id,
+                            typeFlag : 1,
+
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+
+
+
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/carInfo.jsp

@@ -0,0 +1,254 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>车辆</title>
+
+    <style>
+        .avatar-uploader .el-upload {
+            border: 1px dashed #d9d9d9;
+            border-radius: 6px;
+            cursor: pointer;
+            position: relative;
+            overflow: hidden;
+        }
+
+        .avatar-uploader .el-upload:hover {
+            border-color: #20a0ff;
+        }
+
+        .avatar-uploader-icon {
+            font-size: 28px;
+            color: #8c939d;
+            width: 178px;
+            height: 178px;
+            line-height: 178px;
+            text-align: center;
+        }
+
+        .avatar {
+            width: 178px;
+            height: 178px;
+            display: block;
+        }
+    </style>
+
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+    <el-form ref="form" :model="row_info" label-width="80px">
+
+        <el-form-item label="图片">
+            <el-upload
+                    class="avatar-uploader"
+                    action="../assets/uploadFile"
+                    :show-file-list="false"
+                    :on-success="contactAvatarSuccess">
+                <img v-if="avatar" :src="avatar" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+        </el-form-item>
+
+        <el-form-item label="服务点">
+            <el-select v-model="row_info.storeId" placeholder="请选择">
+                <el-option
+                        v-for="item in storeInfos"
+                        :key="item.id"
+                        :label="item.title"
+                        :value="item.id">
+                </el-option>
+            </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="车型">
+            <el-input v-model="row_info.carModel"></el-input>
+        </el-form-item>
+        <el-form-item label="座位">
+            <el-input v-model="row_info.seatNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="牌照">
+            <el-input v-model="row_info.license"></el-input>
+        </el-form-item>
+        <el-form-item label="续航">
+            <el-input v-model="row_info.batteryRange"></el-input>
+        </el-form-item>
+
+        <el-form-item label="日价格">
+            <el-input v-model="row_info.dayPrice"></el-input>
+        </el-form-item>
+        <el-form-item label="周价格">
+            <el-input v-model="row_info.weekPrice"></el-input>
+        </el-form-item>
+        <el-form-item label="月价格">
+            <el-input v-model="row_info.monthPrice"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆状态">
+            <el-input v-model="row_info.carStatus"></el-input>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="text" @click="mapDialogVisible = true">点击打开地图选择地址</el-button>
+            <template v-if="mapDialogVisible">
+                <iframe id="mapPage" width="100%" height="100%" frameborder=0
+                        src="https://apis.map.qq.com/tools/locpicker?policy=1&search=1&type=1&coord=31.23035,121.47372&key=OFJBZ-SBUHF-MQVJ3-JSFRF-VT3UZ-GNBJX&referer=领先共享汽车">
+                </iframe>
+            </template>
+        </el-form-item>
+
+
+        <el-form-item label="地址">
+            <el-input v-model="row_info.address"></el-input>
+        </el-form-item>
+
+        <el-form-item label="详细地址">
+            <el-input v-model="row_info.addressDetail"></el-input>
+        </el-form-item>
+
+        <el-form-item label="经度">
+            <el-input v-model="row_info.longitude"></el-input>
+        </el-form-item>
+
+        <el-form-item label="纬度">
+            <el-input v-model="row_info.latitude"></el-input>
+        </el-form-item>
+
+        <el-form-item>
+            <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+            <el-button>取消</el-button>
+        </el-form-item>
+    </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+
+    var __vue = new Vue({
+        el: '#app',
+        created: function () {
+
+            $.get({
+                url: '../storeInfo/all'
+            }).then(function (res) {
+                this.storeInfos = res.data;
+
+            }.bind(this));
+
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../carInfo/getCarInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+
+                        if (res.data.realIcon) {
+                            this.avatar = res.data.realIcon;
+                        }
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '17-1',
+                user: {
+                    id: '',
+
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info: {
+                    realIcon: '',
+                    storeId: '',
+                },
+                storeInfos: [],
+                avatar: '',
+                dialogImageUrl: '',
+                dialogVisible: false,
+                mapDialogVisible: false,
+
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                var data = JSON.parse(JSON.stringify(this.row_info));
+
+                delete data.realIcon;
+                $.post({
+                    url: this.edit ? '../carInfo/update' : '../carInfo/save',
+                    data: data
+                }).then(function (res) {
+                    if (res.success) {
+                        if (!this.edit) {
+                            this.row_info.id = res.data;
+                        }
+                        this.edit = true;
+                        this.$message.success(this.edit ? '保存成功' : '创建成功');
+                    } else {
+                        this.$message.error(this.edit ? '保存失败' : '创建失败');
+                    }
+                }.bind(this))
+            },
+
+            handlePictureCardPreview: function (file) {
+                this.dialogImageUrl = file.url;
+                this.dialogVisible = true;
+
+            },
+            contactAvatarSuccess: function (res, file, fileList) {
+                if (res.success) {
+                    this.row_info.icon = res.data[0];
+                }
+                this.avatar = URL.createObjectURL(file.raw);
+            },
+
+        }
+    })
+
+
+    window.addEventListener('message', function (event) {
+        // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+        var loc = event.data;
+        if (loc && loc.module == 'locationPicker') {//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+            console.log('location', loc);
+            //console.log('loc.poiaddress', loc.poiaddress);
+            //console.log('loc.poiname', loc.poiname);
+            __vue.$set(__vue.row_info);
+            __vue.row_info.address = loc.poiaddress;
+            __vue.row_info.addressDetail = loc.poiname;
+            __vue.row_info.longitude = loc.latlng.lng;
+            __vue.row_info.latitude = loc.latlng.lat;
+            __vue.mapDialogVisible = false;
+
+        }
+    }, false);
+
+</script>
+</html>
+

WebRoot/WEB-INF/jsp/newAdmin/carInfos.jsp

@@ -0,0 +1,233 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+	<jsp:include page="head.jsp"/>
+	<title>车辆</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+	<div class="filters">
+		<el-button type="primary" @click="create()">创建</el-button>
+		<div class="num"> 共{{totalNumber}}车辆</div>
+	</div>
+
+	<el-table :data="rows"
+			ref="table"
+			style="width: 100%"
+			element-loading-text="拼命加载中"
+			stripe
+			v-loading="loading">
+			<el-table-column
+				type="index"
+				width="70"
+				align="center">
+			</el-table-column>
+		<el-table-column
+				prop="storeId"
+				label="服务点"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="carModel"
+				label="车型"
+				width="180"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="seatNumber"
+				label="座位"
+
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="license"
+				label="牌照"
+				width="150"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="batteryRange"
+				label="续航"
+				width="150"
+				align="center">
+		</el-table-column>
+		<%--<el-table-column
+				prop="icon"
+				label="icon"
+				align="center">
+		</el-table-column>--%>
+		<el-table-column
+				prop="dayPrice"
+				label="日价格"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="weekPrice"
+				label="周价格"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="monthPrice"
+				label="月价格"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="carStatus"
+				label="状态"
+				align="center">
+		</el-table-column>
+		<%--<el-table-column
+				prop="address"
+				label="address"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="addressDetail"
+				label="addressDetail"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="longitude"
+				label="longitude"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="latitude"
+				label="latitude"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="createTime"
+				label="createTime"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="updateTime"
+				label="updateTime"
+				align="center">
+		</el-table-column>
+		<el-table-column
+				prop="delFlag"
+				label="delFlag"
+				align="center">
+		</el-table-column>--%>
+		<el-table-column
+				:context="_self"
+				width="150"
+				inline-template
+				label="操作"
+				align="center">
+			<div>
+				<el-button size="small" @click="editRow(row)">编辑</el-button>
+				<el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+			</div>
+		</el-table-column>
+	</el-table>
+	<div class="pagination-wrapper" v-show="!loading">
+		<el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+					:page-size="pageSize"
+					:current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+		</el-pagination>
+	</div>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+	function getQueryString(name) {
+		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+		var r = window.location.search.substr(1).match(reg);
+		if (r != null) return unescape(r[2]);
+		return null;
+	}
+	new Vue({
+		el: '#app',
+		created: function () {
+			this.getRows();
+		},
+		data: function () {
+			return {
+				menu: '17-1',
+				user: {
+					id: '',
+
+					username: 'admin',
+					avatar: ''
+				},
+				loading: false,
+				totalNumber: 0,
+				totalPage: 10,
+				currentPage: 1,
+				pageSize: 20,
+				rows: []
+			};
+		},
+		methods: {
+			logout: function () {
+				this.$confirm('确定要注销吗?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'info'
+				}).then(function () {
+					localStorage.removeItem('user');
+					this.$router.push({path: '/login'});
+				}.bind(this)).catch(function (e) {
+
+				});
+			},
+			getRows: function () {
+				$.get({
+					url: '../carInfo/page',
+					data: {
+						currentPage: this.currentPage,
+						pageNumber: this.pageSize
+					}
+				}).then(function (res) {
+					if (res.success) {
+						this.totalNumber = res.data.page.totalNumber;
+						this.rows = res.data.pp;
+					}
+				}.bind(this))
+			},
+			pageChange: function (page) {
+				this.currentPage = page;
+				this.getRows();
+			},
+			sizeChange: function (size) {
+				this.pageSize = size;
+				this.getRows();
+			},
+			editRow: function (row) {
+				window.location = 'carInfo?id=' + row.id;
+			},
+			deleteRow: function (row) {
+				this.$confirm('确定要删除吗?', '提示', {
+					confirmButtonText: '删除',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(function () {
+					return $.post({
+						url: '../carInfo/del',
+						data: {
+							id: row.id
+						}
+					})
+				}.bind(this)).then(function (res) {
+					if (res.success) {
+						this.$message.success('删除成功');
+						this.getRows();
+					} else {
+						this.$message.error('删除失败');
+					}
+				}.bind(this)).catch(function () {
+
+				});
+			},
+			create: function () {
+				window.location = 'carInfo';
+			}
+		}
+	})
+</script>
+</html>
+

WebRoot/WEB-INF/jsp/newAdmin/contentAfter.jsp

@@ -0,0 +1,13 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: 熊竹
+  Date: 2017/3/9
+  Time: 13:49
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+</section>
+</div>
+<!-- content end -->
+</div>
+</div>

WebRoot/WEB-INF/jsp/newAdmin/contentBefore.jsp

@@ -0,0 +1,45 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: 熊竹
+  Date: 2017/3/9
+  Time: 13:49
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<div id="app" class="db">
+    <header class="db-header">
+        <span class="logo">享居屋房源管理系统</span>
+    </header>
+
+    <div class="db-body">
+        <template>
+            <aside class="db-menu-wrapper">
+                <el-menu :default-active="menu" class="db-menu-bar" unique-opened>
+
+
+                    <el-submenu index="1">
+                        <template slot="title"><i class="el-icon-menu"></i>用户管理</template>
+                   <!--      <a href="adminInfos">
+                            <el-menu-item index="1-1">管理员</el-menu-item>
+                        </a> -->
+                        <a href="toUserInfo">
+                            <el-menu-item index="1-2">用户列表</el-menu-item>
+                        </a>
+                    </el-submenu>
+
+                    <el-submenu index="2">
+                        <template slot="title"><i class="el-icon-menu"></i>房源信息</template>
+                        <a href="rentInfos">
+                            <el-menu-item index="2-1">租房信息</el-menu-item>
+                        </a>
+                        <a href="saleinfos">
+                        <el-menu-item index="2-2">收房信息</el-menu-item>
+                        </a>
+                    </el-submenu>
+            </aside>
+        </template>
+        <!-- menu end -->
+
+        <!-- content start -->
+        <div class="db-content-wrapper">
+            <section class="db-content">

WebRoot/WEB-INF/jsp/newAdmin/couponInfo.jsp

@@ -0,0 +1,174 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="优惠券">
+                    <el-input v-model="row_info.name"></el-input>
+                </el-form-item>
+      <!--           
+         <el-form-item
+                label="服务类型">
+             <el-select v-model="row_info.serviceType" clearable filterable   placeholder="请选择服务">
+			    <el-option
+			      v-for="item in serviceTypes"
+			      :key="item.id"
+			      :label="item.typeName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item> -->
+        
+                
+                <el-form-item label="描述">
+                    <el-input v-model="row_info.discription"></el-input>
+                </el-form-item>
+                
+                
+ 
+        
+                
+                 <el-form-item label="抵扣金额">
+                    <el-input v-model="row_info.discountMoney"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="条件(满可用)">
+                    <el-input v-model="row_info.limitMoney"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="领取后有限天数">
+                    <el-input v-model="row_info.availableDays"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   /* $.get({
+                   url: '../serviceType/all'
+               }).then(function (res) {
+                   this.serviceTypes = res.data;
+
+               }.bind(this));
+        	    */
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../couponInfo/getCouponInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '2-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	serviceType :'',
+                },
+                serviceTypes : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.name) {
+                    this.$message.warning('请填写优惠券');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../couponInfo/update' : '../couponInfo/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/couponInfos.jsp

@@ -0,0 +1,175 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}优惠券</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="优惠券"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="discription"
+                label="描述"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="discountMoney"
+                label="抵扣金额"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="limitMoney"
+                label="条件（元）"
+                align="center">
+        </el-table-column>
+        <!-- <el-table-column
+        		prop="serviceTypeName"
+                label="服务类型"
+                align="center">
+        </el-table-column> -->
+        <el-table-column
+        		prop="status"
+                label="状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="availableDays"
+                label="领取后可用天数"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '2-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../couponInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'couponInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../couponInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'couponInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/franchiseeInfo.jsp

@@ -0,0 +1,165 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+              
+                <el-form-item label="用户名">
+                    <el-input v-model="row_info.userName"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="密码">
+                    <el-input v-model="row_info.password"></el-input>
+                </el-form-item>
+                
+                
+                <el-form-item label="平台管理费比率">
+                    <el-input v-model="row_info.feeRate"></el-input>
+                </el-form-item>
+                
+                
+                     <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  </el-form-item>
+  
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   
+     	   $.get({
+                url: '../userInfo/all'
+            }).then(function (res) {
+                this.userInfos = res.data;
+
+            }.bind(this));
+     	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../franchiseeInfo/getFranchiseeInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '15-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	userId: '',
+                	feeRate : 10,
+                },
+                userInfos : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.userName) {
+                    this.$message.warning('请填写用户名');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../franchiseeInfo/update' : '../franchiseeInfo/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/franchiseeInfos.jsp

@@ -0,0 +1,160 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}加盟商</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="userName"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="password"
+                label="密码"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="feeRate"
+                label="平台管理费比率"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="userId"
+                label="用户ID"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '15-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../franchiseeInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'franchiseeInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../franchiseeInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'franchiseeInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/head.jsp

@@ -0,0 +1,225 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: 熊竹
+  Date: 2017/3/9
+  Time: 10:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<style>
+    html, body {
+        padding: 0;
+        margin: 0;
+        font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+    }
+
+    a {
+        text-decoration: none;
+    }
+
+    .db .el-dropdown-menu {
+        margin-top: 20px;
+    }
+
+    .db .db-header {
+        width: 100%;
+        height: 60px;
+        line-height: 60px;
+        background: #20A0FF;
+        padding: 0 20px;
+        box-sizing: border-box;
+        color: #ffffff;
+        z-index: 99;
+        position: fixed;
+        left: 0;
+        top: 0;
+    }
+
+    .db .db-header .logo {
+    }
+
+    .db .db-header .user-info {
+        float: right;
+    }
+
+    .db .db-header .user-info img {
+        width: 25px;
+        height: 25px;
+        vertical-align: -7px;
+        margin: 0 0 0 10px;
+        cursor: pointer;
+    }
+
+    .db .db-body .db-menu-wrapper {
+        position: fixed;
+        left: 0;
+        top: 60px;
+        /*background: red;*/
+        height: 100%;
+        overflow: auto;
+        z-index: 98;
+    }
+
+    .db .db-body .db-menu-wrapper .db-menu-bar {
+        height: 100%;
+        flex-grow: 0;
+        width: 200px;
+    }
+
+    .db .db-body .db-content-wrapper {
+        width: 100%;
+        z-index: 97;
+        box-sizing: border-box;
+        padding: 60px 0px 0px 200px;
+    }
+
+    .db .db-body .db-content-wrapper .db-content {
+        padding: 25px;
+    }
+
+    .db .db-body .db-content-wrapper .db-content .db-content-inner {
+        padding: 30px 0px;
+    }
+
+    .line {
+        text-align: center;
+    }
+
+    .filters {
+        margin: 0 0 20px 0;
+        border: 1px #efefef solid;
+        padding: 10px;
+        background: #f9f9f9;
+        display: flex;
+        align-items: center;
+    }
+
+    .filters .num {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+    }
+
+    .pagination-wrapper {
+        text-align: center;
+        padding: 30px;
+    }
+
+    .userIcon {
+        width: 36px;
+        height: 36px;
+        border-radius: 50%;
+        margin: 4px;
+    }
+
+    .singleImg {
+        max-width: 100px;
+        height: 100px;
+        margin: 4px;
+    }
+
+    .crop-upload-box {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .crop-upload-box:hover {
+        border-color: #20a0ff;
+    }
+
+    .crop-upload-box .icon {
+        font-size: 28px;
+        color: #8c939d;
+        text-align: center;
+    }
+
+    .crop-wrap {
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.5);
+        z-index: 2003;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+    }
+
+    .el-input, .el-input-number, .el-input-select {
+        /*width: 220px !important;*/
+    }
+
+    .btn_confirm {
+        display: inline-block;
+        line-height: 1;
+        white-space: nowrap;
+        cursor: pointer;
+        background: #20a0ff;
+        border: 1px solid #20a0ff;
+        color: #1f2d3d;
+        -webkit-appearance: none;
+        text-align: center;
+        box-sizing: border-box;
+        outline: 0;
+        margin: 0;
+        padding: 10px 15px;
+        font-size: 14px;
+        border-radius: 4px;
+    }
+
+    .el-upload--picture-card {
+        display: flex !important;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+
+    .avatar-uploader .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .el-select .el-input .el-input__icon{
+    	top: 0 !important;
+    }
+    .h34{
+    	height: 34px;
+    	margin-right: 5px;
+    }
+    .btn34{
+    	padding: 8px 15px !important;
+    }
+</style>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/lib/element/element-ui.css">
+<link rel="stylesheet" href="${pageContext.request.contextPath}/lib/Jcrop2/css/Jcrop.min.css">
+<script src="${pageContext.request.contextPath}/lib/jquery/jquery-3.1.1.min.js"></script>
+<script src="${pageContext.request.contextPath}/lib/Jcrop2/js/Jcrop.min.js"></script>
+<script src="${pageContext.request.contextPath}/lib/vue/vue.js"></script>
+<script src="${pageContext.request.contextPath}/lib/element/element-ui.js"></script>
+<script src="${pageContext.request.contextPath}/lib/crop/crop.js"></script>

WebRoot/WEB-INF/jsp/newAdmin/homeBanner.jsp

@@ -0,0 +1,172 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+            
+            	<el-form-item label="图片">
+		         <el-upload
+		                    class="avatar-uploader"
+		                    action="../assets/uploadFile"
+		                    :show-file-list="false"
+		                    :on-success="contactAvatarSuccess">
+		                <img v-if="avatar" :src="avatar" class="avatar">
+		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+		            </el-upload>
+		        </el-form-item>
+        
+                <el-form-item label="标题">
+                    <el-input v-model="row_info.title"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="地址">
+                    <el-input v-model="row_info.url"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="排序">
+                    <el-input v-model="row_info.rank"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../homeBanner/getHomeBanner',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        
+                        if (res.data.realImage) {
+                            this.avatar = res.data.realImage;
+                        }
+                        
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '3-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+                dialogImageUrl: '',
+                dialogVisible: false,
+                avatar: ''
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.title) {
+                    this.$message.warning('请填写标题');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    delete data.realImage;
+                    
+                    $.post({
+                        url: this.edit ? '../homeBanner/update' : '../homeBanner/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            
+            handlePictureCardPreview: function (file) {
+                this.dialogImageUrl = file.url;
+                this.dialogVisible = true;
+
+            },
+            contactAvatarSuccess: function (res, file, fileList) {
+                if (res.success) {
+                    this.row_info.image = res.data[0];
+                }
+                this.avatar = URL.createObjectURL(file.raw);
+            },
+            
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/homeBanners.jsp

@@ -0,0 +1,164 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}banner</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="title"
+                label="标题"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                label="图片"
+                align="center"
+                >
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realImage">
+            </template>
+        </el-table-column>
+        
+        <el-table-column
+        		prop="rank"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="url"
+                label="地址"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '3-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../homeBanner/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'homeBanner?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../homeBanner/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'homeBanner';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/homeSelected.jsp

@@ -0,0 +1,206 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+            
+            
+            <el-form-item label="图片">
+		         <el-upload
+		                    class="avatar-uploader"
+		                    action="../assets/uploadFile"
+		                    :show-file-list="false"
+		                    :on-success="contactAvatarSuccess">
+		                <img v-if="avatar" :src="avatar" class="avatar">
+		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+		            </el-upload>
+		        </el-form-item>
+		        
+                <el-form-item label="标题">
+                    <el-input v-model="row_info.title"></el-input>
+                </el-form-item>
+                
+         <el-form-item
+                label="门店">
+             <el-select v-model="row_info.storeId" clearable filterable   placeholder="请选择店铺">
+			    <el-option
+			      v-for="item in storeInfos"
+			      :key="item.id"
+			      :label="item.title"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+                
+                <el-form-item label="注释">
+                    <el-input v-model="row_info.notice"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="显示价格">
+                    <el-input v-model="row_info.price"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="排序标识">
+                    <el-input v-model="row_info.rank"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../storeInfo/all'
+               }).then(function (res) {
+                   this.storeInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../homeSelected/getHomeSelected',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        
+                        if (res.data.realImage) {
+                            this.avatar = res.data.realImage;
+                        }
+                        
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '4-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	
+                	storeId : '',
+                },
+                storeInfos : [],
+                dialogImageUrl: '',
+                dialogVisible: false,
+                avatar: ''
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.title) {
+                    this.$message.warning('请填写标题');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    delete data.realImage;
+                    $.post({
+                        url: this.edit ? '../homeSelected/update' : '../homeSelected/save',
+                        data: data
+                    
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            
+            handlePictureCardPreview: function (file) {
+                this.dialogImageUrl = file.url;
+                this.dialogVisible = true;
+
+            },
+            contactAvatarSuccess: function (res, file, fileList) {
+                if (res.success) {
+                    this.row_info.image = res.data[0];
+                }
+                this.avatar = URL.createObjectURL(file.raw);
+            },
+            
+        
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/homeSelecteds.jsp

@@ -0,0 +1,175 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}首页精选</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="storeId"
+                label="店铺Id"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                label="图片"
+                align="center"
+                >
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realImage">
+            </template>
+        </el-table-column>
+        
+        <el-table-column
+        		prop="title"
+                label="标题"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="notice"
+                label="注释"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="price"
+                label="显示价格"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="rank"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '4-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../homeSelected/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'homeSelected?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../homeSelected/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'homeSelected';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/index.jsp

@@ -0,0 +1,49 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: 熊竹
+  Date: 2017/3/9
+  Time: 9:53
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        data: function () {
+            return {
+                menu: '',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                }
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+        }.bind(this))(function (e) {
+
+                });
+            }
+        }
+    }) 
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/labelInfo.jsp

@@ -0,0 +1,128 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="标签">
+                    <el-input v-model="row_info.labelName"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../labelInfo/getLabelInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '5-1',
+                user: {
+                    id: '5-2',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.labelName) {
+                    this.$message.warning('请填写标签');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../labelInfo/update' : '../labelInfo/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/labelInfos.jsp

@@ -0,0 +1,145 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}标签</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="labelName"
+                label="标签"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '5-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../labelInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'labelInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../labelInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'labelInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/login.jsp

@@ -0,0 +1,149 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: 熊竹
+  Date: 2017/3/9
+  Time: 11:39
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+    <style lang="scss" scoped>
+        #login-page {
+            width: 100vw;
+            height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            background: #efeeee;
+
+        }
+
+        #login-page .login-form {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            width: 500px;
+            height: 445px;
+            border-radius: 10px;
+            background: white;
+            border: 1px #eaeaea solid;
+            box-shadow: 0px 0px 25px #cac6c6;
+
+        }
+
+        #login-page .login-form .title {
+            color: #20a0ff;
+            font-weight: bold;
+            font-size: 40px;
+            text-align: center;
+            line-height: 2.2;
+            font-family: sans-serif;
+        }
+
+        #login-page .login-form .input-group {
+            margin-top: 30px;
+            width: 80%;
+
+        }
+
+        #login-page .login-form .input-group button {
+            width: 100%;
+        }
+    </style>
+</head>
+<body>
+<div id="app">
+    <div id="login-page" @keyup.enter="login">
+        <div class="login-form">
+            <div class="input-group">
+                <div class="title">享居屋房源管理系统 </div>
+                <el-input
+                        :autofocus="true"
+                        placeholder="请输入用户名"
+                        icon="time"
+                        v-model="username">
+                </el-input>
+            </div>
+            <div class="input-group">
+                <el-input
+                        placeholder="请输入密码"
+                        type="password"
+                        icon="time"
+                        v-model="password">
+                </el-input>
+            </div>
+            <div class="input-group">
+                <el-input
+                        style="width: 280px;"
+                        placeholder="请输入验证码"
+                        icon="time"
+                        v-model="code">
+                </el-input>
+                <img style="width: 80px;    float: right;" src="../auth/image" ref="img" @click="refresh">
+            </div>
+            <div class="input-group">
+                <label>记住我？</label>
+                <el-switch
+                        v-model="rememberMe"
+                        on-text=""
+                        off-text="">
+                </el-switch>
+            </div>
+            <div class="input-group">
+                <el-button @click.native="login" type="primary" :loading="isBtnLoading">{{btnText}}</el-button>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+<script>
+	new Vue({
+		el      : '#app',
+		data    : function () {
+			return {
+				username    : '',
+				password    : '',
+				code        : '',
+				rememberMe  : false,
+				isBtnLoading: false
+			};
+		},
+		computed: {
+			btnText: function () {
+				if (this.isBtnLoading) return '登录中...';
+				return '登录';
+			}
+		},
+		methods : {
+			login  : function () {
+
+				window.location.href = 'index';
+				
+				this.isBtnLoading = true;
+				$.post({
+					url : '../adminInfo/login',
+					data: {
+						userName: this.username,
+						password: this.password,
+						code    : this.code,
+					}
+				}).then(function (res) {
+					this.isBtnLoading = false;
+					if (res.success) {
+						window.location.href = 'index';
+					} else {
+						this.$message.error(res.error);
+					}
+				}.bind(this));
+			},
+			refresh: function () {
+				this.$refs.img.src = '../auth/image' + '?' + Math.random();
+			}
+		}
+	})
+</script>
+</html>

WebRoot/WEB-INF/jsp/newAdmin/memberAccounts.jsp

@@ -0,0 +1,189 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+      	<el-col :xs="24" :sm="6" :md="5" :lg="3">
+            <el-select placeholder="请选择" v-model="userId">
+                <el-option v-for="item in users" :label="item.userName" :value="item.id"></el-option>
+            </el-select>
+        </el-col>
+        <el-col :md="24" :lg="12">
+            <el-button type="primary" @click="getRows">筛 选</el-button>
+        </el-col>
+      
+        <div class="num"> 共{{totalNumber}}银行卡</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="memberId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="accountName"
+                label="姓名"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="bankName"
+                label="开户行"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="bankCardNo"
+                label="卡号"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="bankAddress"
+                label="地址"
+                align="center">
+        </el-table-column>
+     <!--    <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column> -->
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+            
+            $.get({
+                url: '../userInfo/all'
+            }).then(function (res) {
+                if (res.success) {
+                    this.users = this.users.concat(res.data);
+                }
+            }.bind(this));
+        },
+        data: function () {
+            return {
+                menu: '6-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                userId:"",
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                users:[],
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+            	
+            	var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize
+                };
+            	if (this.userId) {
+                    data.memberId = this.userId;
+                }
+            	
+                $.get({
+                    url: '../memberAccount/page',
+                    data: data
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'memberAccount?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../memberAccount/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'memberAccount';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/memberCoinTixians.jsp

@@ -0,0 +1,219 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>美光</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+<div class="filters">
+      	<el-col :xs="24" :sm="6" :md="5" :lg="3">
+            <el-select placeholder="请选择" v-model="userId">
+                <el-option v-for="item in users" :label="item.userName" :value="item.id"></el-option>
+            </el-select>
+        </el-col>
+        <el-col :md="24" :lg="12" :md="5" :lg="3">
+            <el-button type="primary" @click="getRows">筛 选</el-button>
+        </el-col>
+        <div class="num"> 共{{totalNumber}}提现</div>
+      </div>
+        
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="memberId"
+                label="提现人Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="insertTimeStr"
+                label="时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="money"
+                label="金额"
+                align="center">
+        </el-table-column>
+        
+        
+        
+        <el-table-column
+        		prop="accountId"
+                label="银行账户"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="dealUser"
+                label="处理人"
+                align="center">
+        </el-table-column>
+         <el-table-column
+        		prop="txStatus"
+                label="状态"
+                :formatter="formatState"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">通过</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">失败</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+            
+            $.get({
+                url: '../userInfo/all'
+            }).then(function (res) {
+                if (res.success) {
+                    this.users = this.users.concat(res.data);
+                }
+            }.bind(this));
+        },
+        data: function () {
+            return {
+                menu: '6-3',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                userId: '',
+                users:[],
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+            	
+            	var data = {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    };
+                	if (this.userId) {
+                        data.memberId = this.userId;
+                    }
+            	
+                $.get({
+                    url: '../memberCoinTixian/page',
+                    data: data
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            formatState: function (row) {
+                switch (row.txStatus) {
+                    case 0:
+                        return '待处理';
+                    case 1:
+                        return '通过';
+                    case 2:
+                        return '未通过';
+                    default:
+                        return '未知'
+                }
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+            	$.post({
+                    url: '../memberCoinTixian/pass',
+                    data: {
+                        id: row.id,
+        	        	txStatus : 1
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        row.txStatus=1;
+                        row.dealUser = res.data.superUser;
+                    }
+                }.bind(this))
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要失败吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../memberCoinTixian/fail',
+                        data: {
+                            id: row.id,
+                            txStatus : 2
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                    	row.dealUser = res.data.superUser;
+                    	row.txStatus=2;
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'memberCoinTixian';
+            }
+        }
+    })
+</script>
+</html>

WebRoot/WEB-INF/jsp/newAdmin/memberCoins.jsp

@@ -0,0 +1,184 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+      
+      <el-col :xs="24" :sm="6" :md="5" :lg="3">
+            <el-select placeholder="请选择" v-model="userId">
+                <el-option v-for="item in users" :label="item.userName" :value="item.id"></el-option>
+            </el-select>
+        </el-col>
+        <el-col :md="24" :lg="12">
+            <el-button type="primary" @click="getRows">筛 选</el-button>
+        </el-col>
+      
+        <div class="num"> 共{{totalNumber}}余额明细</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="memberId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="insertUser"
+                label="操作人"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="money"
+                label="变动金额"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="balance"
+                label="余额"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="remark"
+                label="备注"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="createTimeStr"
+                label="时间"
+                align="center">
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+            
+            $.get({
+                url: '../userInfo/all'
+            }).then(function (res) {
+                if (res.success) {
+                    this.users = this.users.concat(res.data);
+                }
+            }.bind(this));
+        },
+        data: function () {
+            return {
+                menu: '6-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                userId: '',
+                users:[],
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+            	
+            	var data = {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    };
+                	if (this.userId) {
+                        data.memberId = this.userId;
+                    }
+            	
+                $.get({
+                    url: '../memberCoin/page',
+                    data: data
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'memberCoin?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../memberCoin/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'memberCoin';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/quickComment.jsp

@@ -0,0 +1,134 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="评论">
+                    <el-input v-model="row_info.comment"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="星级">
+                    <el-input v-model="row_info.starLevel"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../quickComment/getQuickComment',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '7-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	starLevel : 5
+                },
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.comment) {
+                    this.$message.warning('请填写评论');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../quickComment/update' : '../quickComment/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/quickComments.jsp

@@ -0,0 +1,150 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}快捷评论</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="comment"
+                label="评论"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="starLevel"
+                label="星级"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '7-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../quickComment/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'quickComment?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../quickComment/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'quickComment';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/rentInfo.jsp

@@ -0,0 +1,554 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+    <style>
+        .img {
+            width: 200px;
+            height: 200px;
+            cursor: zoom-in;
+        }
+
+        .delImg {
+            margin-top: -36px;
+            margin-left: 80px;
+        }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+    <div>
+        <el-form ref="form" :model="row_info" label-width="80px">
+            <el-form-item label="id" v-show="false">
+                <el-input v-model="row_info.id"></el-input>
+            </el-form-item>
+            <el-form-item label="地区">
+                <el-input v-model="row_info.address"></el-input>
+            </el-form-item>
+            <el-form-item label="姓名">
+                <el-input v-model="row_info.name"></el-input>
+            </el-form-item>
+            <el-form-item label="电话">
+                <el-input v-model="row_info.phone"></el-input>
+            </el-form-item>
+            <el-form-item label="身份证">
+                <el-input v-model="row_info.idCard"></el-input>
+            </el-form-item>
+            <el-form-item label="身份证正面">
+                <img class="img" @click="showBig" :src="idCardPhotoA" v-show="idCardPhotoA">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('idCardPhotoA')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="身份证背面">
+                <img class="img" @click="showBig" :src="idCardPhotoB" v-show="idCardPhotoB">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('idCardPhotoB')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="身份证正面" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="idCardPhotoAa" v-show="idCardPhotoAa">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('idCardPhotoAa')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="身份证背面" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="idCardPhotoBb" v-show="idCardPhotoBb">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('idCardPhotoBb')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="资产证明A" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="equityProveA" v-show="equityProveA">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('equityProveA')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+                <!--   <el-button @click.native="deleteImg('equityProveA')">删除</el-button> -->
+            </el-form-item>
+            <el-form-item label="资产证明B" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="equityProveB" v-show="equityProveB">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('equityProveB')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="资产证明C" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="equityProveC" v-show="equityProveC">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('equityProveC')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="资产证明D" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="equityProveD" v-show="equityProveD">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('equityProveD')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="合同A">
+                <img class="img" @click="showBig" :src="contractA" v-show="contractA"><br>
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('contractA')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="合同B">
+                <img class="img" @click="showBig" :src="contractB" v-show="contractB">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('contractB')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="合同C">
+                <img class="img" @click="showBig" :src="contractC" v-show="contractC">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('contractC')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="合同D">
+                <img class="img" @click="showBig" :src="contractD" v-show="contractD">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('contractD')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="房东授权委托书" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="commission" v-show="commission">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('commission')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item class="excess" label="月租金">
+                <el-input v-model="row_info.monthRent"></el-input>
+            </el-form-item>
+
+            <!--   </el-form-item> -->
+            <!--   <el-form-item class="excess" label="租金" v-show="show_Flag==1">
+                 <el-input v-model="row_info.rent"></el-input>
+             </el-form-item>  -->
+
+            <el-form-item class="excess" label="支付方式">
+                <el-input v-model="row_info.payType"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="支付宝户名" v-show="show_Flag==1">
+                <el-input v-model="row_info.alipayName"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="支付宝帐号" v-show="show_Flag==1">
+                <el-input v-model="row_info.alipayCount"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="银行卡户名" v-show="show_Flag==1">
+                <el-input v-model="row_info.bankCardName"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="银行卡卡号" v-show="show_Flag==1">
+                <el-input v-model="row_info.bankCardCount"></el-input>
+            </el-form-item>
+            <el-form-item label="银行卡照片" v-show="show_Flag==1">
+                <img class="img" @click="showBig" :src="bankCardPhoto" v-show="bankCardPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('bankCardPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item label="支付截图">
+                <img class="img" @click="showBig" :src="payPhoto" v-show="payPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile" @click.native="clickAvatar('payPhoto')"
+                           :show-file-list="false" :on-success="handleAvatarSuccess"
+                           :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item class="excess" label="合同开始日期">
+                <el-input v-model="row_info.contractStart"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="合同结束日期">
+                <el-input v-model="row_info.contractEnd"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="空置期" v-show="show_Flag==1">
+                <el-input v-model="row_info.vacancyTime"></el-input>
+            </el-form-item>
+            <el-form-item class="excess" label="年限" v-show="show_Flag==1">
+                <el-input v-model="row_info.ageLimit"></el-input>
+            </el-form-item>
+
+            <el-form-item label="押金收据">
+                <img class="img" @click="showBig" :src="depositPaper" v-show="depositPaper">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('depositPaper')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="水卡卡号">
+                <el-input v-model="row_info.waterMetersNum"></el-input>
+            </el-form-item>
+            <el-form-item label="水卡照片">
+                <img class="img" @click="showBig" :src="waterMetersNumPhoto" v-show="waterMetersNumPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('waterMetersNumPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="水表度数">
+                <el-input v-model="row_info.waterMetersValue"></el-input>
+            </el-form-item>
+            <el-form-item label="水表度数照片">
+                <img class="img" @click="showBig" :src="waterMetersValuePhoto" v-show="waterMetersValuePhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('waterMetersValuePhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="电卡卡号">
+                <el-input v-model="row_info.elecMetersNum"></el-input>
+            </el-form-item>
+            <el-form-item label="电卡照片">
+                <img class="img" @click="showBig" :src="elecMetersNumPhoto" v-show="elecMetersNumPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('elecMetersNumPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <!-- 		<el-form-item label="电卡度数">
+                        <el-input v-model="row_info.elecMetersValue"></el-input>
+                    </el-form-item>
+                    <el-form-item label="电表度数照片">
+                        <img class="img" @click="showBig" :src="elecMetersValuePhoto" v-show="elecMetersValuePhoto">
+                        <el-upload class="avatar-uploader" action="../assets/uploadFile" @click.native="clickAvatar('elecMetersValuePhoto')" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                           <el-button>修改</el-button>
+                        </el-upload>
+                    </el-form-item> -->
+            <el-form-item label="电表峰">
+                <el-input v-model="row_info.elecMetersPeak"></el-input>
+            </el-form-item>
+            <el-form-item label="电表峰照片">
+                <img class="img" @click="showBig" :src="elecMetersPeakPhoto" v-show="elecMetersPeakPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('elecMetersPeakPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="电表谷">
+                <el-input v-model="row_info.elecMetersValley"></el-input>
+            </el-form-item>
+            <el-form-item label="电表谷照片">
+                <img class="img" @click="showBig" :src="elecMetersValleyPhoto" v-show="elecMetersValleyPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('elecMetersValleyPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="电表总">
+                <el-input v-model="row_info.elecMetersSum"></el-input>
+            </el-form-item>
+            <el-form-item label="电表总照片">
+                <img class="img" @click="showBig" :src="elecMetersSumPhoto" v-show="elecMetersSumPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('elecMetersSumPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item label="燃气卡卡号">
+                <el-input v-model="row_info.gasMetersNum"></el-input>
+            </el-form-item>
+            <el-form-item label="燃气卡照片">
+                <img class="img" @click="showBig" :src="gasMetersNumPhoto" v-show="gasMetersNumPhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('gasMetersNumPhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="燃气度数">
+                <el-input v-model="row_info.gasMetersValue"></el-input>
+            </el-form-item>
+            <el-form-item label="燃气度数照片">
+                <img class="img" @click="showBig" :src="gasMetersValuePhoto" v-show="gasMetersValuePhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('gasMetersValuePhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item label="交接单">
+                <img class="img" @click="showBig" :src="handover" v-show="handover">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile" @click.native="clickAvatar('handover')"
+                           :show-file-list="false" :on-success="handleAvatarSuccess"
+                           :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+
+
+            <el-form-item label="中介">
+                <el-input v-model="row_info.medium"></el-input>
+            </el-form-item>
+            <el-form-item label="中介费用" v-if="row_info.medium == '是'">
+                <el-input v-model="row_info.mediumCost"></el-input>
+            </el-form-item>
+            <el-form-item label="收据" v-if="row_info.medium == '是'">
+                <img class="img" @click="showBig" :src="acquittancePhoto" v-show="acquittancePhoto">
+                <el-upload class="avatar-uploader" action="../assets/uploadFile"
+                           @click.native="clickAvatar('acquittancePhoto')" :show-file-list="false"
+                           :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <el-button>修改</el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input v-model="row_info.note"></el-input>
+            </el-form-item>
+            <el-form-item label="开单人">
+                <el-input v-model="row_info.submitter"></el-input>
+            </el-form-item>
+
+            <!-- 		<el-form-item label="type">
+                        <el-input v-model="row_info.type"></el-input>
+                    </el-form-item> -->
+            <!-- <el-form-item label="创建时间">
+                <el-input v-model="row_info.createdTime"></el-input>
+            </el-form-item> -->
+            <!-- <el-form-item label="删除标志">
+                <el-input v-model="row_info.delFlag"></el-input>
+            </el-form-item> -->
+            <el-form-item label="审核">
+
+                <el-input  :value="formatReviewFlag(row_info.reviewFlag)" disabled ></el-input>
+            </el-form-item>
+            <el-form-item label="审核原因">
+                <el-input v-model="row_info.reviewRemark" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="首次支付房租时间">
+                <el-input v-model="row_info.firstPayTime"></el-input>
+            </el-form-item>
+            <el-form-item label="视频">
+                <el-input v-model="row_info.houseVideo"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" v-show='userLimit==2||userLimit==3||userLimit==4' v-if="row_info.reviewFlag=='N'"
+                           @click="onSubmit">{{edit?'修改并保存':'立即创建'}}
+                </el-button>
+                <el-button @click="reback()">返回</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+
+    new Vue({
+        el: '#app',
+
+        data: function () {
+            return {
+                menu: '2-1',
+                user: {
+                    id: '',
+
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                userLimit: '',
+                edit: false,
+                idCardPhotoA: '',
+                idCardPhotoB: '',
+                idCardPhotoAa: '',
+                idCardPhotoBb: '',
+                equityProveA: '',
+                equityProveB: '',
+                equityProveC: '',
+                equityProveD: '',
+                contractA: '',
+                contractB: '',
+                contractC: '',
+                contractD: '',
+                handover: '',
+                commission: '',
+                depositPaper: '',
+                acquittancePhoto: '',
+                waterMetersNumPhoto: '',
+                waterMetersValuePhoto: '',
+                elecMetersNumPhoto: '',
+                elecMetersValuePhoto: '',
+                elecMetersPeakPhoto: '',
+                elecMetersValleyPhoto: '',
+                elecMetersSumPhoto: '',
+                gasMetersNumPhoto: '',
+                gasMetersValuePhoto: '',
+                payPhoto: '',
+                bankCardPhoto: '',
+                row_info: {},
+                show_Flag: '',
+                model: '',
+                imgSrc: 'http://microball.oss-cn-hangzhou.aliyuncs.com/suyuan/application/1510722353962.jpg'
+            };
+        },
+        methods: {
+            logout: function () {
+// 				this.$confirm('确定要注销吗?', '提示', {
+// 					confirmButtonText: '确定',
+// 					cancelButtonText: '取消',
+// 					type: 'info'
+// 				}).then(function () {
+// 					localStorage.removeItem('user');
+// 					this.$router.push({path: '/login'});
+// 				}.bind(this))(function (e) {
+
+// 				});
+            },
+
+            handleAvatarSuccess: function (res, file) {
+                console.log(res);
+                console.log('file   ' + file);
+                this.row_info[this.model] = res.data[0];
+                this[this.model] = URL.createObjectURL(file.raw);
+            },
+            beforeAvatarUpload: function (file) {
+                const isJPG = file.type === 'image/jpeg' || 'image/png';
+                const isLt2M = file.size / 1024 / 1024 < 10;
+
+                if (!isJPG) {
+                    this.$message.error('上传头像图片只能是 JPG 或者 PNG 格式!');
+                }
+                if (!isLt2M) {
+                    this.$message.error('上传头像图片大小不能超过 10MB!');
+                }
+                return isJPG && isLt2M;
+            },
+            clickAvatar: function (file_type) {
+                this.model = file_type;
+
+            },
+            onSubmit: function () {
+                var data = JSON.parse(JSON.stringify(this.row_info));
+                var that = this;
+                $.post({
+                    url: this.edit ? '../rentInfo/update' : '../rentInfo/save',
+                    data: data
+                }).then(function (res) {
+                    if (res.success) {
+                        if (!this.edit) {
+                            that.row_info.id = res.data;
+                        }
+                        that.edit = true;
+                        that.$message.success(that.edit ? '保存成功' : '创建成功');
+                        history.back();
+                    } else {
+                        this.$message.error(that.edit ? '保存失败' : '创建失败');
+                    }
+                })
+            },
+            showBig: function (event) {
+                if (event.srcElement.style.width == '600px') {
+                    event.srcElement.style.width = '200px';
+                    event.srcElement.style.height = '200px';
+                    event.srcElement.style.cursor = 'zoom-in';
+                } else {
+                    event.srcElement.style.width = '600px';
+                    event.srcElement.style.height = '600px';
+                    event.srcElement.style.cursor = 'zoom-out';
+                }
+
+            },
+            deleteImg: function (e) {
+                this[e] = '';
+                this.row_info[e] = '';
+            },
+            reback: function () {
+                window.history.back();
+            },
+            getUserLimit: function () {
+                var that = this;
+                $.get({
+                    url: 'getUserLimit',
+                    data: {}
+                }).then(function (res) {
+                    if (res.success) {
+                        that.userLimit = res.data.limitF;
+                    }
+                }.bind(this))
+            },
+            formatReviewFlag: function (row) {
+                switch (row) {
+                    case 'N':
+                        return '审核中';
+                    case 'Y':
+                        return '通过';
+                    case 'F':
+                        return '不通过';
+                    default:
+                        return '未知'
+                }
+            },
+        },
+        created: function () {
+            this.getUserLimit();
+            var that = this;
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../rentInfo/getRentInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+
+                    that.show_Flag = res.data.type;
+
+                    if (res.success == true) {
+                        that.edit = true;
+                        that.row_info = res.data;
+                        for (var j in res.data) {
+                            that[j] = res.data[j];
+                        }
+                    }
+                });
+            }
+        },
+
+
+
+    })
+</script>
+</html>
+

WebRoot/WEB-INF/jsp/newAdmin/rentInfos.jsp

@@ -0,0 +1,597 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+    <div class="filters">
+        <input id="searchId" class="h34" type="text" name="searchText" value="请输入内容"/>
+        <select id="typeId" v-model="value8" class="h34">
+            <option>请选择类型</option>
+            <option value="name">名字</option>
+            <option value="address">地区</option>
+            <option value="phone">电话</option>
+            <option value="note">备注</option>
+            <option value="submitter">开单人</option>
+        </select>
+        <!-- <el-select v-model="value8" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+         </el-select> -->
+        <el-button type="primary" @click="serchLike()" class="btn34">搜索</el-button>
+        <!--  	<el-button type="primary" @click="create()" class="btn34">创建</el-button>  -->
+        <div class="num"> 共{{totalNumber}}标签</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="address"
+                label="房屋地址"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="租客姓名"
+                align="center">
+        </el-table-column>
+        <!-- 		<el-table-column -->
+        <!-- 				prop="idCard" -->
+        <!-- 				label="身份证号码" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="身份证正面" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.idCardPhotoA"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="idCardPhotoB" -->
+        <!-- 				label="身份证背面" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.idCardPhotoA"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column
+                        prop="equityProveA"
+                        label="资产证明A"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.idCardPhotoA">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="资产证明B"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.equityProveB">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="资产证明C"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.equityProveC">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="资产证明D"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.equityProveD">
+                        </template>
+                </el-table-column> -->
+        <el-table-column
+                prop="phone"
+                label="电话"
+                align="center">
+        </el-table-column>
+        <!-- 		<el-table-column -->
+        <!-- 				prop="contractA" -->
+        <!-- 				label="合同A" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.contractA"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="合同B" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.contractB"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="合同C" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.contractC"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="合同D" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.contractD"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="交接单" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.handover"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- <!-- 		<el-table-column -->
+        <!-- 				label="房东委托授权书" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.commission"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> --> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="押金收据" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.depositPaper"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="waterMetersNum" -->
+        <!-- 				label="水表号" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="水表号照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.waterMetersNumPhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="waterMetersValue" -->
+        <!-- 				label="水表数值" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="水表数值照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.waterMetersValuePhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="waterMetersReadValue" -->
+        <!-- 				label="水表读数" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="水表读数照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.waterMetersReadValuePhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="elecMetersNum" -->
+        <!-- 				label="电表号" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="电表号照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.elecMetersNumPhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="elecMetersValue" -->
+        <!-- 				label="电表数值" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="电表数值照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.elecMetersValuePhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="elecMetersReadValue" -->
+        <!-- 				label="电表读数" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="电表读数照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.elecMetersReadValuePhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="gasMetersNum" -->
+        <!-- 				label="燃气表号" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="燃气表号照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.gasMetersNumPhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="gasMetersValue" -->
+        <!-- 				label="燃气表数值" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="燃气表数值照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.gasMetersValuePhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="gasMetersReadValue" -->
+        <!-- 				label="燃气表读数" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				label="燃气表读数照片" -->
+        <!-- 				align="center"> -->
+        <!-- 				<template scope="scope"> -->
+        <!-- 	                <img class="singleImg" :src="scope.row.gasMetersReadValuePhoto"> -->
+        <!-- 	            </template> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="medium" -->
+        <!-- 				label="中介" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <el-table-column
+                prop="note"
+                label="备注"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="submitter"
+                label="开单人"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="reviewFlag"
+                :formatter="formatReviewFlag"
+                label="审核"
+                align="center">
+        </el-table-column>
+        <!-- 		<el-table-column
+                        prop="type"
+                        label="type"
+                        align="center">
+                </el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="createdTime" -->
+        <!-- 				label="createdTime" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <!-- 		<el-table-column -->
+        <!-- 				prop="delFlag" -->
+        <!-- 				label="delFlag" -->
+        <!-- 				align="center"> -->
+        <!-- 		</el-table-column> -->
+        <el-table-column
+                :context="_self"
+                width="220"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)"
+                           v-show="userLimit==1||userLimit==2||userLimit==3||userLimit==4">查看
+                </el-button>
+                <el-button size="small" @click="auditorRow(row)" v-show="userLimit==2||userLimit==3||userLimit==4" v-if="row.reviewFlag=='N'" >
+                    审核
+                </el-button>
+                <!-- <el-button size="small" @click="editRow(row)" v-show="userLimit==2||userLimit==3">查看</el-button> -->
+                <el-button size="small" type="danger" @click="deleteRow(row)" v-show="userLimit==4">删除
+                </el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+</template>
+
+<template>
+    <el-dialog title="审核" v-model="showDialog">
+        <el-form :model="testimonials"
+                 label-width="120px"
+                 v-loading="loading">
+            <el-form-item label="原因">
+                <el-input v-model="testimonials.content"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="showDialog = false">取 消</el-button>
+            <el-button type="primary" @click="passTestimonials">通 过</el-button>
+            <el-button type="danger" @click="failTestimonials">不通过</el-button>
+        </span>
+    </el-dialog>
+
+</template>
+
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getUserLimit();
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '2-1',
+                user: {
+                    id: '',
+
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                userLimit: '',
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: [],
+                options: [{
+                    value: 'name',
+                    label: '名字'
+                }, {
+                    value: 'address',
+                    label: '地址'
+                }, {
+                    value: 'phone',
+                    label: '电话'
+                }, {
+                    value: 'note',
+                    label: '备注'
+                }],
+                value8: '',
+                showDialog: false,
+                testimonials: {
+                    name: '',
+                    content: ''
+                },
+                auditorId: '',
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getUserLimit: function () {
+                var that = this;
+                $.get({
+                    url: 'getUserLimit',
+                    data: {}
+                }).then(function (res) {
+                    if (res.success) {
+                        that.userLimit = res.data.limitF;
+                    }
+                }.bind(this))
+            },
+            getRows: function () {
+                $.get({
+                    url: '../rentInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize,
+                        type: 2
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'rentInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../rentInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'rentInfo?type=2';
+            },
+            serchLike: function () {
+                console.log(this.value8)
+                var type = $("#typeId").val();
+                var value = $("#searchId").val();
+                var nameVal;
+                var addressVal;
+                var phoneVal;
+                var noteVal;
+                var submitterVal;
+                if (type == 'name') {
+                    nameVal = value;
+                } else if (type == 'address') {
+                    addressVal = value
+                }
+                else if (type == 'phone') {
+                    phoneVal = value
+                } else if (type == 'note') {
+                    noteVal == value
+                }
+                else if (type == 'submitter') {
+                    submitterVal = value
+                }
+                console.log(type + "   " + value);
+                console.log(nameVal + addressVal + phoneVal + noteVal + submitterVal);
+                $.get({
+                    url: '../rentInfo/rentLike',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize,
+                        name: nameVal,
+                        address: addressVal,
+                        phone: phoneVal,
+                        note: noteVal,
+                        submitter: submitterVal,
+                        type: 2
+                    }
+                }).then(function (res) {
+                    console.log(res);
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            auditorRow: function (row) {
+
+                this.auditorId = row.id;
+                this.showDialog = true;
+
+            },
+            passTestimonials: function () {
+                var data = {
+                    id: this.auditorId,
+                    reviewFlag: 'Y',
+                    reviewRemark: this.testimonials.content,
+                    reviewTime: Date.parse(new Date()),
+                };
+
+                $.post({
+                    url: '../rentInfo/update',
+                    data: data,
+                    success: function (res) {
+                        if (res.success) {
+                            this.$message.success('保存成功');
+                            this.getRows();
+                            this.showDialog = false
+                        } else {
+                            this.$message.error('保存失败');
+                        }
+                        this.testimonials = {
+                            name: '',
+                            content: ''
+                        }
+                        this.auditorId = ''
+                    }.bind(this)
+                });
+            },
+            failTestimonials: function () {
+                var data = {
+                    id: this.auditorId,
+                    reviewFlag: 'F',
+                    reviewRemark: this.testimonials.content,
+                    reviewTime: Date.parse(new Date()),
+                };
+
+                $.post({
+                    url: '../rentInfo/update',
+                    data: data,
+                    success: function (res) {
+                        if (res.success) {
+                            this.$message.success('保存成功');
+                            this.getRows();
+                            this.showDialog = false
+                        } else {
+                            this.$message.error('保存失败');
+                        }
+                        this.testimonials = {
+                            name: '',
+                            content: ''
+                        }
+                        this.auditorId = ''
+                    }.bind(this)
+                });
+            },
+            formatReviewFlag: function (row) {
+                switch (row.reviewFlag) {
+                    case 'N':
+                        return '审核中';
+                    case 'Y':
+                        return '通过';
+                    case 'F':
+                        return '不通过';
+                    default:
+                        return '未知'
+                }
+            },
+        }
+    })
+</script>
+</html>
+

WebRoot/WEB-INF/jsp/newAdmin/repairerInfo.jsp

@@ -0,0 +1,236 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="维修人员">
+                    <el-input v-model="row_info.repairerName"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="row_info.telephone"></el-input>
+                </el-form-item>
+              <!--   <el-form-item label="价格">
+                    <el-input v-model="row_info.price"></el-input>
+                </el-form-item> -->
+               <el-form-item label="标签">
+                  <el-select v-model="row_info.label" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in labelInfos"
+					      :key="item.id"
+					      :label="item.labelName"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>
+                
+                
+                
+                  <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  </el-form-item>
+  
+                <!-- <el-form-item label="支持工位">
+                    <el-select v-model="row_info.supportStation" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in stationInfos"
+					      :key="item.id"
+					      :label="item.title"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+					  
+                </el-form-item>
+                
+                <el-form-item label="支持服务">
+                       <el-select v-model="row_info.supportService" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in serviceInfos"
+					      :key="item.id"
+					      :label="item.title"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+                </el-form-item>
+                 -->
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	
+        	
+        	  $.get({
+                  url: '../labelInfo/all'
+              }).then(function (res) {
+                  this.labelInfos = res.data;
+
+              }.bind(this));
+        	  
+        	  
+        	  $.get({
+                  url: '../userInfo/all'
+              }).then(function (res) {
+                  this.userInfos = res.data;
+
+              }.bind(this));
+        	  
+        	  
+        	/*   $.get({
+                  url: '../serviceInfo/all'
+              }).then(function (res) {
+                  this.serviceInfos = res.data;
+
+              }.bind(this));
+        	  
+        	  
+        	  $.get({
+                  url: '../stationInfo/all'
+              }).then(function (res) {
+                  this.stationInfos = res.data;
+
+              }.bind(this));
+        	   */
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../repairerInfo/getRepairerInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        if(res.data.label){
+                        	res.data.label = res.data.label.split(',').map(function(i){return Number(i);});
+                        }
+                        if(!res.data.userId){
+                        	res.data.userId = '';
+                        }
+                        
+                        this.row_info = res.data;
+                        
+                        
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '13-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	label : '',
+                	supportStation : '',
+                	supportService : '',
+                	userId:'',
+                },
+                serviceInfos : [],
+                labelInfos : [],
+                stationInfos : [],
+                userInfos : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.repairerName) {
+                    this.$message.warning('请填写维修人员');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    data.label =  data.label.join();
+                    
+                    $.post({
+                        url: this.edit ? '../repairerInfo/update' : '../repairerInfo/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/repairerInfos.jsp

@@ -0,0 +1,187 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}维修人员</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="repairerName"
+                label="维修人员"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="telephone"
+                label="联系电话"
+                align="center"
+                width="150"
+                >
+        </el-table-column>
+        <el-table-column
+                prop="sex"
+                label="性别"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="label"
+                label="标签"
+                align="center">
+        </el-table-column>
+        <!-- <el-table-column
+                prop="price"
+                label="价格"
+                align="center">
+        </el-table-column> -->
+        <el-table-column
+                prop="icon"
+                label="头像"
+                align="center">
+        </el-table-column>
+        <!-- <el-table-column
+                prop="supportStation"
+                label="支持工位"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="supportService"
+                label="支持服务"
+                align="center">
+        </el-table-column> -->
+        <el-table-column
+                prop="userId"
+                label="用户"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '13-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../repairerInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'repairerInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../repairerInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'repairerInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/repairerOrder.jsp

@@ -0,0 +1,133 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+                <el-form-item label="总费 ">
+                    <el-input v-model="row_info.totlePrice"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="工作时间 ">
+                    <el-input v-model="row_info.workMinute"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="状态 ">
+                    <el-input v-model="row_info.orderStatus"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../userOrder/getUserOrder',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '11-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../userOrder/update' : '../userOrder/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/repairerOrders.jsp

@@ -0,0 +1,190 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <div class="num"> 共{{totalNumber}}订单</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+         <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="repairerId"
+                label="维修Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="storeId"
+                label="门店ID"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="stationId"
+                label="场地"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="remark"
+                label="备注 "
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                prop="createTimeStr"
+                label="预约时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="confirmTimeStr"
+                label="确认时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="endTimeStr"
+                label="结束时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="statusFlag"
+                label="订单状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="报单人"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="orderId"
+                label="用户订单Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <!-- <el-button size="small" @click="editRow(row)">编辑</el-button> -->
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '13-3',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../repairerOrder/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'repairerOrder?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../repairerOrder/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'repairerOrder';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/saleinfo.jsp

@@ -0,0 +1,189 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+	<jsp:include page="head.jsp"/>
+	<title>享居屋房源管理系统</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+	<el-form ref="form" :model="row_info" label-width="80px">
+		<el-form-item label="房屋地址">
+			<el-input v-model="row_info.address"></el-input>
+		</el-form-item>
+		<el-form-item label="房东姓名">
+			<el-input v-model="row_info.name"></el-input>
+		</el-form-item>
+		<el-form-item label="身份证号">
+			<el-input v-model="row_info.idCard"></el-input>
+		</el-form-item>
+		<el-form-item label="身份证正面">
+			<el-input v-model="row_info.idCardPhotoA"></el-input>
+		</el-form-item>
+		<el-form-item label="身份证反面">
+			<el-input v-model="row_info.idCardPhotoB"></el-input>
+		</el-form-item>
+		<el-form-item label="产权证明A">
+			<el-input v-model="row_info.equityProveA"></el-input>
+		</el-form-item>
+		<el-form-item label="产权证明B">
+			<el-input v-model="row_info.equityProveB"></el-input>
+		</el-form-item>
+		<el-form-item label="产权证明C">
+			<el-input v-model="row_info.equityProveC"></el-input>
+		</el-form-item>
+		<el-form-item label="产权证明D">
+			<el-input v-model="row_info.equityProveD"></el-input>
+		</el-form-item>
+		<el-form-item label="房东手机号">
+			<el-input v-model="row_info.phone"></el-input>
+		</el-form-item>
+		<el-form-item label="合同A">
+			<el-input v-model="row_info.contractA"></el-input>
+		</el-form-item>
+		<el-form-item label="合同B">
+			<el-input v-model="row_info.contractB"></el-input>
+		</el-form-item>
+		<el-form-item label="合同C">
+			<el-input v-model="row_info.contractC"></el-input>
+		</el-form-item>
+		<el-form-item label="合同D">
+			<el-input v-model="row_info.contractD"></el-input>
+		</el-form-item>
+		<el-form-item label="交接单">
+			<el-input v-model="row_info.handover"></el-input>
+		</el-form-item>
+		<el-form-item label="commission">
+			<el-input v-model="row_info.commission"></el-input>
+		</el-form-item>
+		<el-form-item label="depositPaper">
+			<el-input v-model="row_info.depositPaper"></el-input>
+		</el-form-item>
+		<el-form-item label="waterMetersCount">
+			<el-input v-model="row_info.waterMetersCount"></el-input>
+		</el-form-item>
+		<el-form-item label="metersCount">
+			<el-input v-model="row_info.metersCount"></el-input>
+		</el-form-item>
+		<el-form-item label="metersPeak">
+			<el-input v-model="row_info.metersPeak"></el-input>
+		</el-form-item>
+		<el-form-item label="metersPeakPhoto">
+			<el-input v-model="row_info.metersPeakPhoto"></el-input>
+		</el-form-item>
+		<el-form-item label="metersValley">
+			<el-input v-model="row_info.metersValley"></el-input>
+		</el-form-item>
+		<el-form-item label="metersValleyPhoto">
+			<el-input v-model="row_info.metersValleyPhoto"></el-input>
+		</el-form-item>
+		<el-form-item label="metersTotal">
+			<el-input v-model="row_info.metersTotal"></el-input>
+		</el-form-item>
+		<el-form-item label="metersTotalPhoto">
+			<el-input v-model="row_info.metersTotalPhoto"></el-input>
+		</el-form-item>
+		<el-form-item label="gasCount">
+			<el-input v-model="row_info.gasCount"></el-input>
+		</el-form-item>
+		<el-form-item label="medium">
+			<el-input v-model="row_info.medium"></el-input>
+		</el-form-item>
+		<el-form-item label="note">
+			<el-input v-model="row_info.note"></el-input>
+		</el-form-item>
+		<el-form-item label="submitter">
+			<el-input v-model="row_info.submitter"></el-input>
+		</el-form-item>
+		<el-form-item label="type">
+			<el-input v-model="row_info.type"></el-input>
+		</el-form-item>
+		<el-form-item label="createdTime">
+			<el-input v-model="row_info.createdTime"></el-input>
+		</el-form-item>
+		<el-form-item label="delFlag">
+			<el-input v-model="row_info.delFlag"></el-input>
+		</el-form-item>
+		<el-form-item>
+			<el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+			<el-button>取消</el-button>
+	</el-form-item>
+	</el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+	function getQueryString(name) {
+		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+		var r = window.location.search.substr(1).match(reg);
+		if (r != null) return unescape(r[2]);
+		return null;
+	}
+	new Vue({
+		el: '#app',
+		created: function () {
+			var id = getQueryString('id');
+			if (id) {
+				$.get({
+					url: '../rentInfo/getRentInfo',
+					data: {
+						id: id
+					}
+				}).then(function (res) {
+					if (res.success) {
+						this.edit = true;
+						this.row_info = res.data;
+					}
+				}.bind(this));
+			}
+		},
+		data: function () {
+			return {
+				menu: '2-1',
+				user: {
+					id: '',
+
+					username: 'admin',
+					avatar: ''
+				},
+				loading: false,
+				edit: false,
+				tab: 1,
+				row_info : {},
+			};
+		},
+		methods: {
+			logout: function () {
+				this.$confirm('确定要注销吗?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'info'
+				}).then(function () {
+					localStorage.removeItem('user');
+					this.$router.push({path: '/login'});
+				}.bind(this)).catch(function (e) {
+
+				});
+			},
+			onSubmit: function () {
+				var data = JSON.parse(JSON.stringify(this.row_info));
+				$.post({
+					url: this.edit ? '../rentInfo/update' : '../rentInfo/save',
+					data: data
+				}).then(function (res) {
+					if (res.success) {
+						if (!this.edit) {
+							this.row_info.id = res.data;
+						}
+						this.edit = true;
+						this.$message.success(this.edit ? '保存成功' : '创建成功');
+					} else {
+						this.$message.error(this.edit ? '保存失败' : '创建失败');
+					}
+				}.bind(this))
+			},
+		}
+	})
+</script>
+</html>
+

WebRoot/WEB-INF/jsp/newAdmin/saleinfos.jsp

@@ -0,0 +1,592 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+    <style>
+        table {
+            width: 6000 pxn;
+        }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+    <div class="filters">
+        <input id="searchId" class="h34" type="text" name="searchText" value="请输入内容"/>
+        <select id="typeId" class="h34">
+            <option>请选择类型</option>
+            <option value="name">名字</option>
+            <option value="address">地区</option>
+            <option value="phone">电话</option>
+            <option value="note">备注</option>
+            <option value="submitter">开单人</option>
+        </select>
+        <!-- <el-select v-model="value8" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+         </el-select> -->
+        <el-button type="primary" @click="serchLike()" class="btn34">搜索</el-button>
+        <!--  	<el-button type="primary" @click="create()">创建</el-button>  -->
+        <div class="num"> 共{{totalNumber}}标签</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="address"
+                label="地区"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="姓名"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="phone"
+                label="电话"
+                align="center">
+        </el-table-column>
+        <!-- 		<el-table-column
+                        prop="idCard"
+                        label="身份证"
+                        align="center">
+                </el-table-column> -->
+        <el-table-column
+                prop="note"
+                label="备注"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="submitter"
+                label="开单人"
+                align="center">
+            <!-- 	<el-table-column
+                        label="身份证正面"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.idCardPhotoA">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="idCardPhotoB"
+                        label="身份证背面"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.idCardPhotoA">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="equityProveA"
+                        label="资产证明A"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.idCardPhotoA">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="资产证明B"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.equityProveB">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="资产证明C"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.equityProveC">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="资产证明D"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.equityProveD">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="contractA"
+                        label="合同A"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.contractA">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="合同B"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.contractB">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="合同C"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.contractC">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="合同D"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.contractD">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="交接单"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.handover">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="房东委托授权书"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.commission">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        label="押金收据"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.depositPaper">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="waterMetersNum"
+                        label="水表号"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="水表号照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.waterMetersNumPhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="waterMetersValue"
+                        label="水表数值"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="水表数值照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.waterMetersValuePhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="waterMetersReadValue"
+                        label="水表读数"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="水表读数照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.waterMetersReadValuePhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="elecMetersNum"
+                        label="电表号"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="电表号照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.elecMetersNumPhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="elecMetersValue"
+                        label="电表数值"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="电表数值照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.elecMetersValuePhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="elecMetersReadValue"
+                        label="电表读数"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="电表读数照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.elecMetersReadValuePhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="gasMetersNum"
+                        label="燃气表号"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="燃气表号照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.gasMetersNumPhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="gasMetersValue"
+                        label="燃气表数值"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="燃气表数值照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.gasMetersValuePhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="gasMetersReadValue"
+                        label="燃气表读数"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="燃气表读数照片"
+                        align="center">
+                        <template scope="scope">
+                            <img class="singleImg" :src="scope.row.gasMetersReadValuePhoto">
+                        </template>
+                </el-table-column>
+                <el-table-column
+                        prop="medium"
+                        label="中介"
+                        align="center">
+                </el-table-column> -->
+
+        </el-table-column>
+
+        <el-table-column
+                prop="reviewFlag"
+                :formatter="formatReviewFlag"
+                label="审核"
+                align="center">
+        </el-table-column>
+        <!-- 		<el-table-column
+                        prop="type"
+                        label="type"
+                        align="center">
+                </el-table-column> -->
+        <!-- 		<el-table-column
+                        prop="createdTime"
+                        label="创建时间"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="delFlag"
+                        label="是否删除"
+                        align="center">
+                </el-table-column> -->
+        <el-table-column
+                :context="_self"
+                width="220"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)" v-show="userLimit==1||userLimit==2||userLimit==3||userLimit==4">查看
+                </el-button>
+                <el-button size="small" @click="auditorRow(row)" v-show="userLimit==2||userLimit==3||userLimit==4" v-if="row.reviewFlag=='N'">
+                    审核
+                </el-button>
+                <!-- <el-button size="small" @click="editRow(row)" v-show="userLimit==2||userLimit==3">修改</el-button> -->
+                <el-button size="small" type="danger" @click="deleteRow(row)" v-show="userLimit==4">删除
+                </el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+</template>
+
+<template>
+    <el-dialog title="审核" v-model="showDialog">
+        <el-form :model="testimonials"
+                 label-width="120px"
+                 v-loading="loading">
+            <el-form-item label="原因">
+                <el-input v-model="testimonials.content"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="showDialog = false">取 消</el-button>
+            <el-button type="primary" @click="passTestimonials">通 过</el-button>
+            <el-button type="danger" @click="failTestimonials">不通过</el-button>
+        </span>
+    </el-dialog>
+
+</template>
+
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getUserLimit();
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '2-2',
+                user: {
+                    id: '',
+
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                userLimit: '',
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: [],
+                showDialog: false,
+                testimonials: {
+                    name: '',
+                    content: ''
+                },
+                auditorId: '',
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getUserLimit: function () {
+                var that = this;
+                $.get({
+                    url: 'getUserLimit',
+                    data: {}
+                }).then(function (res) {
+                    if (res.success) {
+                        that.userLimit = res.data.limitF;
+                    }
+                }.bind(this))
+            },
+            getRows: function () {
+                $.get({
+                    url: '../rentInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize,
+                        type: 1
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'rentInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../rentInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'rentInfo?type=1';
+            },
+            serchLike: function () {
+
+                var type = $("#typeId").val();
+                var value = $("#searchId").val();
+                var nameVal;
+                var addressVal;
+                var phoneVal;
+                var noteVal;
+                var submitterVal;
+                if (type == 'name') {
+                    nameVal = value;
+                } else if (type == 'address') {
+                    addressVal = value;
+                }
+                else if (type == 'phone') {
+                    phoneVal = value;
+                } else if (type == 'note') {
+                    noteVal = value;
+                }
+                else if (type == 'submitter') {
+                    submitterVal = value
+                }
+                ;
+
+                console.log(type + "   " + value);
+                console.log(nameVal + addressVal + phoneVal + noteVal + submitterVal);
+
+                $.get({
+                    url: '../rentInfo/rentLike',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize,
+                        name: nameVal,
+                        address: addressVal,
+                        phone: phoneVal,
+                        note: noteVal,
+                        submitter: submitterVal,
+                        type: 1
+                    }
+                }).then(function (res) {
+                    console.log(res);
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            auditorRow: function (row) {
+
+                this.auditorId = row.id;
+                this.showDialog = true;
+
+            },
+            passTestimonials: function () {
+                var data = {
+                    id: this.auditorId,
+                    reviewFlag: 'Y',
+                    reviewRemark: this.testimonials.content,
+                    reviewTime: Date.parse(new Date()),
+                };
+
+                $.post({
+                    url: '../rentInfo/update',
+                    data: data,
+                    success: function (res) {
+                        if (res.success) {
+                            this.$message.success('保存成功');
+                            this.getRows();
+                            this.showDialog = false
+                        } else {
+                            this.$message.error('保存失败');
+                        }
+                        this.testimonials = {
+                            name: '',
+                            content: ''
+                        }
+                        this.auditorId = ''
+                    }.bind(this)
+                });
+            },
+            failTestimonials: function () {
+                var data = {
+                    id: this.auditorId,
+                    reviewFlag: 'F',
+                    reviewRemark: this.testimonials.content,
+                    reviewTime: Date.parse(new Date()),
+                };
+
+                $.post({
+                    url: '../rentInfo/update',
+                    data: data,
+                    success: function (res) {
+                        if (res.success) {
+                            this.$message.success('保存成功');
+                            this.getRows();
+                            this.showDialog = false
+                        } else {
+                            this.$message.error('保存失败');
+                        }
+                        this.testimonials = {
+                            name: '',
+                            content: ''
+                        }
+                        this.auditorId = ''
+                    }.bind(this)
+                });
+            },
+            formatReviewFlag: function (row) {
+                switch (row.reviewFlag) {
+                    case 'N':
+                        return '审核中';
+                    case 'Y':
+                        return '通过';
+                    case 'F':
+                        return '不通过';
+                    default:
+                        return '未知'
+                }
+            },
+        }
+    })
+</script>
+</html>
+

WebRoot/WEB-INF/jsp/newAdmin/serviceInfo.jsp

@@ -0,0 +1,245 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.config.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.all.js"></script>
+
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+            
+            
+            <el-form-item label="图片">
+		         <el-upload
+		                    class="avatar-uploader"
+		                    action="../assets/uploadFile"
+		                    :show-file-list="false"
+		                    :on-success="contactAvatarSuccess">
+		                <img v-if="avatar" :src="avatar" class="avatar">
+		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+		            </el-upload>
+		        </el-form-item>
+		        
+                <el-form-item label="标题">
+                    <el-input v-model="row_info.title"></el-input>
+                </el-form-item>
+                
+         <el-form-item
+                label="服务">
+             <el-select v-model="row_info.serviceType" clearable filterable   placeholder="请选择服务">
+			    <el-option
+			      v-for="item in serviceTypes"
+			      :key="item.id"
+			      :label="item.typeName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+                 <el-form-item label="价格">
+                    <el-input v-model="row_info.price"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="工作时长">
+                    <el-input v-model="row_info.workMinute"></el-input>
+                </el-form-item>
+                
+                
+                <el-form-item label="摘要">
+                    <el-input v-model="row_info.abstractText"  type="textarea" :rows="2"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="服务内容">
+                    <el-input v-model="row_info.preface"  type="textarea" :rows="2"></el-input>
+                </el-form-item>
+                
+              <el-form-item label="内容">
+            	<script id="container" name="content" type="text/plain"></script>
+    		</el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../serviceType/all'
+               }).then(function (res) {
+                   this.serviceTypes = res.data;
+
+               }.bind(this));
+        	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../serviceInfo/getServiceInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                        if (res.data.realImage) {
+                            this.avatar = res.data.realImage;
+                        }
+                        
+                        var ue = this.editor;
+                        ue.addListener("ready", function () {
+                            //var arr = [];
+                            //arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
+                            ue.setContent(res.data.content, false);
+                        });
+                        
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '8-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	realImage:'',
+                	serviceType :''
+                },
+                serviceTypes : [],
+                dialogImageUrl: '',
+                dialogVisible: false,
+                avatar: '',
+                editor: null,
+            };
+        },
+        
+        
+        mounted: function () {
+            this.editor = UE.getEditor('container', {
+                toolbars: [[
+                    'fullscreen',
+                    'source',
+                    'undo',
+                    'redo',
+                    'bold',
+                    'insertimage',
+                    'justify',
+                    'justifyleft', //居左对齐
+                    'justifyright', //居右对齐
+                    'justifycenter', //居中对齐
+                    'justifyjustify' //两端对齐
+                ]],
+                pasteplain: true,
+                retainOnlyLabelPasted: true
+            });
+        },
+        
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.title) {
+                    this.$message.warning('请填写标题');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    data.content = this.editor.getContent();
+                    delete data.realImage;
+                    $.post({
+                        url: this.edit ? '../serviceInfo/update' : '../serviceInfo/save',
+                        data: data
+                    
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            
+            handlePictureCardPreview: function (file) {
+                this.dialogImageUrl = file.url;
+                this.dialogVisible = true;
+
+            },
+            contactAvatarSuccess: function (res, file, fileList) {
+                if (res.success) {
+                    this.row_info.image = res.data[0];
+                }
+                this.avatar = URL.createObjectURL(file.raw);
+            },
+            
+        
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/serviceInfos.jsp

@@ -0,0 +1,173 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}服务</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="serviceType"
+                label="服务类型"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                label="图片"
+                align="center"
+                >
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realImage">
+            </template>
+        </el-table-column>
+        
+        <el-table-column
+        		prop="title"
+                label="标题"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+        		prop="price"
+                label="价格"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+        		prop="workMinute"
+                label="工作时长（分钟）"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '8-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../serviceInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'serviceInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../serviceInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'serviceInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/serviceType.jsp

@@ -0,0 +1,132 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="类型">
+                    <el-input v-model="row_info.typeName"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="排序">
+                    <el-input v-model="row_info.rank"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../serviceType/getServiceType',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '8-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.typeName) {
+                    this.$message.warning('请填写类型');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../serviceType/update' : '../serviceType/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/serviceTypes.jsp

@@ -0,0 +1,150 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}服务类型</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="typeName"
+                label="类型"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="rank"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '8-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../serviceType/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'serviceType?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../serviceType/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'serviceType';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationArrangement.jsp

@@ -0,0 +1,187 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+         <el-form-item
+                label="场地">
+             <el-select v-model="row_info.stationId" clearable filterable   placeholder="请选择">
+			    <el-option
+			      v-for="item in stationInfos"
+			      :key="item.id"
+			      :label="item.title"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+                
+        <!--  <el-form-item
+                label="间隔">
+             <el-select v-model="row_info.intervalId" clearable filterable   placeholder="请选择">
+			    <el-option
+			      v-for="item in timeIntervals"
+			      :key="item.id"
+			      :label="item.beginTime"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item> -->
+           
+         <el-form-item  label="日期">
+        <el-date-picker v-model="row_info.workDate" type="date" placeholder="日期"
+                            ></el-date-picker>        
+         </el-form-item> 
+                
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../stationInfo/all'
+               }).then(function (res) {
+                   this.stationInfos = res.data;
+
+               }.bind(this));
+        	
+        	   $.get({
+                   url: '../timeInterval/all'
+               }).then(function (res) {
+                   this.timeIntervals = res.data;
+
+               }.bind(this));
+        	   
+        	   
+      /*       var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../stationArrangement/getStationArrangement',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            } */
+        },
+        data: function () {
+            return {
+                menu: '9-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	
+                	stationId : '',
+                	intervalId : '',
+                	workDate : '',
+                	
+                },
+                timeIntervals : [],
+                stationInfos : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.stationId) {
+                    this.$message.warning('请填选择场地');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    if (data.workDate) {
+                    	var myDate = new Date(data.workDate);
+                        data.arrangementDate = myDate.getFullYear()+'-'+(myDate.getMonth()+1)+'-'+myDate.getDate();
+                    }
+                    
+                    
+                    $.post({
+                        url: this.edit ? '../timeInterval/createArrangement' : '../timeInterval/createArrangement',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            //this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationArrangements.jsp

@@ -0,0 +1,179 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}场地排班</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="stationId"
+                label="场地"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="beginTime"
+                label="间隔"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="workDateStr"
+                label="日期"
+                align="center"
+                 width="120"
+                >
+        </el-table-column>
+        <el-table-column
+        		prop="orderId"
+                label="订单"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="userId"
+                label="用户"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="status"
+                label="状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="orderTimeStr"
+                label="订单时间"
+                align="center"
+                 width="120"
+                >
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <!-- <el-button size="small" @click="editRow(row)">编辑</el-button> -->
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '9-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../stationArrangement/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'stationArrangement?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../stationArrangement/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'stationArrangement';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationComment.jsp

@@ -0,0 +1,205 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+         <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="场地">
+             <el-select v-model="row_info.stationId" clearable filterable   placeholder="请选择场地">
+			    <el-option
+			      v-for="item in stationInfos"
+			      :key="item.id"
+			      :label="item.title"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="快速评价">
+             <el-select v-model="row_info.quickId" clearable filterable   placeholder="请选择快速评价">
+			    <el-option
+			      v-for="item in quickComments"
+			      :key="item.id"
+			      :label="item.comment"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+                
+                <el-form-item label="订单id">
+                    <el-input v-model="row_info.orderId"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="评价内容">
+                    <el-input v-model="row_info.content"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="星级">
+                    <el-input v-model="row_info.starLevel"></el-input>
+                </el-form-item>
+                
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../userInfo/all'
+               }).then(function (res) {
+                   this.userInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../stationInfo/all'
+               }).then(function (res) {
+                   this.stationInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../quickComment/all'
+               }).then(function (res) {
+                   this.quickComments = res.data;
+
+               }.bind(this));
+        	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../stationComment/getStationComment',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '7-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+                userInfos : [],
+                stationInfos : [],
+                quickComments : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.stationId) {
+                    this.$message.warning('请填选择场地');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../stationComment/update' : '../stationComment/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationComments.jsp

@@ -0,0 +1,175 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}评论</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="stationId"
+                label="场地Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="orderId"
+                label="订单Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="quickId"
+                label="快速评价"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="content"
+                label="内容"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="starLevel"
+                label="星级"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="createTimeStr"
+                label="时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '7-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../stationComment/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'stationComment?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../stationComment/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'stationComment';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationInfo.jsp

@@ -0,0 +1,277 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <%--<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.config.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.all.js"></script>--%>
+
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+            
+            
+         <%--   <el-form-item label="图片">
+		         <el-upload
+		                    class="avatar-uploader"
+		                    action="../assets/uploadFile"
+		                    :show-file-list="false"
+		                    :on-success="contactAvatarSuccess">
+		                <img v-if="avatar" :src="avatar" class="avatar">
+		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+		            </el-upload>
+		        </el-form-item>--%>
+		        
+                 <el-form-item label="门店">
+                  <el-select v-model="row_info.storeId"  placeholder="请选择">
+					    <el-option
+					      v-for="item in storeInfos"
+					      :key="item.id"
+					      :label="item.title"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>
+                
+               <%--<el-form-item label="类型">
+                  <el-select v-model="row_info.stationType"  placeholder="请选择">
+					    <el-option
+					      v-for="item in stationTypes"
+					      :key="item.id"
+					      :label="item.typeName"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>--%>
+                
+                
+                <el-form-item label="充电桩号">
+                    <el-input v-model="row_info.stationNo"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="标题">
+                    <el-input v-model="row_info.title"></el-input>
+                </el-form-item>
+                
+        
+                 <el-form-item label="价格">
+                    <el-input v-model="row_info.price"></el-input>
+                </el-form-item>
+             <%--
+             <el-form-item label="联系电话">
+                 <el-input v-model="row_info.telephone"></el-input>
+             </el-form-item>
+
+
+             <el-form-item label="摘要">
+                 <el-input v-model="row_info.abstractText"  type="textarea" :rows="2"></el-input>
+             </el-form-item>
+
+           <el-form-item label="内容">
+             <script id="container" name="content" type="text/plain"></script>
+         </el-form-item>
+         --%>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    var __vue = new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	
+
+     	   $.get({
+                url: '../storeInfo/all'
+            }).then(function (res) {
+                this.storeInfos = res.data;
+
+            }.bind(this));
+     	   
+     	  /* $.get({
+                url: '../stationType/all'
+            }).then(function (res) {
+                this.stationTypes = res.data;
+
+            }.bind(this));*/
+     	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../stationInfo/getStationInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        
+                        this.row_info = res.data;
+                       /* if (res.data.realImage) {
+                            this.avatar = res.data.realImage;
+                        }
+                        
+                        var ue = this.editor;
+                        ue.addListener("ready", function () {
+                            //var arr = [];
+                            //arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
+                            ue.setContent(res.data.content, false);
+                        });*/
+                        
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '9-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	//realImage:'',
+                	storeId : '',
+                	//stationType:'',
+                },
+                dialogImageUrl: '',
+                dialogVisible: false,
+                mapDialogVisible: false,
+                avatar: '',
+                editor: null,
+                storeInfos : [],
+                stationTypes : [],
+            };
+        },
+        
+        
+        mounted: function () {
+       /*     this.editor = UE.getEditor('container', {
+                toolbars: [[
+                    'fullscreen',
+                    'source',
+                    'undo',
+                    'redo',
+                    'bold',
+                    'insertimage',
+                    'justify',
+                    'justifyleft', //居左对齐
+                    'justifyright', //居右对齐
+                    'justifycenter', //居中对齐
+                    'justifyjustify' //两端对齐
+                ]],
+                pasteplain: true,
+                retainOnlyLabelPasted: true
+            });
+            */
+            
+        },
+        
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.title) {
+                    this.$message.warning('请填写标题');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    //data.content = this.editor.getContent();
+                    delete data.realImage;
+                    $.post({
+                        url: this.edit ? '../stationInfo/update' : '../stationInfo/save',
+                        data: data
+                    
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            
+            handlePictureCardPreview: function (file) {
+                this.dialogImageUrl = file.url;
+                this.dialogVisible = true;
+
+            },
+            contactAvatarSuccess: function (res, file, fileList) {
+                if (res.success) {
+                    this.row_info.image = res.data[0];
+                }
+                this.avatar = URL.createObjectURL(file.raw);
+            },
+            
+        
+            }
+    })
+    
+    
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationInfos.jsp

@@ -0,0 +1,201 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+    <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}充电桩</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+
+        <%--<el-table-column
+                label="图片"
+                align="center"
+                >
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realImage">
+            </template>
+        </el-table-column>--%>
+
+        <el-table-column
+                prop="storeId"
+                label="门店"
+                align="center"
+        >
+        </el-table-column>
+
+        <el-table-column
+                prop="stationNo"
+                label="充电桩号码"
+                align="center"
+        >
+        </el-table-column>
+
+        <el-table-column
+                prop="title"
+                label="标题"
+                align="center"
+        >
+        </el-table-column>
+
+        <el-table-column
+                prop="price"
+                label="价格"
+                align="center">
+        </el-table-column>
+
+        <%-- <el-table-column
+                 prop="telephone"
+                 label="联系电话"
+                 align="center"
+                 width="150"
+                 >
+         </el-table-column>--%>
+
+        <el-table-column
+                prop="stationStatus"
+                label="状态"
+                align="center"
+        >
+        </el-table-column>
+
+        <%--<el-table-column
+        		prop="typeName"
+                label="类型"
+                align="center"
+                width="150"
+                >
+        </el-table-column>--%>
+
+
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '9-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../stationInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'stationInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../stationInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'stationInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationOrders.jsp

@@ -0,0 +1,221 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <div class="num"> 共{{totalNumber}}订单</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="storeId"
+                label="服务点ID"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="stationId"
+                label="充电桩ID"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="serviceFee"
+                label="费用"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="totlePrice"
+                label="总价"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="workMinute"
+                label="分钟"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="coin"
+                label="余额"
+                align="center">
+        </el-table-column>
+       
+        <el-table-column
+                prop="cash"
+                label="现金"
+                align="center">
+        </el-table-column>
+         <el-table-column
+                prop="couponMoney"
+                label="优惠券抵扣"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                prop="serviceTimeStr"
+                label="预约时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="beginTimeStr"
+                label="使用时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="endTimeStr"
+                label="结束时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="orderStatus"
+                label="订单状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="payTimeStr"
+                label="支付时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="cancelReason"
+                label="取消原因"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userCouponId"
+                label="优惠券Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '11-3',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../stationOrder/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'stationOrder?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../stationOrder/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'stationOrder';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationType.jsp

@@ -0,0 +1,132 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="类型">
+                    <el-input v-model="row_info.typeName"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="排序">
+                    <el-input v-model="row_info.rank"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../stationType/getStationType',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '9-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.typeName) {
+                    this.$message.warning('请填写类型');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../stationType/update' : '../stationType/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/stationTypes.jsp

@@ -0,0 +1,150 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}服务类型</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="typeName"
+                label="类型"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="rank"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '9-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../stationType/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'stationType?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../stationType/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'stationType';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/storeComment.jsp

@@ -0,0 +1,218 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+         <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="门店">
+             <el-select v-model="row_info.storeId" clearable filterable   placeholder="请选择门店">
+			    <el-option
+			      v-for="item in storeInfos"
+			      :key="item.id"
+			      :label="item.title"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="快速评价">
+             <el-select v-model="row_info.quickId" clearable filterable  multiple  placeholder="请选择快速评价">
+			    <el-option
+			      v-for="item in quickComments"
+			      :key="item.id"
+			      :label="item.comment"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+                
+                <el-form-item label="订单id">
+                    <el-input v-model="row_info.orderId"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="评价内容">
+                    <el-input v-model="row_info.content"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="星级">
+                    <el-input v-model="row_info.starLevel"></el-input>
+                </el-form-item>
+                
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../userInfo/all'
+               }).then(function (res) {
+                   this.userInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../storeInfo/all'
+               }).then(function (res) {
+                   this.storeInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../quickComment/all'
+               }).then(function (res) {
+                   this.quickComments = res.data;
+
+               }.bind(this));
+        	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../storeComment/getStoreComment',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                        
+                        if(res.data.quickId){
+                        	res.data.quickId = res.data.quickId.split(',').map(function(i){return Number(i);});
+                        }
+                        
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '7-4',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	userId:'',
+                	storeId : '',
+                	quickId : '',
+                	
+                	
+                },
+                userInfos : [],
+                stationInfos : [],
+                quickComments : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.storeId) {
+                    this.$message.warning('请填选择门店');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    data.quickId =  data.quickId.join();
+                    
+                    $.post({
+                        url: this.edit ? '../storeComment/update' : '../storeComment/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/storeComments.jsp

@@ -0,0 +1,175 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}评论</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="storeId"
+                label="门店Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="orderId"
+                label="订单Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="quickId"
+                label="快速评价"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="content"
+                label="内容"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="starLevel"
+                label="星级"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="createTimeStr"
+                label="时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '7-4',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../storeComment/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'storeComment?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../storeComment/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'storeComment';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/storeInfo.jsp

@@ -0,0 +1,384 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+   <%-- <script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.config.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.all.js"></script>--%>
+
+    <title>领先共享汽车</title>
+    <style>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+            
+            
+         <%--   <el-form-item label="图片">
+		         <el-upload
+		                    class="avatar-uploader"
+		                    action="../assets/uploadFile"
+		                    :show-file-list="false"
+		                    :on-success="contactAvatarSuccess">
+		                <img v-if="avatar" :src="avatar" class="avatar">
+		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+		            </el-upload>
+		        </el-form-item>--%>
+		        
+                <el-form-item label="标题">
+                    <el-input v-model="row_info.title"></el-input>
+                </el-form-item>
+                
+        
+                <%-- <el-form-item label="价格">
+                    <el-input v-model="row_info.price"></el-input>
+                </el-form-item>--%>
+                
+                <el-form-item label="联系电话">
+                    <el-input v-model="row_info.telephone"></el-input>
+                </el-form-item>
+              <!--   <el-form-item label="支持服务">
+                  <el-select v-model="row_info.supportService" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in serviceInfos"
+					      :key="item.id"
+					      :label="item.title"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item> -->
+                <%--<el-form-item label="是否为加盟店">
+                <el-switch
+				  v-model="isFranchisee"
+				  on-color="#13ce66"
+				  off-color="#ff4949">
+				</el-switch>
+				</el-form-item>
+
+                <el-form-item label="加盟商"  v-if="isFranchisee" >
+                  <el-select v-model="row_info.franchiseeId"  clearable filterable  placeholder="请选择">
+					    <el-option
+					      v-for="item in franchiseeInfos"
+					      :key="item.id"
+					      :label="item.userName"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>
+                
+                
+                <el-form-item label="保洁">
+                  <el-select v-model="row_info.technicianId"  clearable filterable  placeholder="请选择">
+					    <el-option
+					      v-for="item in technicianInfos"
+					      :key="item.id"
+					      :label="item.technicianName"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>
+                
+                
+                <el-form-item label="维修工">
+                  <el-select v-model="row_info.repairerId" clearable  filterable  placeholder="请选择">
+					    <el-option
+					      v-for="item in repairerInfos"
+					      :key="item.id"
+					      :label="item.repairerName"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>
+                
+                
+                
+                <el-form-item label="摘要">
+                    <el-input v-model="row_info.abstractText"  type="textarea" :rows="2"></el-input>
+                </el-form-item>
+                
+              <el-form-item label="内容">
+            	<script id="container" name="content" type="text/plain"></script>
+    		</el-form-item>--%>
+    		
+              <el-form-item>
+                    <el-button type="text" @click="mapDialogVisible = true">点击打开地图选择地址</el-button>
+				<template v-if="mapDialogVisible">
+				<iframe id="mapPage" width="100%" height="100%" frameborder=0
+                        src="https://apis.map.qq.com/tools/locpicker?policy=1&search=1&type=1&coord=31.23035,121.47372&key=OFJBZ-SBUHF-MQVJ3-JSFRF-VT3UZ-GNBJX&referer=领先共享汽车">
+                </iframe>
+                </template>
+               </el-form-item>
+               
+               
+    		<el-form-item label="地址">
+                    <el-input v-model="row_info.address"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="详细地址">
+                    <el-input v-model="row_info.addressDetail"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="经度">
+                    <el-input v-model="row_info.longitude"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="纬度">
+                    <el-input v-model="row_info.latitude"></el-input>
+                </el-form-item>
+                
+    		
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    var __vue = new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	
+
+     	  /* $.get({
+                url: '../repairerInfo/all'
+            }).then(function (res) {
+                this.repairerInfos = res.data;
+
+            }.bind(this));
+     	   
+     	   $.get({
+                url: '../technicianInfo/all'
+            }).then(function (res) {
+                this.technicianInfos = res.data;
+
+            }.bind(this));
+     	   
+     	   $.get({
+                url: '../franchiseeInfo/all'
+            }).then(function (res) {
+                this.franchiseeInfos = res.data;
+
+            }.bind(this));*/
+     	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../storeInfo/getStoreInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        
+                       /*  if(res.data.supportService){
+                        	res.data.supportService = res.data.supportService.split(',').map(function(i){return Number(i)});
+                        } */
+                        /*if(!res.data.technicianId){
+                        	res.data.technicianId = '';
+                        }
+                        if(!res.data.repairerId){
+                        	res.data.repairerId = '';
+                        }
+                        if(!res.data.franchiseeId){
+                        	res.data.franchiseeId = '';
+                        }
+                        
+                        if(res.data.isAdmin=="N"){
+                        	this.isFranchisee = true;
+                        }*/
+                        
+                        this.row_info = res.data;
+
+                        /*if (res.data.realImage) {
+                            this.avatar = res.data.realImage;
+                        }
+                        
+                        var ue = this.editor;
+                        ue.addListener("ready", function () {
+                            //var arr = [];
+                            //arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
+                            ue.setContent(res.data.content, false);
+                        });*/
+                        
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '14-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	//realImage:'',
+                	//supportService : '',
+                	//technicianId:'',
+                	//repairerId:'',
+                	//franchiseeId:'',
+                },
+                dialogImageUrl: '',
+                dialogVisible: false,
+                mapDialogVisible: false,
+                avatar: '',
+                editor: null,
+                serviceInfos : [],
+                technicianInfos : [],
+                repairerInfos : [],
+                franchiseeInfos : [],
+                isFranchisee : false,
+            };
+        },
+        
+        
+        mounted: function () {
+        /*    this.editor = UE.getEditor('container', {
+                toolbars: [[
+                    'fullscreen',
+                    'source',
+                    'undo',
+                    'redo',
+                    'bold',
+                    'insertimage',
+                    'justify',
+                    'justifyleft', //居左对齐
+                    'justifyright', //居右对齐
+                    'justifycenter', //居中对齐
+                    'justifyjustify' //两端对齐
+                ]],
+                pasteplain: true,
+                retainOnlyLabelPasted: true
+            });*/
+            
+            
+        },
+        
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.title) {
+                    this.$message.warning('请填写标题');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    //data.content = this.editor.getContent();
+                    //data.supportService =  data.supportService.join();
+                    //data.isAdmin = this.isFranchisee ? 'N' : 'Y';
+                    
+                    delete data.realImage;
+                    $.post({
+                        url: this.edit ? '../storeInfo/update' : '../storeInfo/save',
+                        data: data
+                    
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            
+            handlePictureCardPreview: function (file) {
+                this.dialogImageUrl = file.url;
+                this.dialogVisible = true;
+
+            },
+            contactAvatarSuccess: function (res, file, fileList) {
+                if (res.success) {
+                    this.row_info.image = res.data[0];
+                }
+                this.avatar = URL.createObjectURL(file.raw);
+            },
+            
+        
+            }
+    })
+    
+    
+    
+    window.addEventListener('message', function (event) {
+        // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+        var loc = event.data;
+        if (loc && loc.module == 'locationPicker') {//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+            console.log('location', loc);
+            //console.log('loc.poiaddress', loc.poiaddress);
+            //console.log('loc.poiname', loc.poiname);
+          __vue.$set(__vue.row_info);
+          __vue.row_info.address = loc.poiaddress;
+          __vue.row_info.addressDetail = loc.poiname;
+          __vue.row_info.longitude = loc.latlng.lng;
+          __vue.row_info.latitude = loc.latlng.lat;
+          __vue.mapDialogVisible = false;
+
+        }
+    }, false);
+    
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/storeInfos.jsp

@@ -0,0 +1,208 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}服务点</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        
+       <%-- <el-table-column
+                label="图片"
+                align="center"
+                >
+            <template scope="scope">
+                <img class="singleImg" :src="scope.row.realImage">
+            </template>
+        </el-table-column>--%>
+        
+        <el-table-column
+        		prop="title"
+                label="标题"
+                align="center"
+                >
+        </el-table-column>
+        
+        <%--<el-table-column
+        		prop="price"
+                label="价格"
+                align="center">
+        </el-table-column>--%>
+        
+        <el-table-column
+        		prop="telephone"
+                label="联系电话"
+                align="center"
+                width="150"
+                >
+        </el-table-column>
+        
+    <!--     <el-table-column
+        		prop="supportService"
+                label="支持服务"
+                align="center">
+        </el-table-column> -->
+        
+        
+        <el-table-column
+        		prop="address"
+                label="地址"
+                align="center"
+                >
+        </el-table-column>
+        
+        <el-table-column
+        		prop="addressDetail"
+                label="详细地址"
+                align="center"
+                >
+        </el-table-column>
+        
+      <%--  <el-table-column
+        		prop="isAdmin"
+                label="管理员所有"
+                align="center"
+                >
+        </el-table-column>
+        
+        <el-table-column
+        		prop="franchiseeId"
+                label="加盟商Id"
+                align="center"
+                >
+        </el-table-column>--%>
+        
+        
+        
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '14-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../storeInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'storeInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../storeInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'storeInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianArrangement.jsp

@@ -0,0 +1,185 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+         <el-form-item
+                label="技师">
+             <el-select v-model="row_info.technicianId" clearable filterable   placeholder="请选择">
+			    <el-option
+			      v-for="item in technicianInfos"
+			      :key="item.id"
+			      :label="item.technicianName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+                
+       <!--   <el-form-item
+                label="间隔">
+             <el-select v-model="row_info.intervalId" clearable filterable   placeholder="请选择">
+			    <el-option
+			      v-for="item in timeIntervals"
+			      :key="item.id"
+			      :label="item.beginTime"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item> -->
+           
+         <el-form-item  label="日期">
+        <el-date-picker v-model="row_info.workDate" type="date" placeholder="日期"
+                            ></el-date-picker>        
+         </el-form-item> 
+                
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../technicianInfo/all'
+               }).then(function (res) {
+                   this.technicianInfos = res.data;
+
+               }.bind(this));
+        	
+        	   $.get({
+                   url: '../timeInterval/all'
+               }).then(function (res) {
+                   this.timeIntervals = res.data;
+
+               }.bind(this));
+        	   
+        	   
+          /*   var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../technicianArrangement/getTechnicianArrangement',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            } */
+        },
+        data: function () {
+            return {
+                menu: '10-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	technicianId : '',
+                	intervalId : '',
+                	workDate : '',
+                },
+                timeIntervals : [],
+                technicianInfos : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.technicianId) {
+                    this.$message.warning('请填选择技师');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    if (data.workDate) {
+                    	var myDate = new Date(data.workDate);
+                        data.arrangementDate = myDate.getFullYear()+'-'+(myDate.getMonth()+1)+'-'+myDate.getDate();
+                    }
+                    
+                    
+                    $.post({
+                        url: this.edit ? '../timeInterval/createArrangement' : '../timeInterval/createArrangement',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            //this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianArrangements.jsp

@@ -0,0 +1,179 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}技师排班</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="technicianId"
+                label="技师"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="beginTime"
+                label="间隔"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="workDateStr"
+                label="日期"
+                align="center"
+                 width="120"
+                >
+        </el-table-column>
+        <el-table-column
+        		prop="orderId"
+                label="订单"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="userId"
+                label="用户"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="status"
+                label="状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="orderTimeStr"
+                label="订单时间"
+                align="center"
+                 width="120"
+                >
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+               <!--  <el-button size="small" @click="editRow(row)">编辑</el-button> -->
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '10-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../technicianArrangement/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'technicianArrangement?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../technicianArrangement/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'technicianArrangement';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianComment.jsp

@@ -0,0 +1,205 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+         <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="技师">
+             <el-select v-model="row_info.technicianId" clearable filterable   placeholder="请选择技师">
+			    <el-option
+			      v-for="item in technicianInfos"
+			      :key="item.id"
+			      :label="item.technicianName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="快速评价">
+             <el-select v-model="row_info.quickId" clearable filterable   placeholder="请选择快速评价">
+			    <el-option
+			      v-for="item in quickComments"
+			      :key="item.id"
+			      :label="item.comment"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+                
+                <el-form-item label="订单id">
+                    <el-input v-model="row_info.orderId"></el-input>
+                </el-form-item>
+                
+                
+                 <el-form-item label="评价内容">
+                    <el-input v-model="row_info.content"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="星级">
+                    <el-input v-model="row_info.starLevel"></el-input>
+                </el-form-item>
+                
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../userInfo/all'
+               }).then(function (res) {
+                   this.userInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../technicianInfo/all'
+               }).then(function (res) {
+                   this.technicianInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../quickComment/all'
+               }).then(function (res) {
+                   this.quickComments = res.data;
+
+               }.bind(this));
+        	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../technicianComment/getTechnicianComment',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '7-3',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+                userInfos : [],
+                technicianInfos : [],
+                quickComments : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.stationId) {
+                    this.$message.warning('请填选择场地');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../technicianComment/update' : '../technicianComment/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianComments.jsp

@@ -0,0 +1,175 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}评论</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="technicianId"
+                label="技师Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="orderId"
+                label="订单Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="quickId"
+                label="快速评价"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="content"
+                label="内容"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="starLevel"
+                label="星级"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="createTimeStr"
+                label="时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '7-3',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../technicianComment/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'technicianComment?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../technicianComment/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'technicianComment';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianInfo.jsp

@@ -0,0 +1,233 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="技师名">
+                    <el-input v-model="row_info.technicianName"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="row_info.telephone"></el-input>
+                </el-form-item>
+              <!--   <el-form-item label="价格">
+                    <el-input v-model="row_info.price"></el-input>
+                </el-form-item> -->
+               <el-form-item label="标签">
+                  <el-select v-model="row_info.label" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in labelInfos"
+					      :key="item.id"
+					      :label="item.labelName"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+  
+                </el-form-item>
+                
+                
+                      <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  </el-form-item>
+  
+                <!-- <el-form-item label="支持工位">
+                    <el-select v-model="row_info.supportStation" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in stationInfos"
+					      :key="item.id"
+					      :label="item.title"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+					  
+                </el-form-item>
+                
+                <el-form-item label="支持服务">
+                       <el-select v-model="row_info.supportService" multiple placeholder="请选择">
+					    <el-option
+					      v-for="item in serviceInfos"
+					      :key="item.id"
+					      :label="item.title"
+					      :value="item.id">
+					    </el-option>
+					  </el-select>
+                </el-form-item>
+                 -->
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	
+        	
+        	  $.get({
+                  url: '../labelInfo/all'
+              }).then(function (res) {
+                  this.labelInfos = res.data;
+
+              }.bind(this));
+        	  
+        	  
+        	  $.get({
+                  url: '../userInfo/all'
+              }).then(function (res) {
+                  this.userInfos = res.data;
+
+              }.bind(this));
+        	  
+        	/*   $.get({
+                  url: '../serviceInfo/all'
+              }).then(function (res) {
+                  this.serviceInfos = res.data;
+
+              }.bind(this));
+        	  
+        	  
+        	  $.get({
+                  url: '../stationInfo/all'
+              }).then(function (res) {
+                  this.stationInfos = res.data;
+
+              }.bind(this));
+        	   */
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../technicianInfo/getTechnicianInfo',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        if(res.data.label){
+                        	res.data.label = res.data.label.split(',').map(function(i){return Number(i);});
+                        }
+                        
+                        if(!res.data.userId){
+                        	res.data.userId = '';
+                        }
+                        
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '10-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	label : '',
+                	supportStation : '',
+                	supportService : '',
+                	userId:'',
+                },
+                serviceInfos : [],
+                labelInfos : [],
+                stationInfos : [],
+                userInfos : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.technicianName) {
+                    this.$message.warning('请填写技师名');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    data.label =  data.label.join();
+                    
+                    $.post({
+                        url: this.edit ? '../technicianInfo/update' : '../technicianInfo/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianInfos.jsp

@@ -0,0 +1,187 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}保洁</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="technicianName"
+                label="技师名"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="telephone"
+                label="联系电话"
+                align="center"
+                width="150"
+                >
+        </el-table-column>
+        <el-table-column
+                prop="sex"
+                label="性别"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="label"
+                label="标签"
+                align="center">
+        </el-table-column>
+        <!-- <el-table-column
+                prop="price"
+                label="价格"
+                align="center">
+        </el-table-column> -->
+        <el-table-column
+                prop="icon"
+                label="头像"
+                align="center">
+        </el-table-column>
+        <!-- <el-table-column
+                prop="supportStation"
+                label="支持工位"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="supportService"
+                label="支持服务"
+                align="center">
+        </el-table-column> -->
+        <el-table-column
+                prop="userId"
+                label="用户"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '10-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../technicianInfo/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'technicianInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../technicianInfo/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'technicianInfo';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianOrder.jsp

@@ -0,0 +1,133 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+                <el-form-item label="总费 ">
+                    <el-input v-model="row_info.totlePrice"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="工作时间 ">
+                    <el-input v-model="row_info.workMinute"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="状态 ">
+                    <el-input v-model="row_info.orderStatus"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../userOrder/getUserOrder',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '11-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../userOrder/update' : '../userOrder/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/technicianOrders.jsp

@@ -0,0 +1,190 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <div class="num"> 共{{totalNumber}}订单</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+          <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="technicianId"
+                label="保洁Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="storeId"
+                label="门店ID"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="stationId"
+                label="场地"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="remark"
+                label="备注 "
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                prop="createTimeStr"
+                label="预约时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="confirmTimeStr"
+                label="确认时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="endTimeStr"
+                label="结束时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="statusFlag"
+                label="订单状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="报单人"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="orderId"
+                label="用户订单Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <!-- <el-button size="small" @click="editRow(row)">编辑</el-button> -->
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '10-3',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../technicianOrder/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'technicianOrder?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../technicianOrder/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'technicianOrder';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/timeInterval.jsp

@@ -0,0 +1,134 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="开始时间">
+                    <el-input v-model="row_info.beginTime"></el-input>
+                </el-form-item>
+                <el-form-item label="结束时间">
+                    <el-input v-model="row_info.endTime"></el-input>
+                </el-form-item>
+                <el-form-item label="排序">
+                    <el-input v-model="row_info.rank"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../timeInterval/getTimeInterval',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '12-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.beginTime) {
+                    this.$message.warning('请填写时间');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../timeInterval/update' : '../timeInterval/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/timeIntervals.jsp

@@ -0,0 +1,155 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}时间间隔</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="beginTime"
+                label="开始时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="endTime"
+                label="结束时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="rank"
+                label="排序"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '12-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../timeInterval/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'timeInterval?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../timeInterval/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'timeInterval';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/userCoupon.jsp

@@ -0,0 +1,182 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+         <el-form-item
+                label="优惠券">
+             <el-select v-model="row_info.couponId" clearable filterable   placeholder="请选择服务">
+			    <el-option
+			      v-for="item in couponInfos"
+			      :key="item.id"
+			      :label="item.name"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  
+        </el-form-item>
+        
+         <el-form-item
+                label="用户">
+             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
+			    <el-option
+			      v-for="item in userInfos"
+			      :key="item.id"
+			      :label="item.nickName"
+			      :value="item.id">
+			    </el-option>
+			  </el-select>
+  </el-form-item>
+        
+        <el-form-item  label="结束日期">
+        <el-date-picker v-model="row_info.endTime" type="date" placeholder="结束日期"
+                            ></el-date-picker>        
+         </el-form-item> 
+           
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+        	
+        	   $.get({
+                   url: '../couponInfo/all'
+               }).then(function (res) {
+                   this.couponInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   $.get({
+                   url: '../userInfo/all'
+               }).then(function (res) {
+                   this.userInfos = res.data;
+
+               }.bind(this));
+        	   
+        	   
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../userCoupon/getUserCoupon',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '2-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	endTime:'',
+                	userId:'',
+                	couponId:'',
+                },
+                userInfos : [],
+                couponInfos : [],
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                if (!this.row_info.couponId) {
+                    this.$message.warning('请填写优惠券');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    
+                    if (data.endTime) {
+                        data.endTime = Date.parse(new Date(data.endTime));
+                    }
+                    
+                    $.post({
+                        url: this.edit ? '../userCoupon/update' : '../userCoupon/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/userCoupons.jsp

@@ -0,0 +1,162 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <el-button type="primary" @click="create()">创建</el-button>
+        <div class="num"> 共{{totalNumber}}用户优惠券</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="couponId"
+                label="优惠券"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="userId"
+                label="用户id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+        		prop="endTimeStr"
+                label="结束时间"
+                align="center"
+                width="120"
+                >
+        </el-table-column>
+        <el-table-column
+        		prop="isUsed"
+                label="是否使用"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '2-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../userCoupon/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'userCoupon?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../userCoupon/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'userCoupon';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/userInfo.jsp

@@ -0,0 +1,186 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>享居屋房源管理系统</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                <el-form-item label="用户名">
+                    <el-input v-model="row_info.userName"></el-input>
+                </el-form-item>
+                
+           <!--      <el-form-item label="姓名">
+                    <el-input v-model="row_info.nickName"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="性别">
+                    <el-input v-model="row_info.sex"></el-input>
+                </el-form-item> -->
+                
+                
+                 <el-form-item label="区域">
+                    <el-input v-model="row_info.address"></el-input>
+                </el-form-item>
+                <el-form-item label="权限" v-if="userLimit==4" >
+                     <el-radio-group v-model="row_info.limitF">
+					      <el-radio-button label="1">业务员</el-radio-button>
+					      <el-radio-button label="2">经理</el-radio-button>
+					      <el-radio-button label="3">区域经理</el-radio-button>
+					      <el-radio-button label="4" v-if="userLimit==4">管理员</el-radio-button>
+   					 </el-radio-group>
+                </el-form-item>
+<!--                  <el-form-item label="真实姓名">
+                    <el-input v-model="row_info.realName"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="身份证">
+                    <el-input v-model="row_info.idCard"></el-input>
+                </el-form-item>
+                
+                 <el-form-item label="余额">
+                    <el-input v-model="row_info.moneyCoin"></el-input>
+                </el-form-item>
+                -->
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit" v-if="userLimit==4" >{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',                                                                                                                                                                         
+        created: function () {
+            this.getUserLimit();
+
+            var id = getQueryString('id');
+            var userName = getQueryString('userName');console.info(userName);
+            var address = getQueryString('address');
+            if (id) {
+            	this.edit = true;
+            	this.row_info.id = id;            
+                $.get({
+                    url: 'userId',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this)); 
+            }
+        }, 
+        data: function () {
+            return {
+                menu: '1-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {
+                	userName: '',
+                	address: ''
+                },
+                userLimit:'',
+            };
+        },
+        methods: {
+            /* logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            }, */
+            getUserLimit: function () {
+                var that = this;
+                $.get({
+                    url: 'getUserLimit',
+                    data: {}
+                }).then(function (res) {
+                    if (res.success) {
+                        that.userLimit = res.data.limitF;
+                    }
+                }.bind(this))
+            },
+            onSubmit: function () {
+                if (!this.row_info.userName) {
+                    this.$message.warning('请填写用户名');
+                }  else {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    console.log(data);
+                    $.post({
+                        url: this.edit ? 'updateUser' : 'saveUser',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                            window.history.back();
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+                }
+            },
+            reback: function(){
+            	window.history.back();
+            }
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/userInfos.jsp

@@ -0,0 +1,256 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <meta charset="utf-8">
+    <title>享居屋房源管理系统</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+    <div class="filters">
+        <el-button type="primary" @click="create()" v-if="userLimit==4" >创建</el-button>
+        <el-select v-model="limitFKey" clearable filterable placeholder="请选择权限" @change="getRows">
+            <el-option value="1" label="业务员">
+            </el-option>
+            <el-option value="2" label="经理">
+            </el-option>
+            <el-option value="3" label="区域经理">
+            </el-option>
+            <el-option value="4" label="管理员">
+            </el-option>
+        </el-select>
+        <!--     <div class="num"> 共{{totalNumber}}用户</div> -->
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <!--          <el-table-column -->
+        <!--                 prop="id" -->
+        <!--                 label="id" -->
+        <!--                 align="center" v-show="false"> -->
+        <!--         </el-table-column> -->
+        <el-table-column
+                prop="userName"
+                label="用户名"
+                align="center">
+        </el-table-column>
+        <!--         <el-table-column
+                        prop="id"
+                        label="id"
+                        align="center">
+                </el-table-column> -->
+        <el-table-column
+                prop="address"
+                label="区域"
+                align="center">
+        </el-table-column>
+        <!--          <el-table-column -->
+        <!--         		prop="limitF" -->
+        <!--                 label="权限" -->
+        <!--                 align="center"> -->
+        <!--         </el-table-column> -->
+        <el-table-column
+                label="权限"
+                align="center">
+            <template scope="scope">
+                <span v-if="scope.row.limitF==1">业务员</span>
+                <span v-else-if="scope.row.limitF==2">经理</span>
+                <span v-else-if="scope.row.limitF==3">区域经理</span>
+                <span v-else-if="scope.row.limitF==4">管理员</span>
+            </template>
+        </el-table-column>
+        <!--  <el-table-column
+                 label="头像"
+                 align="center">
+                  <template scope="scope">
+                 <img class="userIcon" :src="scope.row.icon">
+             </template>
+         </el-table-column> -->
+        <!--    <el-table-column
+                   prop="delFlag"
+                   label="delFlag"
+                   align="center">
+           </el-table-column> -->
+        <!--         <el-table-column
+                        prop="realName"
+                        label="真实姓名"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="idCard"
+                        label="身份证"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="moneyCoin"
+                        label="余额"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="openId"
+                        label="openId"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="technicianId"
+                        label="技师"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="realFlag"
+                        label="实名认证"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="depositNum"
+                        label="押金"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="depositFlag"
+                        label="是否缴纳押金"
+                        align="center">
+                </el-table-column> -->
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" @click="editRow(row)" v-show="userLimit==4">编辑</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)" v-show="userLimit==4">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getUserLimit();
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '1-2',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: [],
+                limitFKey: '',
+                userLimit:'',
+            };
+        },
+        methods: {
+            /* logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            }, */
+            getUserLimit: function () {
+                var that = this;
+                $.get({
+                    url: 'getUserLimit',
+                    data: {}
+                }).then(function (res) {
+                    if (res.success) {
+                        that.userLimit = res.data.limitF;
+                    }
+                }.bind(this))
+            },
+            getRows: function () {
+                $.get({
+                    url: 'getUserInfo',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize,
+                        limitF: this.limitFKey,
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        console.log(res.data);
+
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'userInfo?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: 'delUser',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                        window.location.href = "toUserInfo";
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location.href = "userInfo"
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/userOrder.jsp

@@ -0,0 +1,133 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+    <style>.avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #20a0ff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    </style>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+            <el-form ref="form" :model="row_info" label-width="80px">
+                
+                <el-form-item label="总费 ">
+                    <el-input v-model="row_info.totlePrice"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="工作时间 ">
+                    <el-input v-model="row_info.workMinute"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="状态 ">
+                    <el-input v-model="row_info.orderStatus"></el-input>
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
+                    <el-button>取消</el-button>
+                </el-form-item>
+            </el-form>
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    }
+    new Vue({
+        el: '#app',
+        created: function () {
+            var id = getQueryString('id');
+            if (id) {
+                $.get({
+                    url: '../userOrder/getUserOrder',
+                    data: {
+                        id: id
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.edit = true;
+                        this.row_info = res.data;
+                    }
+                }.bind(this));
+            }
+        },
+        data: function () {
+            return {
+                menu: '11-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                edit: false,
+                tab: 1,
+                row_info : {},
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            onSubmit: function () {
+                    var data = JSON.parse(JSON.stringify(this.row_info));
+                    $.post({
+                        url: this.edit ? '../userOrder/update' : '../userOrder/save',
+                        data: data
+                    }).then(function (res) {
+                        if (res.success) {
+                            if (!this.edit) {
+                                this.row_info.id = res.data;
+                            }
+                            this.edit = true;
+                            this.$message.success(this.edit ? '保存成功' : '创建成功');
+                        } else {
+                            this.$message.error(this.edit ? '保存失败' : '创建失败');
+                        }
+                    }.bind(this))
+            },
+            }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/newAdmin/userOrders.jsp

@@ -0,0 +1,304 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <jsp:include page="head.jsp"/>
+    <title>领先共享汽车</title>
+</head>
+<body>
+<jsp:include page="contentBefore.jsp"/>
+<template>
+      <div class="filters">
+        <div class="num"> 共{{totalNumber}}订单</div>
+    </div>
+
+    <el-table :data="rows"
+              ref="table"
+              style="width: 100%"
+              element-loading-text="拼命加载中"
+              stripe
+              v-loading="loading">
+        <el-table-column
+                type="index"
+                width="70"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userId"
+                label="用户Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="carId"
+                label="车辆ID"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="serviceFee"
+                label="租车费用"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="safeFee"
+                label="保险"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="technicianFee"
+                label="总价"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="totlePrice"
+                label="总价"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="leaseDays"
+                label="租赁天数"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="coin"
+                label="余额"
+                align="center">
+        </el-table-column>
+       
+        <el-table-column
+                prop="cash"
+                label="现金"
+                align="center">
+        </el-table-column>
+         <el-table-column
+                prop="couponMoney"
+                label="优惠券抵扣"
+                align="center">
+        </el-table-column>
+        
+        <el-table-column
+                prop="serviceTimeStr"
+                label="预约时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="beginTimeStr"
+                label="使用时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="endTimeStr"
+                label="结束时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="orderStatus"
+                label="订单状态"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="payTimeStr"
+                label="支付时间"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="cancelReason"
+                label="取消原因"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="userCouponId"
+                label="优惠券Id"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="takeMode"
+                label="取车方式"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="takeStoreId"
+                label="取车服务点"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="takeAddress"
+                label="取车地址"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="returnMode"
+                label="还车方式"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="returnStoreId"
+                label="还车服务点"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="returnAddress"
+                label="还车地址"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                :context="_self"
+                width="150"
+                inline-template
+                label="操作"
+                align="center">
+            <div>
+                <el-button size="small" v-if="row.orderStatus==0" @click="editRow(row)">编辑</el-button>
+                <el-button size="small" v-if="row.orderStatus==1" @click="takeCar(row)">取车</el-button>
+                <el-button size="small" v-if="row.orderStatus==2" @click="returnCar(row)">还车</el-button>
+                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
+            </div>
+        </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrapper" v-show="!loading">
+        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
+                       :page-size="pageSize"
+                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
+        </el-pagination>
+    </div>
+
+</template>
+<jsp:include page="contentAfter.jsp"/>
+</body>
+<script>
+    new Vue({
+        el: '#app',
+        created: function () {
+            this.getRows();
+        },
+        data: function () {
+            return {
+                menu: '11-1',
+                user: {
+                    id: '',
+                    username: 'admin',
+                    avatar: ''
+                },
+                loading: false,
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                rows: []
+            };
+        },
+        methods: {
+            logout: function () {
+                this.$confirm('确定要注销吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'info'
+                }).then(function () {
+                    localStorage.removeItem('user');
+                    this.$router.push({path: '/login'});
+                }.bind(this)).catch(function (e) {
+
+                });
+            },
+            getRows: function () {
+                $.get({
+                    url: '../userOrder/page',
+                    data: {
+                        currentPage: this.currentPage,
+                        pageNumber: this.pageSize
+                    }
+                }).then(function (res) {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.rows = res.data.pp;
+                    }
+                }.bind(this))
+            },
+            pageChange: function (page) {
+                this.currentPage = page;
+                this.getRows();
+            },
+            sizeChange: function (size) {
+                this.pageSize = size;
+                this.getRows();
+            },
+            editRow: function (row) {
+                window.location = 'userOrder?id=' + row.id;
+            },
+            deleteRow: function (row) {
+                this.$confirm('确定要删除吗?', '提示', {
+                    confirmButtonText: '删除',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../userOrder/del',
+                        data: {
+                            id: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('删除成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            takeCar: function (row) {
+                this.$confirm('确定要取车吗?', '提示', {
+                    confirmButtonText: '取车',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../userOrder/takeCar',
+                        data: {
+                            orderId: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('取车成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('取车失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            returnCar: function (row) {
+                this.$confirm('确定要还车吗?', '提示', {
+                    confirmButtonText: '还车',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return $.post({
+                        url: '../userOrder/returnCar',
+                        data: {
+                            orderId: row.id
+                        }
+                    })
+                }.bind(this)).then(function (res) {
+                    if (res.success) {
+                        this.$message.success('还车成功');
+                        this.getRows();
+                    } else {
+                        this.$message.error('还车失败');
+                    }
+                }.bind(this)).catch(function () {
+
+                });
+            },
+            create: function () {
+                window.location = 'userOrder';
+            }
+        }
+    })
+</script>
+
+
+</html>

WebRoot/WEB-INF/jsp/pay.jsp

@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>支付订单</title>
+</head>
+<body>
+  <script>
+	  window.location.href = "../userOrder/wxbuy?orderId="+'${orderId}'+"&coin="+'${coin}'+"&userCouponId="+'${userCouponId}'+"&openId="+'${openId}';
+  
+</script>
+</body>
+</html>

WebRoot/WEB-INF/jsp/payRecharge.jsp

@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>支付订单</title>
+</head>
+<body>
+  <script>
+	  window.location.href = "../userOrder/wxRecharge?userId="+'${userId}'+"&fee="+'${fee}'+"&openId="+'${openId}'+"&typeFlag="+'${typeFlag}';
+  
+</script>
+</body>
+</html>

WebRoot/WEB-INF/jsp/payRechargeTemp.jsp

@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<script src="${pageContext.request.contextPath }/js/jquery.min.js"></script>
+<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>   
+<script src="${pageContext.request.contextPath }/js/wxUtil.js"></script> 
+<script src="${pageContext.request.contextPath }/js/wxRecharge.js"></script>
+    <title>支付订单</title>
+</head>
+<body>
+  <script>
+  $(function () {
+	  
+	   wxRecharge('${openId}','${userId}','${fee}','${typeFlag}');
+  });
+</script>
+</body>
+</html>

WebRoot/WEB-INF/jsp/payTemp.jsp

@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<script src="${pageContext.request.contextPath }/js/jquery.min.js"></script>
+<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>   
+<script src="${pageContext.request.contextPath }/js/wxUtil.js"></script> 
+<script src="${pageContext.request.contextPath }/js/wxpay.js"></script>
+    <title>支付订单</title>
+</head>
+<body>
+  <script>
+  $(function () {
+	  
+	   wxRecharge('${openId}','${orderId}','${coin}','${userCouponId}');
+  });
+</script>
+</body>
+</html>