mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

layui整体升级到2.68版本

Browse Source
This commit is contained in:
hdm 2021-09-09 08:33:05 +08:00
parent c65fd14a8e
commit f648db0d2a
76 changed files with 231 additions and 865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/BaseController.php
View File

@ -85,7 +85,7 @@ abstract class BaseController
}
$result = [
'code' => 1,
'code' => 0,
'msg' => $msg,
'data' => $data,
'url' => $url,
@ -120,7 +120,7 @@ abstract class BaseController
}
$result = [
'code' => 0,
'code' => 1,
'msg' => $msg,
'data' => $data,
'url' => $url,

20
app/admin/controller/Admin.php
View File

@ -38,7 +38,7 @@ class Admin extends BaseController
$item->groupName = implode(',', $groupName);
$item->last_login_time = empty($item->last_login_time) ? '-' : date('Y-m-d H:i', $item->last_login_time);
});
return table_assign(1, '', $admin);
return table_assign(0, '', $admin);
} else {
return view();
}
@ -117,12 +117,12 @@ class Admin extends BaseController
validate(AdminCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
if (!empty($param['pwd'])) {
//重置密码
if (empty($param['pwd_confirm']) or $param['pwd_confirm'] !== $param['pwd']) {
return to_assign(0, '两次密码不一致');
return to_assign(1, '两次密码不一致');
}
$param['salt'] = set_salt(20);
$param['pwd'] = set_password($param['pwd'], $param['salt']);
@ -160,14 +160,14 @@ class Admin extends BaseController
} catch (\Exception $e) {
// 回滚事务
Db::rollback();
return to_assign(0, '提交失败:' . $e->getMessage());
return to_assign(1, '提交失败:' . $e->getMessage());
}
} else {
try {
validate(AdminCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['salt'] = set_salt(20);
$param['pwd'] = set_password($param['pwd'], $param['salt']);
@ -196,7 +196,7 @@ class Admin extends BaseController
} catch (\Exception $e) {
// 回滚事务
Db::rollback();
return to_assign(0, '提交失败:' . $e->getMessage());
return to_assign(1, '提交失败:' . $e->getMessage());
}
}
return to_assign();
@ -214,16 +214,16 @@ class Admin extends BaseController
{
$id = get_params("id");
if($id == 1){
return to_assign(1, "超级管理员，不能删除");
return to_assign(0, "超级管理员，不能删除");
}
$data['status'] = '-1';
$data['id'] = $id;
$data['update_time'] = time();
if (Db::name('Admin')->update($data) !== false) {
add_log('delete', $id);
return to_assign(1, "删除管理员成功");
return to_assign(0, "删除管理员成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
@ -262,7 +262,7 @@ class Admin extends BaseController
$data['param'] = $param_value;
$content->offsetSet($k, $data);
}
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}

46
app/admin/controller/Api.php
View File

@ -25,7 +25,7 @@ class Api extends BaseController
if (request()->file('file')) {
$file = request()->file('file');
} else {
return to_assign(0, '没有选择上传文件');
return to_assign(1, '没有选择上传文件');
}
// dump($file);die;
// 获取上传文件的hash散列值
@ -50,7 +50,7 @@ class Api extends BaseController
]);
$file_check['image'] = $file;
if (!$validate->check($file_check)) {
return to_assign(0, $validate->getError());
return to_assign(1, $validate->getError());
}
// 日期前綴
$dataPath = date('Ym');
@ -87,9 +87,9 @@ class Api extends BaseController
$res['name'] = $data['name'];
$res['filename'] = $data['filename'];
add_log('upload', $data['user_id'], $data);
return to_assign(1, '上传成功', $res);
return to_assign(0, '上传成功', $res);
} else {
return to_assign(0, '上传失败，请重试');
return to_assign(1, '上传失败，请重试');
}
}
@ -102,7 +102,7 @@ class Api extends BaseController
$group = get_admin_group_info(get_params('id'))['rules'];
}
$list = create_tree_list(0, $rule, $group);
return to_assign(1, '', $list);
return to_assign(0, '', $list);
}
//获取菜单树列表
@ -114,28 +114,28 @@ class Api extends BaseController
$group = get_admin_group_info(get_params('id'))['menus'];
}
$list = create_tree_list(0, $rule, $group);
return to_assign(1, '', $list);
return to_assign(0, '', $list);
}
//获取关键字
public function get_keyword_cate()
{
$keyword = get_keywords();
return to_assign(1, '', $keyword);
return to_assign(0, '', $keyword);
}
//获取话题
public function get_topics_cate()
{
$topic = get_topics();
return to_assign(1, '', $topic);
return to_assign(0, '', $topic);
}
//清空缓存
public function cache_clear()
{
\think\facade\Cache::clear();
return to_assign(1, '系统缓存已清空');
return to_assign(0, '系统缓存已清空');
}
//发送测试邮件
@ -143,9 +143,9 @@ class Api extends BaseController
{
$name = empty(get_config('webconfig.admin_title')) ? '系统' : get_config('webconfig.admin_title');
if (send_email($email, "一封来自{$name}的测试邮件。")) {
return to_assign(1, '发送成功，请注意查收');
return to_assign(0, '发送成功，请注意查收');
}
return to_assign(0, '发送失败');
return to_assign(1, '发送失败');
}
//修改个人信息
@ -165,7 +165,7 @@ class Api extends BaseController
validate(AdminCheck::class)->scene('editPersonal')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
unset($param['username']);
$uid = get_login_admin('id');
@ -195,11 +195,11 @@ class Api extends BaseController
validate(AdminCheck::class)->scene('editpwd')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$admin = get_login_admin();
if (set_password($param['old_pwd'], $admin['salt']) !== $admin['pwd']) {
return to_assign(0, '旧密码不正确!');
return to_assign(1, '旧密码不正确!');
}
unset($param['username']);
$param['salt'] = set_salt(20);
@ -219,7 +219,7 @@ class Api extends BaseController
$sender = get_params('email');
//检查是否邮箱格式
if (!is_email($sender)) {
return to_assign(0, '测试邮箱码格式有误');
return to_assign(1, '测试邮箱码格式有误');
}
$email_config = \think\facade\Db::name('config')
->where('name', 'email')
@ -228,14 +228,14 @@ class Api extends BaseController
$content = $config['template'];
//所有项目必须填写
if (empty($config['smtp']) || empty($config['smtp_port']) || empty($config['smtp_user']) || empty($config['smtp_pwd'])) {
return to_assign(0, '请完善邮件配置信息！');
return to_assign(1, '请完善邮件配置信息！');
}
$send = send_email($sender, '测试邮件', $content);
if ($send) {
return to_assign(1, '邮件发送成功！');
return to_assign(0, '邮件发送成功！');
} else {
return to_assign(0, '邮件发送失败！');
return to_assign(1, '邮件发送失败！');
}
}
@ -248,7 +248,7 @@ class Api extends BaseController
->limit(10)
->select()->toArray();
$res['data'] = $content;
return table_assign(1, '', $res);
return table_assign(0, '', $res);
}
//首页获取最新10位用户
@ -263,7 +263,7 @@ class Api extends BaseController
$list[$key]['last_login_time'] = date('Y-m-d :h:m:s', $val['last_login_time']);
}
$res['data'] = $list;
return table_assign(1, '', $res);
return table_assign(0, '', $res);
}
//首页文章
@ -281,7 +281,7 @@ class Api extends BaseController
$list[$key]['create_time'] = date('Y-m-d :H:i', $val['create_time']);
}
$res['data'] = $list;
return table_assign(1, '', $res);
return table_assign(0, '', $res);
}
//系统操作日志
@ -296,7 +296,7 @@ class Api extends BaseController
$param = get_params();
$log = new AdminLog();
$content = $log->get_log_list($param);
return table_assign(1, '', $content);
return table_assign(0, '', $content);
}
//获取访问记录
@ -311,7 +311,7 @@ class Api extends BaseController
$end_second = strtotime(date('Y-m-d', $second_time) . " 23:59:59");
$data_first = Db::name('UserLog')->field('create_time')->whereBetween('create_time', "$begin_first,$end_first")->select();
$data_second = Db::name('UserLog')->field('create_time')->whereBetween('create_time', "$begin_second,$end_second")->select();
return to_assign(1, '', ['data_first' => hour_document($data_first), 'data_second' => hour_document($data_second)]);
return to_assign(0, '', ['data_first' => hour_document($data_first), 'data_second' => hour_document($data_second)]);
}
}

