makemoney-server.git

File was renamed from app/src/main/resources/static/7aed59d33d777100/user/user_info_list.html
			@@ -3,19 +3,22 @@

			<head>
			<meta charset="UTF-8">
			<title>用户信息列表</title>
			<title>用户登录记录列表</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport"
			content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
			<link rel="stylesheet" href="../css/font.css">
			<link rel="stylesheet" href="../css/xadmin.css">
			<script src="../lib/layui/layui.js" charset="utf-8"></script>
			<link rel="stylesheet" href="../css/theme3049.min.css">
			<script src="../js/vue.min.js" type="text/javascript" charset="utf-8"></script>
			<script type="text/javascript" src="../js/xadmin.js"></script>
			<script src="../js/http.js" type="text/javascript" charset="utf-8"></script>
			<script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>

			<link rel="stylesheet" href="/admin/css/font.css">
			<link rel="stylesheet" href="/admin/css/xadmin.css">
			<link rel="stylesheet" href="/admin/css/theme3049.min.css">

			<script src="/admin/lib/layui/layui.js" charset="utf-8"></script>
			<script src="/admin/js/vue.min.js" type="text/javascript" charset="utf-8"></script>
			<script src="/admin/js/xadmin.js" type="text/javascript"></script>
			<script src="/admin/js/http.js" type="text/javascript" charset="utf-8"></script>
			<script src="/admin/js/jquery.min.js" type="text/javascript"></script>
			<script src="/admin/js/utils.js"></script>
			<!--[if lt IE 9]>
			<script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
			<script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
			@@ -50,7 +53,7 @@
			class="layui-input">
			</div>
			<div class="layui-inline layui-show-xs-block">
			<input type="text" name="key" lay-verify="" placeholder="请输入用户ID" autocomplete="off"
			<input type="text" name="uid" lay-verify="" placeholder="请输入用户ID" autocomplete="off"
			class="layui-input">
			</div>
			<div class="layui-inline layui-show-xs-block">
			@@ -68,6 +71,7 @@
			</div>
			</div>
			</body>


			<script type="text/html" id="deleteContainer">
			<div class="layui-btn-container">
			@@ -158,26 +162,36 @@

			tableIns = table.render({
			elem: '#table_list',
			url: "/admin/api/user/list",
			url: "/admin/api/user/loginrecord/list",
			toolbar: "#toolbar",
			totalRow: true,
			cols: [[{type: 'checkbox', title: "ID"},
			{field: 'id', width: 120, sort: false, title: "用户ID"},
			{field: 'nickName', width: 120, sort: false, title: "昵称"},
			cols: [[
			{field: 'id', width: 200, sort: false, title: "ID"},
			{field: 'uid', width: 120, sort: false, title: "用户ID"},
			{field: 'loginIPInfo', width: 180, sort: false, title: "登录IP信息"},
			{
			field: 'portrait',
			template: "<img src='{{d.portrait}}'>",
			field: 'loginType',
			width: 120,
			sort: false,
			title: "头像"
			title: "登录类型",
			templet: function (res) {
			switch (res.loginType) {
			case 1:
			return "电话";
			case 2:
			return "微信";
			case 3:
			return "QQ";
			case 4:
			return "邮箱";
			default:
			return "未知";
			}


			}
			},
			{field: 'phone', width: 120, sort: false, title: "电话"},
			{field: 'email', width: 120, sort: false, title: "邮箱"},
			{field: 'wxUser', width: 120, sort: false, title: "微信用户信息"},
			{field: 'qqUser', width: 120, sort: false, title: "QQ用户信息"},
			{field: 'createTime', width: 120, sort: false, title: "创建时间"},
			{field: 'updateTime', width: 120, sort: false, title: "修改时间"},
			{fixed: 'right', width: 80, title: "操作", toolbar: '#deleteContainer'}]],
			{field: 'createTime', width: 150, sort: false, title: "登录时间"}]],
			page: true,
			parseData: function (res) { //res 即为原始返回的数据
			if (res.code != 0)
			@@ -199,7 +213,7 @@
			});

			//头工具栏事件
			table.on('toolbar(app)',
			tableIns.on('toolbar(app)',
			function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			@@ -238,6 +252,10 @@
			});
			},
			search: function (params) {
			if (isNaN(params["uid"])) {
			delete params["uid"];
			}

			//数据重载
			tableIns.reload({
			where: params,