Merge remote-tracking branch 'origin/apiadmin-v2.0' into apiadmin-v2.0

This commit is contained in:
zhaoxiang 2017-06-26 13:35:20 +08:00
commit 85230eb497
7 changed files with 11 additions and 12 deletions

View File

@ -53,7 +53,7 @@
$('.api-add').on('click', function () {
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: '{:U("add")}'
});
@ -62,7 +62,7 @@
var ownObj = $(this);
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: ownObj.attr('data-url')
});

View File

@ -84,7 +84,7 @@
$('.api-add').on('click', function () {
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: '{:U("Login/changeUser")}'
});
@ -94,7 +94,7 @@
layer.open({
title: '初次登陆请重置密码!',
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
closeBtn:0,
content: '{:U("Login/changeUser")}'
@ -105,7 +105,7 @@
layer.open({
title: '初次登陆请补充真实姓名!',
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
closeBtn:0,
content: '{:U("Login/changeUser")}'

View File

@ -93,7 +93,7 @@
var ownObj = $(this);
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: ownObj.attr('data-url')+'&id='+ownObj.attr('data-id')
});

View File

@ -51,7 +51,7 @@
$('.api-add').on('click', function () {
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: '{:U("add")}'
});
@ -60,7 +60,7 @@
var ownObj = $(this);
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: ownObj.attr('data-url')
});

View File

@ -57,7 +57,7 @@
$('.api-add').on('click', function () {
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: '{:U("add")}'
});

View File

@ -55,7 +55,7 @@
$('.api-add').on('click', function () {
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: '{:U("add")}'
});
@ -64,7 +64,7 @@
var ownObj = $(this);
layer.open({
type: 2,
area: ['60%', '60%'],
area: ['80%', '80%'],
maxmin: true,
content: ownObj.attr('data-url')
});

View File

@ -311,7 +311,6 @@ CREATE TABLE `api_document` (
`lastTime` INT(11) NOT NULL DEFAULT '0' COMMENT '最后访问时间',
`lastIp` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '最后访问IP',
`createTime` INT(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
`keep` INT(11) NOT NULL DEFAULT '0' COMMENT '有效时长(单位小时)',
`status` TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1生效0失效',
PRIMARY KEY (`id`),
UNIQUE INDEX `key` (`key`)