24
app/admin/controller/Article.php
View File

@ -52,7 +52,7 @@ class Article extends BaseController
validate(ArticleCateCheck::class)->scene('edit')->check($data);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
}
$res = ArticleCate::strict(false)->field(true)->update($data);
@ -65,7 +65,7 @@ class Article extends BaseController
validate(ArticleCateCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['create_time'] = time();
$insertId = ArticleCate::strict(false)->field(true)->insertGetId($param);
@ -83,17 +83,17 @@ class Article extends BaseController
$id = get_params("id");
$cate_count = Db::name('ArticleCate')->where(["pid" => $id])->count();
if ($cate_count > 0) {
return to_assign(0, "该分类下还有子分类，无法删除");
return to_assign(1, "该分类下还有子分类，无法删除");
}
$content_count = Db::name('Article')->where(["article_cate_id" => $id])->count();
if ($content_count > 0) {
return to_assign(0, "该分类下还有文章，无法删除");
return to_assign(1, "该分类下还有文章，无法删除");
}
if (Db::name('ArticleCate')->delete($id) !== false) {
add_log('delete', $id);
return to_assign(1, "删除分类成功");
return to_assign(0, "删除分类成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
@ -116,7 +116,7 @@ class Article extends BaseController
->join('article_cate w', 'a.article_cate_id = w.id')
->order('a.create_time desc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $content);
return table_assign(0, '', $content);
}
else{
return view();
@ -147,7 +147,7 @@ class Article extends BaseController
validate(ArticleCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['update_time'] = time();
Db::startTrans();
@ -181,7 +181,7 @@ class Article extends BaseController
validate(ArticleCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['create_time'] = time();
Db::startTrans();
@ -217,7 +217,7 @@ class Article extends BaseController
return to_assign();
}
else{
return to_assign(0,'操作失败');
return to_assign(1,'操作失败');
}
}
}
@ -231,9 +231,9 @@ class Article extends BaseController
$data['update_time'] = time();
if (Db::name('Article')->update($data) !== false) {
add_log('delete', $id);
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
}

8
app/admin/controller/Conf.php
View File

@ -27,7 +27,7 @@ class Conf extends BaseController
$content = Db::name('Config')
->where($where)
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}
@ -54,7 +54,7 @@ class Conf extends BaseController
validate(ConfCheck::class)->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
if (!empty($param['id']) && $param['id'] > 0) {
$param['update_time'] = time();
@ -84,9 +84,9 @@ class Conf extends BaseController
$data['update_time'] = time();
if (Db::name('Config')->update($data) !== false) {
add_log('delete', $id, $data);
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}

26
app/admin/controller/Database.php
View File

@ -45,7 +45,7 @@ class Database extends BaseController
// 提示信息
$dataTips = '数据库中共有<strong> ' . count($list) . '</strong> 张表，共计 <strong>' . format_bytes($total) . '</strong>大小。';
$data['data'] = $list;
return table_assign(1, $dataTips, $data);
return table_assign(0, $dataTips, $data);
}
return view();
}
@ -60,9 +60,9 @@ class Database extends BaseController
$this->db->setFile()->backup($table, 0);
}
add_log('add');
return to_assign(1, '备份成功！');
return to_assign(0, '备份成功！');
} else {
return to_assign(0, '请选择要备份的表！');
return to_assign(1, '请选择要备份的表！');
}
}
@ -71,14 +71,14 @@ class Database extends BaseController
{
$tables = get_params('id');
if (empty($tables)) {
return to_assign(1, '请选择要优化的表！');
return to_assign(0, '请选择要优化的表！');
}
$tables = explode(',', $tables);
if ($this->db->optimize($tables)) {
add_log('edit');
return to_assign(1, '数据表优化成功！');
return to_assign(0, '数据表优化成功！');
} else {
return to_assign(0, '数据表优化出错请重试！');
return to_assign(1, '数据表优化出错请重试！');
}
}
@ -87,14 +87,14 @@ class Database extends BaseController
{
$tables = get_params('id');
if (empty($tables)) {
return to_assign(0, '请选择要修复的表！');
return to_assign(1, '请选择要修复的表！');
}
$tables = explode(',', $tables);
if ($this->db->repair($tables)) {
add_log('edit');
return to_assign(1, '数据表修复成功！');
return to_assign(0, '数据表修复成功！');
} else {
return to_assign(0, '数据表修复出错请重试！');
return to_assign(1, '数据表修复出错请重试！');
}
}
@ -122,7 +122,7 @@ class Database extends BaseController
$list = $this->db->getFile('timeverif', $id);
$this->db->setFile($list)->import(1);
add_log('save');
return to_assign(1, '还原成功！');
return to_assign(0, '还原成功！');
}
// 下载
@ -167,13 +167,13 @@ class Database extends BaseController
$this->db->delFile($v);
}
add_log('delete');
return to_assign(1, "删除成功！");
return to_assign(0, "删除成功！");
}
if ($this->db->delFile($id)) {
add_log('delete');
return to_assign(1, "删除成功！");
return to_assign(0, "删除成功！");
} else {
return to_assign(0, "备份文件删除失败，请检查文件权限！");
return to_assign(1, "备份文件删除失败，请检查文件权限！");
}
}
}

10
app/admin/controller/Keywords.php
View File

@ -31,7 +31,7 @@ class Keywords extends BaseController
->order('create_time desc')
->where($where)
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}
@ -59,7 +59,7 @@ class Keywords extends BaseController
validate(KeywordsCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['update_time'] = time();
$res = Db::name('Keywords')->strict(false)->field(true)->update($param);
@ -73,7 +73,7 @@ class Keywords extends BaseController
validate(KeywordsCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['create_time'] = time();
$insertId = Db::name('Keywords')->strict(false)->field(true)->insertGetId($param);
@ -94,9 +94,9 @@ class Keywords extends BaseController
$data['update_time'] = time();
if (Db::name('Keywords')->update($data) !== false) {
add_log('delete', $id, $data);
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
}

12
app/admin/controller/Login.php
View File

@ -34,19 +34,19 @@ class Login
validate(UserCheck::class)->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$admin = Db::name('Admin')->where(['username' => $param['username']])->find();
if (empty($admin)) {
return to_assign(0, '用户名或密码错误');
return to_assign(1, '用户名或密码错误');
}
$param['pwd'] = set_password($param['password'], $admin['salt']);
if ($admin['pwd'] !== $param['pwd']) {
return to_assign(0, '用户名或密码错误');
return to_assign(1, '用户名或密码错误');
}
if ($admin['status'] == 0) {
return to_assign(0, '该用户禁止登录,请于系统所有者联系');
return to_assign(1, '该用户禁止登录,请于系统所有者联系');
}
$data = [
'last_login_time' => time(),
@ -60,7 +60,7 @@ class Login
set_cache($token, $admin, 7200);
$admin['token'] = $token;
add_log('login', $admin['id'], $data);
return to_assign(1, '登录成功', ['uid' => $admin['id']]);
return to_assign(0, '登录成功', ['uid' => $admin['id']]);
}
//退出登录
@ -69,6 +69,6 @@ class Login
$session_admin = get_config('app.session_admin');
Session::delete($session_admin);
//redirect('/')->send();
return to_assign(1, "退出成功");
return to_assign(0, "退出成功");
}
}

10
app/admin/controller/Menu.php
View File

