切换导航条
此项目
正在载入...
登录
潘浩文
/
scoreshop
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
潘浩文
6 years ago
提交
a2d5f3fdf78e4cf04bded27199bf3facc24f447d
1 个父辈
c6256c65
1 个管道 的构建
通过
耗费 0 秒
测试反馈修改
变更
9
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
9 个修改的文件
包含
11 行增加
和
3 行删除
app/portal/controller/AdminActiveController.php
app/portal/controller/AdminBrandCategoryController.php
app/portal/controller/AdminBrandController.php
app/portal/controller/AdminCommentController.php
app/portal/controller/AdminPrizeCategoryController.php
app/portal/controller/AdminPrizeController.php
app/portal/controller/AdminPrizeOrderController.php
app/portal/controller/AdminScoreController.php
app/user/controller/AdminIndexController.php
app/portal/controller/AdminActiveController.php
查看文件 @
a2d5f3f
...
...
@@ -36,6 +36,7 @@ class AdminActiveController extends AdminBaseController
$data
=
Db
::
name
(
'active'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'desc'
)
->
paginate
(
'15'
);
$data
->
appends
(
$param
);
...
...
app/portal/controller/AdminBrandCategoryController.php
查看文件 @
a2d5f3f
...
...
@@ -20,7 +20,7 @@ class AdminBrandCategoryController extends AdminBaseController
//商家分类
public
function
index
()
{
$data
=
Db
::
name
(
'brand_category'
)
->
where
(
'status'
,
1
)
->
select
();
$data
=
Db
::
name
(
'brand_category'
)
->
where
(
'status'
,
1
)
->
order
(
'create_time'
,
'desc'
)
->
select
();
$this
->
assign
(
'list'
,
$data
);
return
$this
->
fetch
();
}
...
...
app/portal/controller/AdminBrandController.php
查看文件 @
a2d5f3f
...
...
@@ -44,6 +44,7 @@ class AdminBrandController extends AdminBaseController
->
join
(
'brand_category bc2'
,
'b.floor_id=bc2.id'
)
->
where
(
$where
)
->
field
(
'b.*,bc1.name as bc1name,bc2.name as bc2name'
)
->
order
(
'b.create_time'
,
'desc'
)
->
paginate
(
'15'
);
$data
->
appends
(
$param
);
...
...
app/portal/controller/AdminCommentController.php
查看文件 @
a2d5f3f
...
...
@@ -44,6 +44,7 @@ class AdminCommentController extends AdminBaseController
->
join
(
'users u'
,
'u.id=c.users_id'
)
->
where
(
'c.status'
,
1
)
->
field
(
'u.*,b.name,c.*'
)
->
order
(
'c.create_time'
,
'desc'
)
->
paginate
(
'15'
);
// $ca1=Db::name('brand_category')->where('status',1)->select();
...
...
@@ -65,6 +66,7 @@ class AdminCommentController extends AdminBaseController
->
join
(
'active a'
,
'c.cid=a.id'
)
->
join
(
'users u'
,
'c.users_id=u.id'
)
->
where
(
'c.status'
,
2
)
->
order
(
'c.create_time'
,
'desc'
)
->
field
(
'u.*,a.name,c.*'
)
->
paginate
(
'15'
);
$this
->
assign
(
'list'
,
$data
);
...
...
@@ -79,6 +81,7 @@ class AdminCommentController extends AdminBaseController
->
join
(
'users u'
,
'c.users_id=u.id'
)
->
where
(
'c.status'
,
3
)
->
field
(
'u.*,p.name,c.*'
)
->
order
(
'c.create_time'
,
'desc'
)
->
paginate
(
'15'
);
$this
->
assign
(
'list'
,
$data
);
$this
->
assign
(
'page'
,
$data
->
render
());
...
...
app/portal/controller/AdminPrizeCategoryController.php
查看文件 @
a2d5f3f
...
...
@@ -20,7 +20,7 @@ class AdminPrizeCategoryController extends AdminBaseController
//礼品分类
public
function
index
()
{
$data
=
Db
::
name
(
'prize_category'
)
->
select
();
$data
=
Db
::
name
(
'prize_category'
)
->
order
(
'create_time'
,
'desc'
)
->
select
();
$this
->
assign
(
'list'
,
$data
);
return
$this
->
fetch
();
}
...
...
app/portal/controller/AdminPrizeController.php
查看文件 @
a2d5f3f
...
...
@@ -37,6 +37,7 @@ class AdminPrizeController extends AdminBaseController
->
join
(
'prize_category pc'
,
'p.category_id=pc.id'
)
->
where
(
$where
)
->
field
(
'p.*,pc.name as pcname'
)
->
order
(
'p.create_time'
,
'desc'
)
->
paginate
(
'15'
)
->
each
(
function
(
$item
)
{
$item
[
'order'
]
=
Db
::
name
(
'prize_order'
)
->
where
(
'prize_id'
,
$item
[
'id'
])
->
count
();
...
...
app/portal/controller/AdminPrizeOrderController.php
查看文件 @
a2d5f3f
...
...
@@ -35,6 +35,7 @@ class AdminPrizeOrderController extends AdminBaseController
->
join
(
'users u'
,
'po.users_id=u.id'
)
->
where
(
$where
)
->
field
(
'po.*,p.name,p.score as pscore,po.status as postatus,u.nickname,u.mobile'
)
->
order
(
'po.create_time'
,
'desc'
)
->
paginate
(
'15'
);
$data
->
appends
(
$param
);
...
...
app/portal/controller/AdminScoreController.php
查看文件 @
a2d5f3f
...
...
@@ -35,6 +35,7 @@ class AdminScoreController extends AdminBaseController
->
join
(
'users u'
,
'us.users_id=u.id'
)
->
where
(
$where
)
->
field
(
'us.*,u.nickname,u.mobile'
)
->
order
(
'us.create_time'
,
'desc'
)
->
paginate
(
'15'
);
$data
->
appends
(
$param
);
...
...
app/user/controller/AdminIndexController.php
查看文件 @
a2d5f3f
...
...
@@ -75,7 +75,7 @@ class AdminIndexController extends AdminBaseController
$keyword
=
$request
[
'keyword'
];
$where
[
'nickname|mobile'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$list
=
Db
::
name
(
'users'
)
->
where
(
$where
)
->
paginate
(
'15'
);
$list
=
Db
::
name
(
'users'
)
->
where
(
$where
)
->
order
(
'create_time'
,
'desc'
)
->
paginate
(
'15'
);
// 获取分页显示
$page
=
$list
->
render
();
$this
->
assign
(
'start_time'
,
isset
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
...
...
请
注册
或
登录
后发表评论