sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.7.0' of gitee.com:gongfuxiang/shopxo into v1.7.0

feat/task1-c-wallet
devil_gong 2019-09-17 16:30:21 +08:00
parent b3bcc0aa4c fe38edcfd9
commit a9fb72590e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/lang/zh-cn.php
View File

@ -367,7 +367,7 @@ return array(
'common_regex_pwd' => '^.{6,18}$',
// 手机号码
'common_regex_mobile' => '^1((3|5|8|7){1}\d{1})\d{8}$',
'common_regex_mobile' => '^1((3|5|6|7|8|9){1}\d{1})\d{8}$',
// 座机号码
'common_regex_tel' => '^\d{3,4}-?\d{8}$',

6
application/service/AdminPowerService.php
View File

@ -35,8 +35,8 @@ class AdminPowerService
$field = empty($params['field']) ? '*' : $params['field'];
$order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']);
// 获取管理员列表
$data = Db::name('Power')->where($where)->order($order_by)->select();
// 获取权限菜单列表
$data = Db::name('Power')->field($field)->where($where)->order($order_by)->select();
if(!empty($data))
{
foreach($data as &$v)
@ -185,7 +185,7 @@ class AdminPowerService
$field = empty($params['field']) ? '*' : $params['field'];
$order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']);
// 获取管理员列表
// 获取角色列表
$data = Db::name('Role')->where($where)->order($order_by)->select();
if(!empty($data))
{

2
application/service/UserService.php
View File

@ -133,7 +133,7 @@ class UserService
$m = isset($params['m']) ? intval($params['m']) : 0;
$n = isset($params['n']) ? intval($params['n']) : 10;
// 获取管理员列表
// 获取用户列表
$data = Db::name('User')->where($where)->order($order_by)->limit($m, $n)->select();
if(!empty($data))
{