切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
刘朕
6 years ago
提交
98af96dfd448e546ba0a6550c9570cd3ecaf8662
1 个父辈
c53a11fe
1 个管道 的构建
通过
耗费 37 秒
后台筛选点击分页后条件问题修改
变更
8
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
8 个修改的文件
包含
10 行增加
和
2 行删除
app/admin/controller/AuditController.php
app/admin/controller/GoodsController.php
app/admin/controller/OrderscourierController.php
app/admin/controller/SalesmanController.php
app/admin/controller/SalesmangoodsController.php
app/admin/controller/SchoolController.php
app/admin/controller/UsersController.php
app/admin/controller/WithdrawalController.php
app/admin/controller/AuditController.php
查看文件 @
98af96d
...
...
@@ -23,6 +23,7 @@ class AuditController extends AdminBaseController{
$where
[
'phone'
]
=
[
'like'
,
'%'
.
trim
(
$param
[
'keyword'
])
.
'%'
];
}
$data
=
Db
::
name
(
'sale_audit'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
);
$data
->
appends
(
$param
);
$data_arr
=
$data
->
toArray
();
foreach
(
$data_arr
[
'data'
]
as
$key
=>
$val
){
$data_user
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$val
[
'uid'
])
->
find
();
...
...
app/admin/controller/GoodsController.php
查看文件 @
98af96d
...
...
@@ -36,6 +36,7 @@ class GoodsController extends AdminBaseController{
$classif_data
=
Db
::
name
(
'classification'
)
->
select
();
$this
->
assign
(
'classif_data'
,
$classif_data
);
$data
=
Db
::
name
(
'goods'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
);
$data
->
appends
(
$param
);
$data1
=
$data
->
toArray
();
foreach
(
$data1
[
'data'
]
as
$key
=>
$val
){
$class_data
=
Db
::
name
(
'classification'
)
->
where
(
'id'
,
$val
[
'classify_id'
])
->
find
();
...
...
app/admin/controller/OrderscourierController.php
查看文件 @
98af96d
...
...
@@ -26,6 +26,7 @@ class OrderscourierController extends AdminBaseController{
$where
[
'state'
]
=
$param
[
'state'
];
}
$data
=
Db
::
name
(
'indent'
)
->
where
(
$where
)
->
where
(
"state = 2 or state = 3 or state = 5"
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
);
$data
->
appends
(
$param
);
$this
->
assign
(
'start_time'
,
!
empty
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
$this
->
assign
(
'end_time'
,
!
empty
(
$param
[
'end_time'
])
?
$param
[
'end_time'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
...
...
app/admin/controller/SalesmanController.php
查看文件 @
98af96d
...
...
@@ -35,7 +35,7 @@ class SalesmanController extends AdminBaseController{
->
group
(
'a.id'
)
->
order
([
'a.balance'
=>
'DESC'
,
'a.create_time'
=>
'DESC'
])
->
paginate
(
12
);
$data
->
appends
(
$param
);
$data_arr
=
$data
->
toArray
();
$data_money
=
Db
::
name
(
'money_ratio'
)
->
find
();
foreach
(
$data_arr
[
'data'
]
as
$key
=>
$val
){
...
...
app/admin/controller/SalesmangoodsController.php
查看文件 @
98af96d
...
...
@@ -30,6 +30,7 @@ class SalesmangoodsController extends AdminBaseController{
->
where
(
$where
)
->
order
(
'a.create_time'
,
'DESC'
)
->
paginate
(
12
);
$data
->
appends
(
$param
);
$this
->
assign
(
'start_time'
,
!
empty
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
$this
->
assign
(
'end_time'
,
!
empty
(
$param
[
'end_time'
])
?
$param
[
'end_time'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
...
...
app/admin/controller/SchoolController.php
查看文件 @
98af96d
...
...
@@ -23,7 +23,8 @@ class SchoolController extends AdminBaseController{
$keyword
=
trim
(
$param
[
'keyword'
]);
$where
[
'school'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$data1
=
Db
::
name
(
'school'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
)
;
$data1
=
Db
::
name
(
'school'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
);
$data1
->
appends
(
$param
);
$data
=
$data1
->
toArray
();
foreach
(
$data
[
'data'
]
as
$key
=>
$val
){
$user_data
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$val
[
'uid'
])
->
find
();
...
...
app/admin/controller/UsersController.php
查看文件 @
98af96d
...
...
@@ -34,6 +34,7 @@ class UsersController extends AdminBaseController{
->
where
(
$where
)
->
order
([
'a.balance'
=>
'DESC'
,
'a.create_time'
=>
'DESC'
])
->
paginate
(
12
);
$data
->
appends
(
$param
);
$list
=
$data
->
items
();
foreach
(
$list
as
$k
=>
$v
)
{
// 获取邀请人昵称
...
...
app/admin/controller/WithdrawalController.php
查看文件 @
98af96d
...
...
@@ -24,6 +24,7 @@ class WithdrawalController extends AdminBaseController{
$where
[
'b.phone'
]
=
[
'like'
,
'%'
.
trim
(
$param
[
'keyword'
])
.
'%'
];
}
$data
=
Db
::
name
(
'money_expend'
)
->
alias
(
'a'
)
->
field
(
'a.*,b.phone'
)
->
join
(
'my_user b'
,
'a.uid=b.uid'
,
'LEFT'
)
->
where
(
$where
)
->
paginate
(
12
);
$data
->
appends
(
$param
);
$data_arr
=
$data
->
toArray
();
if
(
!
empty
(
$data_arr
)){
foreach
(
$data_arr
[
'data'
]
as
$key
=>
$val
){
...
...
@@ -62,6 +63,7 @@ class WithdrawalController extends AdminBaseController{
->
where
(
$where
)
->
order
(
"a.create_time desc"
)
->
paginate
(
12
);
$data
->
appends
(
$param
);
$data_arr
=
$data
->
toArray
();
$this
->
assign
(
'start_time'
,
!
empty
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
$this
->
assign
(
'end_time'
,
!
empty
(
$param
[
'end_time'
])
?
$param
[
'end_time'
]
:
''
);
...
...
请
注册
或
登录
后发表评论