@ -48,7 +48,7 @@ class Menu extends BaseController
validate(MenuCheck::class)->scene('edit')->check($data);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
}
Db::name('AdminMenu')->strict(false)->field(true)->update($data);
@ -58,7 +58,7 @@ class Menu extends BaseController
validate(MenuCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$mid = Db::name('AdminMenu')->strict(false)->field(true)->insertGetId($param);
//自动为系统所有者管理组分配新增的菜单
@ -83,15 +83,15 @@ class Menu extends BaseController
$id = get_params('id');
$count = Db::name('AdminMenu')->where(['pid' => $id])->count();
if ($count > 0) {
return to_assign(0, '该菜单下还有子菜单，无法删除');
return to_assign(1, '该菜单下还有子菜单，无法删除');
}
if (Db::name('AdminMenu')->delete($id) !== false) {
// 删除后台菜单缓存
clear_cache('adminMenu');
add_log('delete', $id, []);
return to_assign(1, '删除菜单成功');
return to_assign(0, '删除菜单成功');
} else {
return to_assign(0, '删除失败');
return to_assign(1, '删除失败');
}
}
}

20
app/admin/controller/Nav.php
View File

@ -31,7 +31,7 @@ class Nav extends BaseController
$nav = NavList::where($where)
->order('create_time asc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $nav);
return table_assign(0, '', $nav);
} else {
return view();
}
@ -59,7 +59,7 @@ class Nav extends BaseController
validate(NavCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
NavList::where(['id' => $param['id']])
->strict(false)
@ -74,7 +74,7 @@ class Nav extends BaseController
validate(NavCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$nid = NavList::strict(false)->field(true)->insertGetId($param);
// 删除导航缓存
@ -93,15 +93,15 @@ class Nav extends BaseController
'nav_id' => $id,
])->count();
if ($count > 0) {
return to_assign(0, '该组下还有导航，无法删除');
return to_assign(1, '该组下还有导航，无法删除');
}
if (Db::name('Nav')->delete($id) !== false) {
return to_assign(1, '删除成功');
return to_assign(0, '删除成功');
// 删除导航缓存
clear_cache('homeNav');
add_log('delete', $id, []);
} else {
return to_assign(0, '删除失败');
return to_assign(1, '删除失败');
}
}
@ -150,7 +150,7 @@ class Nav extends BaseController
validate(NavCheck::class)->scene('editInfo')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
NavInfo::strict(false)->field(true)->update($param);
// 删除导航缓存
@ -162,7 +162,7 @@ class Nav extends BaseController
validate(NavCheck::class)->scene('addInfo')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$nid = NavInfo::strict(false)->field(true)->insertGetId($param);
// 删除导航缓存
@ -181,9 +181,9 @@ class Nav extends BaseController
//清除导航缓存
clear_cache('homeNav');
add_log('delete', $id, []);
return to_assign(1, '删除成功');
return to_assign(0, '删除成功');
} else {
return to_assign(0, '删除失败');
return to_assign(1, '删除失败');
}
}
}

14
app/admin/controller/Role.php
View File

@ -30,7 +30,7 @@ class Role extends BaseController
$group = AdminGroup::where($where)
->order('create_time asc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $group);
return table_assign(0, '', $group);
} else {
return view();
}
@ -59,11 +59,11 @@ class Role extends BaseController
validate(GroupCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
//为了系统安全id为1的系统所有者管理组不允许修改
if ($param['id'] == 1) {
return to_assign(0, '为了系统安全,该管理组不允许修改');
return to_assign(1, '为了系统安全,该管理组不允许修改');
}
Db::name('AdminGroup')->where(['id' => $param['id']])->strict(false)->field(true)->update($param);
add_log('edit', $param['id'], $param);
@ -72,7 +72,7 @@ class Role extends BaseController
validate(GroupCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$gid = Db::name('AdminGroup')->strict(false)->field(true)->insertGetId($param);
add_log('add', $gid, $param);
@ -89,13 +89,13 @@ class Role extends BaseController
{
$id = get_params("id");
if ($id == 1) {
return to_assign(0, "该组是系统所有者，无法删除");
return to_assign(1, "该组是系统所有者，无法删除");
}
if (Db::name('AdminGroup')->delete($id) !== false) {
add_log('delete', $id, []);
return to_assign(1, "删除角色成功");
return to_assign(0, "删除角色成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
}

12
app/admin/controller/Rule.php
View File

@ -46,7 +46,7 @@ class Rule extends BaseController
validate(RuleCheck::class)->scene('edit_title')->check($data);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
}
if(!empty($data['src'])){
@ -54,7 +54,7 @@ class Rule extends BaseController
validate(RuleCheck::class)->scene('edit_src')->check($data);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
}
Db::name('AdminRule')->strict(false)->field(true)->update($data);
@ -64,7 +64,7 @@ class Rule extends BaseController
validate(RuleCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$rid = Db::name('AdminRule')->strict(false)->field(true)->insertGetId($param);
//自动为系统所有者管理组分配新增的节点
@ -88,14 +88,14 @@ class Rule extends BaseController
$id = get_params("id");
$count = Db::name('AdminRule')->where(["pid" => $id])->count();
if ($count > 0) {
return to_assign(0, "该节点下还有子节点，无法删除");
return to_assign(1, "该节点下还有子节点，无法删除");
}
if (Db::name('AdminRule')->delete($id) !== false) {
clear_cache('adminRules');
add_log('delete', $id, []);
return to_assign(1, "删除节点成功");
return to_assign(0, "删除节点成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
}

6
app/admin/controller/Search.php
View File

@ -28,7 +28,7 @@ class Search extends BaseController
->order('id desc')
->where($where)
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}
@ -40,9 +40,9 @@ class Search extends BaseController
$id = get_params("id");
if (Db::name('SearchKeywords')->delete($id) !== false) {
add_log('delete', $id);
return to_assign(1, "删除成功！");
return to_assign(0, "删除成功！");
} else {
return to_assign(0, "删除失败！");
return to_assign(1, "删除失败！");
}
}
}

22
app/admin/controller/Sitemap.php
View File

@ -33,7 +33,7 @@ class Sitemap extends BaseController
$SitemapCate = SitemapCate::where($where)
->order('sort desc, id desc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $SitemapCate);
return table_assign(0, '', $SitemapCate);
} else {
return view();
}
@ -61,7 +61,7 @@ class Sitemap extends BaseController
validate(SitemapCateCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['update_time'] = time();
$res = SitemapCate::where('id', $param['id'])->strict(false)->field(true)->update($param);
@ -77,7 +77,7 @@ class Sitemap extends BaseController
validate(SitemapCateCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['create_time'] = time();
$sid = SitemapCate::strict(false)->field(true)->insertGetId($param);
@ -100,16 +100,16 @@ class Sitemap extends BaseController
$where[] = ['status', '>=', 0];
$count = Db::name('Sitemap')->where($where)->count();
if ($count > 0) {
return to_assign(0, '该分类下还有数据，无法删除');
return to_assign(1, '该分类下还有数据，无法删除');
}
$data['status'] = '-1';
$data['id'] = $id;
$data['update_time'] = time();
if (Db::name('SitemapCate')->update($data) !== false) {
add_log('delete', $id);
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
@ -125,7 +125,7 @@ class Sitemap extends BaseController
$sitemap = SitemapInfo::where($where)
->order('sort desc, id desc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $sitemap);
return table_assign(0, '', $sitemap);
} else {
return view('', [
'sitemap_cate_id' => $param['id'],
@ -157,7 +157,7 @@ class Sitemap extends BaseController
validate(SitemapCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['update_time'] = time();
$param['name'] = htmlspecialchars($param['name']);
@ -174,7 +174,7 @@ class Sitemap extends BaseController
validate(SitemapCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['name'] = htmlspecialchars($param['name']);
$param['create_time'] = time();
@ -199,9 +199,9 @@ class Sitemap extends BaseController
$data['update_time'] = time();
if (Db::name('Sitemap')->update($data) !== false) {
add_log('delete', $id);
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
}

24
app/admin/controller/Slide.php
View File

@ -31,7 +31,7 @@ class Slide extends BaseController
$slide = SlideList::where($where)
->order('create_time asc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $slide);
return table_assign(0, '', $slide);
} else {
return view();
}
@ -59,7 +59,7 @@ class Slide extends BaseController
validate(SlideCheck::class)->scene('edit')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['update_time'] = time();
$res = SlideList::where('id', $param['id'])->strict(false)->field(true)->update($param);
@ -74,7 +74,7 @@ class Slide extends BaseController
validate(SlideCheck::class)->scene('add')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['create_time'] = time();
$sid = SlideList::strict(false)->field(true)->insertGetId($param);
@ -97,14 +97,14 @@ class Slide extends BaseController
'slide_id' => $id,
])->count();
if ($count > 0) {
return to_assign(0, '该组下还有Banner，无法删除');
return to_assign(1, '该组下还有Banner，无法删除');
}
if (Db::name('Slide')->delete($id) !== false) {
add_log('delete', $id);
clear_cache('homeSlide');
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
@ -122,7 +122,7 @@ class Slide extends BaseController
->field('s.*,f.filepath')
->order('s.sort desc, s.id desc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $slideInfoList);
return table_assign(0, '', $slideInfoList);
} else {
return view('', [
'slide_id' => $param['id'],
@ -143,7 +143,7 @@ class Slide extends BaseController
->field('s.*,f.filepath')
->order('s.sort desc, s.id desc')
->paginate($rows, false, ['query' => $param]);
return table_assign(1, '', $slideInfoList);
return table_assign(0, '', $slideInfoList);
}
//添加幻灯片
@ -171,7 +171,7 @@ class Slide extends BaseController
validate(SlideCheck::class)->scene('editInfo')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['update_time'] = time();
$res = SlideInfo::where(['id' => $param['id']])->strict(false)->field(true)->update($param);
@ -187,7 +187,7 @@ class Slide extends BaseController
validate(SlideCheck::class)->scene('addInfo')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$param['create_time'] = time();
$sid = SlideInfo::strict(false)->field(true)->insertGetId($param);
@ -208,9 +208,9 @@ class Slide extends BaseController
if (Db::name('SlideInfo')->delete($id) !== false) {
add_log('delete', $id);
clear_cache('homeSlide');
return to_assign(1, "删除成功");
return to_assign(0, "删除成功");
} else {
return to_assign(0, "删除失败");
return to_assign(1, "删除失败");
}
}
}

12
app/admin/controller/User.php
View File

@ -48,7 +48,7 @@ class User extends BaseController
->each(function ($item, $key) {
$item->register_time = empty($item->register_time) ? '-' : date('Y-m-d H:i', $item->register_time);
});
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}
@ -74,7 +74,7 @@ class User extends BaseController
add_log('edit', $param['id'], $param);
return to_assign();
} else {
return to_assign(0, '提交失败:' . $e->getMessage());
return to_assign(1, '提交失败');
}
}
}
@ -97,9 +97,9 @@ class User extends BaseController
$data['id'] = $id;
if (Db::name('User')->update($data) !== false) {
add_log('edit', $id);
return to_assign(1, "操作成功");
return to_assign(0, "操作成功");
} else {
return to_assign(0, "操作失败");
return to_assign(1, "操作失败");
}
}
@ -133,7 +133,7 @@ class User extends BaseController
$data['param'] = $param_value;
$content->offsetSet($k, $data);
}
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}
@ -170,7 +170,7 @@ class User extends BaseController
$data['times'] = time_trans($v['create_time']);
$content->offsetSet($k, $data);
}
return table_assign(1, '', $content);
return table_assign(0, '', $content);
} else {
return view();
}

