切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
刘朕
6 years ago
提交
4a0ef914a9983a968d900f86c56b7a3db1188580
1 个父辈
f4f47eae
1 个管道 的构建
通过
耗费 1 秒
后台列表搜索优化
变更
9
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
9 个修改的文件
包含
25 行增加
和
23 行删除
app/admin/controller/AuditController.php
app/admin/controller/GoodsController.php
app/admin/controller/OrderscourierController.php
app/admin/controller/PlatformordersController.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
查看文件 @
4a0ef91
...
...
@@ -20,7 +20,7 @@ class AuditController extends AdminBaseController{
$where
[
'create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$where
[
'phone'
]
=
$param
[
'keyword
'
];
$where
[
'phone'
]
=
[
'like'
,
'%'
.
trim
(
$param
[
'keyword'
])
.
'%
'
];
}
$data
=
Db
::
name
(
'sale_audit'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
);
$data_arr
=
$data
->
toArray
();
...
...
@@ -30,7 +30,7 @@ class AuditController extends AdminBaseController{
}
$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'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'data_arr'
,
$data_arr
[
'data'
]);
return
$this
->
fetch
();
...
...
app/admin/controller/GoodsController.php
查看文件 @
4a0ef91
...
...
@@ -21,7 +21,7 @@ class GoodsController extends AdminBaseController{
$where
[
'create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
$param
[
'keyword'
]
;
$keyword
=
trim
(
$param
[
'keyword'
])
;
$where
[
'book_name'
]
=
[
'like'
,
"%
$keyword
%"
];
}
if
(
!
empty
(
$param
[
'classify_id'
])){
...
...
@@ -43,7 +43,7 @@ class GoodsController extends AdminBaseController{
}
$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'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'classify_id'
,
!
empty
(
$param
[
'classify_id'
])
?
$param
[
'classify_id'
]
:
''
);
$this
->
assign
(
'data'
,
$data1
[
'data'
]);
$this
->
assign
(
'res'
,
$data
);
...
...
app/admin/controller/OrderscourierController.php
查看文件 @
4a0ef91
...
...
@@ -20,18 +20,18 @@ class OrderscourierController extends AdminBaseController{
$where
[
'create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$where
[
'order_number'
]
=
[
'like'
,
'%'
.
$param
[
'keyword'
]
.
'%'
];
$where
[
'order_number'
]
=
[
'like'
,
'%'
.
trim
(
$param
[
'keyword'
])
.
'%'
];
}
if
(
!
empty
(
$param
[
'state'
])){
$where
[
'state'
]
=
$param
[
'state'
];
}
$data
=
Db
::
name
(
'indent'
)
->
where
(
$where
)
->
where
(
"state = 2 or state = 3 or state = 5"
)
->
paginate
(
12
);
$data
=
Db
::
name
(
'indent'
)
->
where
(
$where
)
->
where
(
"state = 2 or state = 3 or state = 5"
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
);
$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'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'state'
,
!
empty
(
$param
[
'state'
])
?
$param
[
'state'
]
:
''
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
}
...
...
app/admin/controller/PlatformordersController.php
查看文件 @
4a0ef91
...
...
@@ -22,7 +22,7 @@ class PlatformordersController extends AdminBaseController{
$where
[
'create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$where
[
'order_number|name|phone'
]
=
[
'like'
,
'%'
.
$param
[
'keyword'
]
.
'%'
];
$where
[
'order_number|name|phone'
]
=
[
'like'
,
'%'
.
trim
(
$param
[
'keyword'
])
.
'%'
];
}
if
(
!
empty
(
$param
[
'state'
])){
$where
[
'state'
]
=
$param
[
'state'
];
...
...
@@ -38,7 +38,7 @@ class PlatformordersController extends AdminBaseController{
$this
->
assign
(
'data1'
,
$data1
[
'data'
]);
$this
->
assign
(
'start_time'
,
isset
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
$this
->
assign
(
'end_time'
,
isset
(
$param
[
'end_time'
])
?
$param
[
'end_time'
]
:
''
);
$this
->
assign
(
'keyword'
,
isset
(
$param
[
'keyword'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
isset
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'state'
,
isset
(
$param
[
'state'
])
?
$param
[
'state'
]
:
''
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
...
...
app/admin/controller/SalesmanController.php
查看文件 @
4a0ef91
...
...
@@ -21,7 +21,7 @@ class SalesmanController extends AdminBaseController{
// $where['audit_time'] = [['>=',$start_time],['<=',$end_time]];
// }
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
$param
[
'keyword'
]
;
$keyword
=
trim
(
$param
[
'keyword'
])
;
$where
[
'b.phone|u.user_nickname'
]
=
[
'like'
,
'%'
.
$keyword
.
'%'
];
}
if
(
!
empty
(
$param
[
'id'
])){
...
...
@@ -50,8 +50,7 @@ class SalesmanController extends AdminBaseController{
}
$this
->
assign
(
'data_arr'
,
$data_arr
[
'data'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'user_nickname'
,
!
empty
(
$param
[
'user_nickname'
])
?
$param
[
'user_nickname'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'id'
,
!
empty
(
$param
[
'id'
])
?
$param
[
'id'
]
:
''
);
return
$this
->
fetch
();
...
...
app/admin/controller/SalesmangoodsController.php
查看文件 @
4a0ef91
...
...
@@ -21,7 +21,7 @@ class SalesmangoodsController extends AdminBaseController{
$where
[
'a.create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
$param
[
'keyword'
]
;
$keyword
=
trim
(
$param
[
'keyword'
])
;
$where
[
'a.book_name'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$data
=
Db
::
name
(
'goods'
)
->
alias
(
'a'
)
...
...
@@ -32,7 +32,7 @@ class SalesmangoodsController extends AdminBaseController{
->
paginate
(
12
);
$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'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
...
...
app/admin/controller/SchoolController.php
查看文件 @
4a0ef91
...
...
@@ -20,7 +20,7 @@ class SchoolController extends AdminBaseController{
$where
[
'create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
$param
[
'keyword'
]
;
$keyword
=
trim
(
$param
[
'keyword'
])
;
$where
[
'school'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$data1
=
Db
::
name
(
'school'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'DESC'
)
->
paginate
(
12
)
;
...
...
@@ -29,6 +29,9 @@ class SchoolController extends AdminBaseController{
$user_data
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$val
[
'uid'
])
->
find
();
$data
[
'data'
][
$key
][
'uname'
]
=
$user_data
[
'user_nickname'
];
}
$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'
])
:
''
);
$this
->
assign
(
'data'
,
$data
[
'data'
]);
$this
->
assign
(
'res'
,
$data1
);
return
$this
->
fetch
();
...
...
app/admin/controller/UsersController.php
查看文件 @
4a0ef91
...
...
@@ -15,7 +15,7 @@ class UsersController extends AdminBaseController{
'a.create_time'
=>
[
'>='
,
0
],
];
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
$param
[
'keyword'
]
;
$keyword
=
trim
(
$param
[
'keyword'
])
;
$where
[
'b.user_nickname'
]
=
[
'like'
,
"%
$keyword
%"
];
}
if
(
!
empty
(
$param
[
'id'
])){
...
...
@@ -66,7 +66,7 @@ class UsersController extends AdminBaseController{
}
$this
->
assign
(
'list'
,
$list
);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'
user_nickname'
,
!
empty
(
$param
[
'user_nickname'
])
?
$param
[
'user_nickname'
]
:
''
);
$this
->
assign
(
'
keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'status'
,
!
empty
(
$param
[
'identity'
])
?
$param
[
'identity'
]
:
''
);
$this
->
assign
(
'id'
,
!
empty
(
$param
[
'id'
])
?
$param
[
'id'
]
:
''
);
return
$this
->
fetch
();
...
...
app/admin/controller/WithdrawalController.php
查看文件 @
4a0ef91
...
...
@@ -21,7 +21,7 @@ class WithdrawalController extends AdminBaseController{
$where
[
'a.create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$where
[
'b.phone'
]
=
[
'like'
,
'%'
.
$param
[
'keyword'
]
.
'%'
];
$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_arr
=
$data
->
toArray
();
...
...
@@ -33,7 +33,7 @@ class WithdrawalController extends AdminBaseController{
}
$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'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'data_arr'
,
$data_arr
[
'data'
]);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
...
...
@@ -52,7 +52,7 @@ class WithdrawalController extends AdminBaseController{
$where
[
'a.create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$param
[
'keyword'
])){
$where
[
'b.phone'
]
=
[
'like'
,
'%'
.
$param
[
'keyword'
]
.
'%'
];
$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
)
->
order
(
"a.create_time desc"
)
->
paginate
(
12
);
$data_arr
=
$data
->
toArray
();
...
...
@@ -64,7 +64,7 @@ class WithdrawalController extends AdminBaseController{
}
$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'
])
?
$param
[
'keyword'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'data_arr'
,
$data_arr
[
'data'
]);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
...
...
请
注册
或
登录
后发表评论