2
app/admin/view/admin/add.html
View File

@ -189,7 +189,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

2
app/admin/view/admin/edit_password.html
View File

@ -45,7 +45,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.msg('修改密码成功');
setTimeout(function () {
$('.ittab-tab .layui-tab-title .layui-this i', parent.document).click();

4
app/admin/view/admin/edit_personal.html
View File

@ -54,7 +54,7 @@
, url: '/admin/api/upload'
, done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -70,7 +70,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,关闭本页面吗?', { icon: 3, title: '提示' }, function (index) {
$('.ittab-tab .layui-tab-title .layui-this i', parent.document).click();
layer.close(index);

7
app/admin/view/admin/index.html
View File

@ -40,10 +40,7 @@
elem: '#test',
title: '管理员列表',
toolbar: '#toolbarDemo',
url: '/admin/admin/index', //数据接口
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
url: '/admin/admin/index', //数据接口
page: true, //开启分页
limit: 20,
cols: [
@ -122,7 +119,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

3
app/admin/view/admin/log.html
View File

@ -37,9 +37,6 @@
url: '/admin/admin/log', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[ //表头
{

2
app/admin/view/admin/log_list.html
View File

@ -36,7 +36,7 @@
limit: limit
},
success: function(e) {
if (e.code == 1) {
if (e.code == 0) {
var html = '';
if(e.data.length>0){
page++;

4
app/admin/view/article/add.html
View File

@ -122,7 +122,7 @@
, url: '/admin/api/upload'
, done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -138,7 +138,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

4
app/admin/view/article/cate.html
View File

@ -68,7 +68,7 @@
data:{id:obj.data.id,field:obj.field,value:obj.value},
success:function(res){
layer.msg(res.msg);
if(res.code == 0){
if(res.code == 1){
setTimeout(function(){
location.reload()
},2000)
@ -88,7 +88,7 @@
data:{id:obj.data.id},
success:function(res){
layer.msg(res.msg);
if(res.code == 1){
if(res.code == 0){
obj.del();
}
}

2
app/admin/view/article/cate_add.html
View File

@ -56,7 +56,7 @@
type:'post',
data:data.field,
success:function(e){
if(e.code==1){
if(e.code==0){
layer.confirm('保存成功,返回列表页吗?', {icon: 3, title:'提示'}, function(index){
history.back(-1);
layer.close(index);

4
app/admin/view/article/edit.html
View File

@ -128,7 +128,7 @@
, url: '/admin/api/upload'
, done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -144,7 +144,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

5
app/admin/view/article/index.html
View File

@ -48,9 +48,6 @@
url: '/admin/article/index', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[ //表头
{
@ -110,7 +107,7 @@
},
success: function(res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/conf/add.html
View File

@ -57,7 +57,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

5
app/admin/view/conf/email.html
View File

@ -90,7 +90,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,关闭本页面吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);
@ -125,12 +125,13 @@
},
success: function (e) {
layer.msg(e.msg);
if (e.code == 1) {
if (e.code == 0) {
layer.close(index);
}
}
})
});
return false;
})
//监听返回
$('.body-content').on('click', '[lay-event="back"]', function () {

7
app/admin/view/conf/index.html
View File

@ -28,10 +28,7 @@
title: '配置列表',
toolbar: '#toolbarDemo',
url: '/admin/conf/index',
page: true, //开启分页
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
page: true, //开启分页
limit: 20,
cols: [
[{
@ -95,7 +92,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/conf/other.html
View File

@ -43,7 +43,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,关闭本页面吗?', {
icon: 3,
title: '提示'

6
app/admin/view/conf/token.html
View File

@ -64,7 +64,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,关闭本页面吗?', {
icon: 3,
title: '提示'
@ -143,7 +143,7 @@
success:function(res){
$('#res').html(JSON.stringify(res));
layer.msg(res.msg);
if(res.code==0){
if(res.code==1){
token = res.data.token;
layer.close(idx);
}
@ -187,7 +187,7 @@
success:function(res){
$('#res').html(JSON.stringify(res));
layer.msg(res.msg);
if(res.code==0){
if(res.code==1){
token = res.data.token;
layer.close(idx);
}

4
app/admin/view/conf/web.html
View File

@ -109,7 +109,7 @@
url: '/admin/api/upload',
done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -126,7 +126,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,关闭本页面吗?', {
icon: 3,
title: '提示'

2
app/admin/view/conf/wechat.html
View File

@ -81,7 +81,7 @@
type: 'post',
data: data.field,
success: function(e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,关闭本页面吗?', {
icon: 3,
title: '提示'

2
app/admin/view/database/backuplist.html
View File

@ -76,7 +76,7 @@
data: {'id':id},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
location.reload();
}
}

9
app/admin/view/database/database.html
View File

@ -27,9 +27,6 @@
toolbar: '#toolbarDemo',
url: '/admin/database/database', //数据接口
page: false,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[ //表头
{type: 'checkbox'},
@ -105,7 +102,7 @@
data: {'id':ids},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
location.reload();
}
}
@ -122,7 +119,7 @@
data: {'id':ids},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
location.reload();
}
}
@ -139,7 +136,7 @@
data: {'id':ids},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
location.reload();
}
}

2
app/admin/view/index/index.html
View File

@ -117,7 +117,7 @@
url: "/admin/login/login_out",
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
setTimeout(function () {
location.href = "{:url('admin/login/index')}"
}, 1000)

8
app/admin/view/index/main.html
View File

@ -244,7 +244,7 @@
limit: 10
},
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
var html = '';
$.each(e.data, function (key, value) {
html += '<li class="layui-timeline-item">\
@ -265,7 +265,7 @@
url: "/admin/api/get_user_list",
type: 'post',
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
var html = '';
$.each(e.data, function (key, value) {
html += '<tr>\
@ -289,7 +289,7 @@
url: "/admin/api/get_article_list",
type: 'post',
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
var html = '';
$.each(e.data, function (key, value) {
html += '<tr>\
@ -319,7 +319,7 @@ $.ajax({
type: 'post',
data: {},
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
var data_first = e.data.data_first;
var data_second = e.data.data_second;
var myDate = new Date();

2
app/admin/view/keywords/add.html
View File

@ -56,7 +56,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

3
app/admin/view/keywords/index.html
View File

@ -35,9 +35,6 @@
url: '/admin/keywords/index',
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[{
field: 'id',

2
app/admin/view/login/index.html
View File

@ -89,7 +89,7 @@
async: false,
success: function(res) {
layer.tips(res.msg, '#login-submit');
if (res.code === 1) {
if (res.code === 0) {
setTimeout(function() {
// parent.document.location.reload();
parent.document.location.href="{:url('/admin/index')}";

2
app/admin/view/menu/add.html
View File

@ -62,7 +62,7 @@
type: 'post',
data: data.field,
success: function(e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', {
icon: 3,
title: '提示'

4
app/admin/view/menu/index.html
View File

@ -64,7 +64,7 @@
data: { id: obj.data.id, field: obj.field, value: obj.value },
success: function (res) {
layer.msg(res.msg);
if(res.code == 0){
if(res.code == 1){
setTimeout(function(){
location.reload()
},2000)
@ -84,7 +84,7 @@
data: { id: obj.data.id },
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/nav/add.html
View File

@ -61,7 +61,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', {
icon: 3,
title: '提示'

5
app/admin/view/nav/index.html
View File

@ -37,9 +37,6 @@
url: '/admin/nav/index', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[ //表头
{
@ -92,7 +89,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/nav/nav_info_add.html
View File

@ -85,7 +85,7 @@
type: 'post',
data: data.field,
success: function(e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', {
icon: 3,
title: '提示'

2
app/admin/view/role/add.html
View File

@ -132,7 +132,7 @@
data: obj.field,
type: 'post',
success: function (res) {
if (res.code == 1) {
if (res.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

5
app/admin/view/role/index.html
View File

@ -39,9 +39,6 @@
url: '/admin/role/index', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [[ //表头
{ field: 'id', title: 'ID号', align: 'center', width: 80 }
, { field: 'title', title: '名称', width: 300 }
@ -69,7 +66,7 @@
data: { id: data.id },
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/rule/add.html
View File

@ -56,7 +56,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表吗?', {
icon: 3,
title: '提示'

4
app/admin/view/rule/index.html
View File

@ -64,7 +64,7 @@
data: { id: obj.data.id, field: obj.field, value: obj.value },
success: function (res) {
layer.msg(res.msg);
if(res.code == 0){
if(res.code == 1){
setTimeout(function(){
location.reload()
},2000)
@ -84,7 +84,7 @@
data: { id: obj.data.id },
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

5
app/admin/view/search/index.html
View File

@ -27,9 +27,6 @@
url: '/admin/search/index',
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[{
field: 'id',
@ -86,7 +83,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/sitemap/add.html
View File

@ -43,7 +43,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', {
icon: 3,
title: '提示'

5
app/admin/view/sitemap/index.html
View File

@ -37,9 +37,6 @@
url: '/admin/sitemap/index', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[ //表头
{
@ -82,7 +79,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

2
app/admin/view/sitemap/sitemap_info.html
View File

@ -88,7 +88,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

6
app/admin/view/sitemap/sitemap_info_add.html
View File

@ -91,7 +91,7 @@
url: '/admin/api/upload',
done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -105,7 +105,7 @@
url: '/admin/api/upload',
done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -121,7 +121,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', {
icon: 3,
title: '提示'

2
app/admin/view/slide/add.html
View File

@ -62,7 +62,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

5
app/admin/view/slide/index.html
View File

@ -38,9 +38,6 @@
url: '/admin/slide/index', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[
{
@ -93,7 +90,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

5
app/admin/view/slide/slide_info.html
View File

@ -39,9 +39,6 @@
where: {
id: slide_id
},
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
page: false, //开启分页
cols: [
[
@ -104,7 +101,7 @@
},
success: function(res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
obj.del();
}
}

4
app/admin/view/slide/slide_info_add.html
View File

@ -78,7 +78,7 @@
, url: '/admin/api/upload'
, done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -94,7 +94,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

8
app/admin/view/user/edit.html
View File

@ -9,9 +9,9 @@
<input type="hidden" name="id" value="{$user.id}">
{$user.username}
</td>
<td class="layui-td-gray2">用户昵称</td>
<td class="layui-td-gray2">用户昵称 <span style="color: red">*</span></td>
<td>
<input type="text" name="nickname" placeholder="请输入用户昵称" autocomplete="off" class="layui-input" value="{$user.nickname}">
<input type="text" name="nickname" placeholder="请输入用户昵称" autocomplete="off" class="layui-input" value="{$user.nickname}" lay-verify="required">
</td>
<td class="layui-td-gray2">真实姓名</td>
<td>
@ -98,7 +98,7 @@
, url: '/admin/api/upload'
, done: function (res) {
//如果上传失败
if (res.code == 0) {
if (res.code == 1) {
return layer.msg('上传失败');
}
//上传成功
@ -114,7 +114,7 @@
type: 'post',
data: data.field,
success: function (e) {
if (e.code == 1) {
if (e.code == 0) {
layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
history.back(-1);
layer.close(index);

7
app/admin/view/user/index.html
View File

@ -47,9 +47,6 @@
url: '/admin/user/index', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[ //表头
{
@ -143,7 +140,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
location.reload();
}
}
@ -163,7 +160,7 @@
},
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
location.reload();
}
}

3
app/admin/view/user/log.html
View File

@ -26,9 +26,6 @@
url: '/admin/user/log', //数据接口
page: true, //开启分页
limit: 20,
response: {
statusCode: 1 //规定成功的状态码，默认：0
},
cols: [
[
{

2
app/admin/view/user/record.html
View File

@ -36,7 +36,7 @@
limit: limit
},
success: function(e) {
if (e.code == 1) {
if (e.code == 0) {
var html = '';
if(e.data.length>0){
page++;

2
app/common.php
View File

@ -122,7 +122,7 @@ function is_installed()
* @param array $options
* @return json
*/
function to_assign($code = 1, $msg = "操作成功", $data = [], $url = '', $httpCode = 200, $header = [], $options = [])
function to_assign($code = 0, $msg = "操作成功", $data = [], $url = '', $httpCode = 200, $header = [], $options = [])
{
$res = ['code' => $code];
$res['msg'] = $msg;

20
app/home/controller/Login.php
View File

@ -44,7 +44,7 @@ class Login
return $_GET['callback'] . '("install ok!")'; // jsonp
}
else{
return to_assign(0, 'install ok!');
return to_assign(1, 'install ok!');
}
}
//提交登录
@ -55,19 +55,19 @@ class Login
validate(UserCheck::class)->scene('login')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$user = Db::name('User')->where(['username' => $param['name']])->find();
if (empty($user)) {
return to_assign(0, '用户名或密码错误');
return to_assign(1, '用户名或密码错误');
}
$param['pwd'] = set_password($param['password'], $user['salt']);
if ($param['pwd'] !== $user['password']) {
return to_assign(0, '用户名或密码错误');
return to_assign(1, '用户名或密码错误');
}
if ($user['status'] == -1) {
return to_assign(0, '该用户禁止登录,请于平台联系');
return to_assign(1, '该用户禁止登录,请于平台联系');
}
$data = [
'last_login_time' => time(),
@ -87,7 +87,7 @@ class Login
set_cache($token, $userInfo, 7200);
$userInfo['token'] = $token;
add_user_log('login', '', $user['id']);
return to_assign(1, '登录成功', $userInfo);
return to_assign(0, '登录成功', $userInfo);
}
//退出登录
@ -96,7 +96,7 @@ class Login
$session_user = get_config('app.session_user');
Session::delete($session_user);
//redirect('/home/login/index')->send();
return to_assign(1, "退出成功");
return to_assign(0, "退出成功");
}
public function to_avatars($char)
{
@ -137,12 +137,12 @@ class Login
validate(UserCheck::class)->scene('reg')->check($param);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
$user = Db::name('User')->where(['username' => $param['username']])->find();
if (!empty($user)) {
return to_assign(0, '该账户已经存在');
return to_assign(1, '该账户已经存在');
}
$param['salt'] = set_salt(20);
@ -153,7 +153,7 @@ class Login
$param['headimgurl'] = $this->to_avatars($char);
$uid = Db::name('User')->strict(false)->field(true)->insertGetId($param);
add_user_log('reg', '', $uid);
return to_assign(1, '注册成功，请登录', $uid);
return to_assign(0, '注册成功，请登录', $uid);
}
}

4
app/home/controller/User.php
View File

@ -42,9 +42,9 @@ class User extends BaseController
$res = Db::name('User')->where(['id' => $param['id']])->strict(false)->field(true)->update($param);
if ($res !== false) {
add_user_log('edit', '个人信息', $param['id'], $param);
to_assign(1, '操作成功');
to_assign(0, '操作成功');
} else {
to_assign(0, '操作失败');
to_assign(1, '操作失败');
}
}

2
app/home/middleware/Install.php
View File

@ -14,7 +14,7 @@ class Install
public function handle($request, \Closure $next)
{
if (!is_installed()) {
return $request->isAjax() ? to_assign(0, '请先完成系统安装引导') : redirect((string) url('/install/index'));
return $request->isAjax() ? to_assign(1, '请先完成系统安装引导') : redirect((string) url('/install/index'));
}
return $next($request);

2
app/home/view/common/header.html
View File

@ -30,7 +30,7 @@
url: '/home/login/login_out',
success: function (res) {
layer.msg(res.msg);
if (res.code == 1) {
if (res.code == 0) {
setTimeout(function () {
location.href = "{:url('/')}"
}, 1000)

2
app/home/view/login/index.html
View File

@ -231,7 +231,7 @@
async: false,
success: function (res) {
layer.msg(res.msg);
if (res.code === 1) {
if (res.code === 0) {
setTimeout(function () {
window.location.href="{:url('/home/user/index')}";
}, 1500);

2
app/home/view/login/reg.html
View File

@ -232,7 +232,7 @@
async: false,
success: function (res) {
layer.msg(res.msg);
if (res.code === 1) {
if (res.code === 0) {
setTimeout(function () {
window.location.href="{:url('/home/login/index')}";
}, 2000);

2
app/home/view/user/info_edit.html
View File

@ -157,7 +157,7 @@
async: false,
success: function (res) {
layer.msg(res.msg);
if (res.code === 1) {
if (res.code === 0) {
setTimeout(function () {
window.location.href = "{:url('/home/user/index')}";
}, 1500);

14
app/install/controller/Index.php
View File

@ -75,7 +75,7 @@ class Index
validate(InstallCheck::class)->check($data);
} catch (ValidateException $e) {
// 验证失败 输出错误信息
return to_assign(0, $e->getError());
return to_assign(1, $e->getError());
}
// 连接数据库
$link = @new mysqli("{$data['DB_HOST']}:{$data['DB_PORT']}", $data['DB_USER'], $data['DB_PWD']);
@ -84,16 +84,16 @@ class Index
if (!is_null($error)) {
// 转义防止和alert中的引号冲突
$error = addslashes($error);
return to_assign(0, '数据库链接失败:' . $error);die;
return to_assign(1, '数据库链接失败:' . $error);die;
}
// 设置字符集
$link->query("SET NAMES 'utf8'");
if ($link->server_info < 5.0) {
return to_assign(0, '请将您的mysql升级到5.0以上');die;
return to_assign(1, '请将您的mysql升级到5.0以上');die;
}
// 创建数据库并选中
if (!$link->select_db($data['DB_NAME'])) {
return to_assign(0, '未找到数据库' . $data['DB_NAME'] . ',请先自行创建数据库');die;
return to_assign(1, '未找到数据库' . $data['DB_NAME'] . ',请先自行创建数据库');die;
}
$link->select_db($data['DB_NAME']);
// 导入sql数据并创建表
@ -120,7 +120,7 @@ class Index
. "VALUES "
. "('$username','$password','$nickname','$thumb','$salt','$create_time','$update_time')";
if (!$link->query($create_admin_sql)) {
return to_assign(0, '创建管理员信息失败');
return to_assign(1, '创建管理员信息失败');
}
$link->close();
$db_str = "<?php
@ -180,10 +180,10 @@ return [
// 创建数据库配置文件
if (false == file_put_contents(CMS_ROOT . "config/database.php", $db_str)) {
return to_assign(0, '创建数据库配置文件失败，请检查目录权限');
return to_assign(1, '创建数据库配置文件失败，请检查目录权限');
}
if (false == file_put_contents(CMS_ROOT . "config/install.lock", '勾股CMS安装鉴定文件，请勿删除！！！！！此次安装时间为：' . date('Y-m-d H:i:s', time()))) {
return to_assign(0, '创建安装鉴定文件失败，请检查目录权限');
return to_assign(1, '创建安装鉴定文件失败，请检查目录权限');
}
return to_assign();
}

2
app/install/view/index/step3.html
View File

@ -170,7 +170,7 @@
$('#install').html('创建中...');
},
success: function (res) {
if (res.code == 0) {
if (res.code == 1) {
$('#progress').css('display', 'none');
layer.msg(res.msg);
} else {

591
public/static/admin/js/module/citypicker.js
View File

@ -1,591 +0,0 @@
layui.define(['jquery'], function (exports) {
var $ = layui.$;
'use strict';
if (typeof ChineseDistricts === 'undefined') {
throw new Error('The file "city-picker.data.js" must be included first!');
}
var NAMESPACE = 'citypicker';
var EVENT_CHANGE = 'change.' + NAMESPACE;
// 城市选择类
var CityPicker = function (element, options) {
this.PROVINCE = 'provinceId';
this.CITY = 'cityId';
this.DISTRICT = 'districtId';
this.$element = $(element);
this.$dropdown = null;
this.options = $.extend({}, CityPicker.DEFAULTS, $.isPlainObject(options) && options);
this.active = false;
this.dems = [];
this.needBlur = false;
this.init();
};
CityPicker.prototype = {
constructor: CityPicker,
init: function () {
this.defineDems();
this.render();
this.bind();
this.active = true;
var _this = this;
$(".icon_ca").on('click', function () {
$("#" + this.PROVINCE).val();
$("#" + this.CITY).val();
$("#" + this.DISTRICT).val();
_this.reset();
});
},
render: function () {
var p = this.getPosition(),
placeholder = this.$element.attr('placeholder') || this.options.placeholder,
textspan = '<span class="city-picker-span" style="' +
this.getWidthStyle('100%') + 'height:' +
(p.height - 2) + 'px;line-height:' + (p.height - 1) + 'px;">' +
(placeholder ? '<span class="placeholder">' + placeholder + '</span>' : '') +
'<span class="title"></span><div class="arrow"></div>' + '<i class="icon_ca"></i></span>',
dropdown = '<div class="city-picker-dropdown" style="left:0px;top:100%;' +
this.getWidthStyle(p.width, true) + '">' +
'<div class="city-select-wrap">' +
'<div class="city-select-tab">' +
'<a class="active" data-count="' + this.PROVINCE + '">省份</a>' +
(this.includeDem(this.CITY) ? '<a data-count="' + this.CITY + '">城市</a>' : '') +
(this.includeDem(this.DISTRICT) ? '<a data-count="' + this.DISTRICT + '">区县</a>' : '') + '</div>' +
'<div class="city-select-content">' +
'<div class="city-select province ' + this.PROVINCE + '" data-count="' + this.PROVINCE + '"></div>' +
(this.includeDem(this.CITY) ? '<div class="city-select ' + this.CITY + '" data-count="' + this.CITY + '"></div>' : '') +
(this.includeDem(this.DISTRICT) ? '<div class="city-select ' + this.DISTRICT + '" data-count="' + this.DISTRICT + '"></div>' : '') +
'</div></div>';
this.$element.addClass('city-picker-input');
this.$textspan = $(textspan).insertAfter(this.$element);
this.$dropdown = $(dropdown).insertAfter(this.$textspan);
var $select = this.$dropdown.find('.city-select');
// setup this.$province, this.$city and/or this.$district object
$.each(this.dems, $.proxy(function (i, type) {
this['$' + type] = $select.filter('.' + type + '');
}, this));
this.refresh();
},
refresh: function (force) {
// clean the data-item for each $select
var $select = this.$dropdown.find('.city-select');
$select.data('item', null);
// parse value from value of the target $element
var val = this.$element.val() || '';
val = val.split('/');
$.each(this.dems, $.proxy(function (i, type) {
if (val[i] && i < val.length) {
this.options[type] = val[i];
} else if (force) {
this.options[type] = '';
}
this.output(type);
}, this));
this.tab(this.PROVINCE);
this.feedText();
this.feedVal();
},
defineDems: function () {
var stop = false;
if (this.options.provincename !== "") {
this.PROVINCE = this.options.provincename;
}
if (this.options.cityname !== "") {
this.CITY = this.options.cityname;
}
if (this.options.districtname !== "") {
this.DISTRICT = this.options.districtname;
}
$.each([this.PROVINCE, this.CITY, this.DISTRICT], $.proxy(function (i, type) {
if (!stop) {
this.dems.push(type);
}
if (type === this.options.level) {
stop = true;
}
}, this));
},
includeDem: function (type) {
return $.inArray(type, this.dems) !== -1;
},
getPosition: function () {
var p, h, w, s, pw;
p = this.$element.position();
s = this.getSize(this.$element);
h = s.height;
w = s.width;
if (this.options.responsive) {
pw = this.$element.offsetParent().width();
if (pw) {
w = w / pw;
if (w > 0.99) {
w = 1;
}
w = w * 100 + '%';
}
}
return {
top: p.top || 0,
left: p.left || 0,
height: h,
width: w
};
},
getSize: function ($dom) {
var $wrap, $clone, sizes;
if (!$dom.is(':visible')) {
$wrap = $("<div />").appendTo($("body"));
$wrap.css({
"position": "absolute !important",
"visibility": "hidden !important",
"display": "block !important"
});
$clone = $dom.clone().appendTo($wrap);
sizes = {
width: $clone.outerWidth(),
height: $clone.outerHeight()
};
$wrap.remove();
} else {
sizes = {
width: $dom.outerWidth(),
height: $dom.outerHeight()
};
}
return sizes;
},
getWidthStyle: function (w, dropdown) {
if (this.options.responsive && !$.isNumeric(w)) {
return 'width:' + w + ';';
} else {
return 'width:' + (dropdown ? Math.max(320, w) : w) + 'px;';
}
},
bind: function () {
var $this = this;
$(document).on('click', (this._mouteclick = function (e) {
var $target = $(e.target);
var $dropdown, $span, $input;
if ($target.is('.city-picker-span')) {
$span = $target;
} else if ($target.is('.city-picker-span *')) {
$span = $target.parents('.city-picker-span');
}
if ($target.is('.city-picker-input')) {
$input = $target;
}
if ($target.is('.city-picker-dropdown')) {
$dropdown = $target;
} else if ($target.is('.city-picker-dropdown *')) {
$dropdown = $target.parents('.city-picker-dropdown');
}
if ((!$input && !$span && !$dropdown) ||
($span && $span.get(0) !== $this.$textspan.get(0)) ||
($input && $input.get(0) !== $this.$element.get(0)) ||
($dropdown && $dropdown.get(0) !== $this.$dropdown.get(0))) {
$this.close(true);
}
}));
this.$element.on('change', (this._changeElement = $.proxy(function () {
this.close(true);
this.refresh(true);
}, this))).on('focus', (this._focusElement = $.proxy(function () {
this.needBlur = true;
this.open();
}, this))).on('blur', (this._blurElement = $.proxy(function () {
if (this.needBlur) {
this.needBlur = false;
this.close(true);
}
}, this)));
this.$textspan.on('click', function (e) {
var $target = $(e.target), type;
$this.needBlur = false;
if ($target.is('.select-item')) {
type = $target.data('count');
$this.open(type);
} else {
if ($this.$dropdown.is(':visible')) {
$this.close();
} else {
$this.open();
}
}
}).on('mousedown', function () {
$this.needBlur = false;
});
this.$dropdown.on('click', '.city-select a', function () {
var $select = $(this).parents('.city-select');
var $active = $select.find('a.active');
var last = $select.next().length === 0;
$active.removeClass('active');
$(this).addClass('active');
if ($active.data('code') !== $(this).data('code')) {
$select.data('item', {
address: $(this).attr('title'), code: $(this).data('code')
});
$(this).trigger(EVENT_CHANGE);
$this.feedText();
$this.feedVal();
if (last) {
$this.close();
}
}
}).on('click', '.city-select-tab a', function () {
if (!$(this).hasClass('active')) {
var type = $(this).data('count');
$this.tab(type);
}
}).on('mousedown', function () {
$this.needBlur = false;
});
if (this['$' + this.PROVINCE]) {
this['$' + this.PROVINCE].on(EVENT_CHANGE, (this._changeProvince = $.proxy(function () {
this.output(this.CITY);
this.output(this.DISTRICT);
this.tab(this.CITY);
}, this)));
}
if (this['$' + this.CITY]) {
this['$' + this.CITY].on(EVENT_CHANGE, (this._changeCity = $.proxy(function () {
this.output(this.DISTRICT);
this.tab(this.DISTRICT);
}, this)));
}
},
open: function (type) {
type = type || this.PROVINCE;
this.$dropdown.show();
this.$textspan.addClass('open').addClass('focus');
this.tab(type);
},
close: function (blur) {
this.$dropdown.hide();
this.$textspan.removeClass('open');
if (blur) {
this.$textspan.removeClass('focus');
}
},
unbind: function () {
$(document).off('click', this._mouteclick);
this.$element.off('change', this._changeElement);
this.$element.off('focus', this._focusElement);
this.$element.off('blur', this._blurElement);
this.$textspan.off('click');
this.$textspan.off('mousedown');
this.$dropdown.off('click');
this.$dropdown.off('mousedown');
if (this['$' + this.PROVINCE]) {
this['$' + this.PROVINCE].off(EVENT_CHANGE, this._changeProvince);
}
if (this.$city) {
this.$city.off(EVENT_CHANGE, this._changeCity);
}
},
// 动态添加的input无法删除，切换请求有问题
getText: function () {
var text = '';
this.$dropdown.find('.city-select')
.each(function () {
var item = $(this).data('item'),
type = $(this).data('count');
if (item) {
if(item.code==110100){
item.code=110000;
}
else if(item.code==120100){
item.code=120000;
}
else if(item.code==310100){
item.code=310000;
}
else if(item.code==110100){
item.code=110000;
}
text += ($(this).hasClass('province') ? '' : '/') + '<span class="select-item" data-count="' +
type + '" data-code="' + item.code + '">' + item.address + '</span><input type="hidden" id="' + type + '" name="' + type + '" value="' + item.code + '" />';
}
});
return text;
},
getPlaceHolder: function () {
return this.$element.attr('placeholder') || this.options.placeholder;
},
feedText: function () {
var text = this.getText();
if (text) {
this.$textspan.find('>.placeholder').hide();
// this.$textspan.find('>.title').siblings('input').val('');
//this.$textspan.find('>.title').children().remove();
this.$textspan.find('>.title').children("input").val('');
this.$textspan.find('>.title').html(this.getText()).show();
} else {
this.$textspan.find('>.placeholder').text(this.getPlaceHolder()).show();
this.$textspan.find('>.title').html('').hide();
}
},
getVal: function () {
var text = '';
this.$dropdown.find('.city-select')
.each(function () {
var item = $(this).data('item');
if (item) {
text += ($(this).hasClass('province') ? '' : '/') + item.address;
}
});
return text;
},
feedVal: function () {
this.$element.val(this.getVal());
},
output: function (type) {
var options = this.options;
var PROVINCE = this.PROVINCE;
var CITY = this.CITY;
var DISTRICT = this.DISTRICT;
//var placeholders = this.placeholders;
var $select = this['$' + type];
var data = type === PROVINCE ? {} : [];
var item;
var districts;
var code;
var matched = null;
var value;
if (!$select || !$select.length) {
return;
}
item = $select.data('item');
value = (item ? item.address : null) || options[type];
code = (
type === PROVINCE ? 86 :
type === CITY ? this['$' + PROVINCE] && this['$' + PROVINCE].find('.active').data('code') :
type === DISTRICT ? this['$' + CITY] && this['$' + CITY].find('.active').data('code') : code
);
districts = $.isNumeric(code) ? ChineseDistricts[code] : null;
if ($.isPlainObject(districts)) {
$.each(districts, function (code, address) {
var provs;
if (type === PROVINCE) {
provs = [];
for (var i = 0; i < address.length; i++) {
if (address[i].address === value) {
matched = {
code: address[i].code,
address: address[i].address
};
}
provs.push({
code: address[i].code,
address: address[i].address,
selected: address[i].address === value
});
}
data[code] = provs;
} else {
if (address === value) {
matched = {
code: code,
address: address
};
}
data.push({
code: code,
address: address,
selected: address === value
});
}
});
}
$select.html(type === PROVINCE ? this.getProvinceList(data) :
this.getList(data, type));
$select.data('item', matched);
},
getProvinceList: function (data) {
var PROVINCE = this.PROVINCE;
var list = [],
$this = this,
simple = this.options.simple;
$.each(data, function (i, n) {
list.push('<dl class="clearfix">');
list.push('<dt>' + i + '</dt><dd>');
$.each(n, function (j, m) {
list.push(
'<a' +
' title="' + (m.address || '') + '"' +
' data-code="' + (m.code || '') + '"' +
' class="' +
(m.selected ? ' active' : '') +
'">' +
(simple ? $this.simplize(m.address, PROVINCE) : m.address) +
'</a>');
});
list.push('</dd></dl>');
});
return list.join('');
},
getList: function (data, type) {
var list = [],
$this = this,
simple = this.options.simple;
list.push('<dl class="clearfix"><dd>');
$.each(data, function (i, n) {
list.push(
'<a' +
' title="' + (n.address || '') + '"' +
' data-code="' + (n.code || '') + '"' +
' class="' +
(n.selected ? ' active' : '') +
'">' +
(simple ? $this.simplize(n.address, type) : n.address) +
'</a>');
});
list.push('</dd></dl>');
return list.join('');
},
simplize: function (address, type) {
address = address || '';
if (type === this.PROVINCE) {
return address.replace(/[省,市,自治区,壮族,回族,维吾尔]/g, '');
} else if (type === this.CITY) {
return address.replace(/[市,地区,回族,蒙古,苗族,白族,傣族,景颇族,藏族,彝族,壮族,傈僳族,布依族,侗族]/g, '')
.replace('哈萨克', '').replace('自治州', '').replace(/自治县/, '');
} else if (type === this.DISTRICT) {
return address.length > 2 ? address.replace(/[市,区,县,旗]/g, '') : address;
}
},
tab: function (type) {
var $selects = this.$dropdown.find('.city-select');
var $tabs = this.$dropdown.find('.city-select-tab > a');
var $select = this['$' + type];
var $tab = this.$dropdown.find('.city-select-tab > a[data-count="' + type + '"]');
if ($select) {
$selects.hide();
$select.show();
$tabs.removeClass('active');
$tab.addClass('active');
}
},
reset: function () {
this.$element.val(null).trigger('change');
},
setValue: function (address) { //河南省/信阳市/新县
this.$element.val(address).trigger('change');
},
destroy: function () {
this.unbind();
this.$element.removeData(NAMESPACE).removeClass('city-picker-input');
this.$textspan.remove();
this.$dropdown.remove();
}
};
// 默认值和参数
CityPicker.DEFAULTS = {
simple: false,
responsive: false,
placeholder: '请选择省/市/区',
level: 'district',// 级别
provincename: '',//input hidden 的值
cityname: '',//input hidden 的值
districtname: '',//input hidden 的值
province: '广东省',// 默认省份名称
city: '广州市',// 默认地市名称
district: '天河区'// 默认区县名称
};
CityPicker.setDefaults = function (options) {
$.extend(CityPicker.DEFAULTS, options);
};
// Save the other citypicker
CityPicker.other = $.fn.citypicker;
// Register as jQuery plugin
$.fn.citypicker = function (option) {
var args = [].slice.call(arguments, 1);
return this.each(function () {
var $this = $(this);
var data = $this.data(NAMESPACE);
var options;
var fn;
if (!data) {
if (/destroy/.test(option)) {
return;
}
options = $.extend({}, $this.data(), $.isPlainObject(option) && option);
$this.data(NAMESPACE, (data = new CityPicker(this, options)));
}
if (typeof option === 'string' && $.isFunction(fn = data[option])) {
fn.apply(data, args);
}
});
};
$.fn.citypicker.Constructor = CityPicker;
$.fn.citypicker.setDefaults = CityPicker.setDefaults;
// No conflict
$.fn.citypicker.noConflict = function () {
$.fn.citypicker = CityPicker.other;
return this;
};
exports('citypicker', CityPicker);
});

2
public/static/admin/js/module/echarts.js
View File

File diff suppressed because one or more lines are too long

2
public/static/admin/js/module/tagpicker.js
View File

@ -34,7 +34,7 @@ layui.define(['layer'],function(exports){
type:'post',
data:me.settings.where,
success:function(e){
if(e.code==1){
if(e.code==0){
if(e.data.length>0){
me.ajaxData=e.data;
layer.open({