Commit 4365c1b3 authored by wangtao's avatar wangtao

管理后台 看板

parent d994396c
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="layui-inline" style="width:150px;"> <div class="layui-inline" style="width:150px;">
<select name="sh_status" id="statusselect-tixian"> <select name="sh_status" id="statusselect-tixian">
<option value="-1">审核状态</option> <option value="-1">审核状态</option>
<option value="0" {php}if(input('sh_status') == 0){echo 'selected';}{/php}>待审核</option> <option value="0" {php}if(input('sh_status') === '0'){echo 'selected';}{/php}>待审核</option>
<option value="1" {php}if(input('sh_status') == 1){echo 'selected';}{/php}>审核失败</option> <option value="1" {php}if(input('sh_status') == 1){echo 'selected';}{/php}>审核失败</option>
<option value="2" {php}if(input('sh_status') == 2){echo 'selected';}{/php}>审核通过</option> <option value="2" {php}if(input('sh_status') == 2){echo 'selected';}{/php}>审核通过</option>
</select> </select>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="layui-inline" style="width:150px;"> <div class="layui-inline" style="width:150px;">
<select name="dk_status" id="dkstatusselect-tixian"> <select name="dk_status" id="dkstatusselect-tixian">
<option value="-1">打款状态</option> <option value="-1">打款状态</option>
<option value="0" {php}if(input('dk_status') == 0){echo 'selected';}{/php}>未打款</option> <option value="0" {php}if(input('dk_status') === '0'){echo 'selected';}{/php}>未打款</option>
<option value="1" {php}if(input('dk_status') == 1){echo 'selected';}{/php}>打款中</option> <option value="1" {php}if(input('dk_status') == 1){echo 'selected';}{/php}>打款中</option>
<option value="2" {php}if(input('dk_status') == 2){echo 'selected';}{/php}>打款失败</option> <option value="2" {php}if(input('dk_status') == 2){echo 'selected';}{/php}>打款失败</option>
<option value="3" {php}if(input('dk_status') == 3){echo 'selected';}{/php}>已打款</option> <option value="3" {php}if(input('dk_status') == 3){echo 'selected';}{/php}>已打款</option>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="layui-inline" style="width:150px;"> <div class="layui-inline" style="width:150px;">
<select name="status" id="statusselect"> <select name="status" id="statusselect">
<option value="-1">审核状态</option> <option value="-1">审核状态</option>
<option value="0" {php}if(input('status') == 0){echo 'selected';}{/php}>待提交</option> <option value="0" {php}if(input('status') === '0'){echo 'selected';}{/php}>待提交</option>
<option value="1" {php}if(input('status') == 1){echo 'selected';}{/php}>待审核</option> <option value="1" {php}if(input('status') == 1){echo 'selected';}{/php}>待审核</option>
<option value="2" {php}if(input('status') == 2){echo 'selected';}{/php}>审核失败</option> <option value="2" {php}if(input('status') == 2){echo 'selected';}{/php}>审核失败</option>
<option value="3" {php}if(input('status') == 3){echo 'selected';}{/php}>审核成功</option> <option value="3" {php}if(input('status') == 3){echo 'selected';}{/php}>审核成功</option>
......
...@@ -95,6 +95,6 @@ layui.config({ ...@@ -95,6 +95,6 @@ layui.config({
}); });
}); });
</script> </script>
<script src="https://cdn.jsdelivr.net/npm/echarts@5.6.0/dist/echarts.min.js"></script> <script src="{STATIC__PATH}/admin/echarts.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="layui-inline" style="width:150px;"> <div class="layui-inline" style="width:150px;">
<select name="sh_status" id="statusselect-project"> <select name="sh_status" id="statusselect-project">
<option value="">审核状态</option> <option value="">审核状态</option>
<option value="0" {php}if(input('sh_status') == 0){echo 'selected';}{/php}>审核中</option> <option value="0" {php}if(input('sh_status') === '0'){echo 'selected';}{/php}>审核中</option>
<option value="1" {php}if(input('sh_status') == 1){echo 'selected';}{/php}>审核失败</option> <option value="1" {php}if(input('sh_status') == 1){echo 'selected';}{/php}>审核失败</option>
<option value="2" {php}if(input('sh_status') == 2){echo 'selected';}{/php}>审核通过</option> <option value="2" {php}if(input('sh_status') == 2){echo 'selected';}{/php}>审核通过</option>
</select> </select>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<option value="-1">审核状态</option> <option value="-1">审核状态</option>
<option value="1" {php}if(input('status') == 1){echo 'selected';}{/php}>审核通过</option> <option value="1" {php}if(input('status') == 1){echo 'selected';}{/php}>审核通过</option>
<option value="2" {php}if(input('status') == 2){echo 'selected';}{/php}>审核失败</option> <option value="2" {php}if(input('status') == 2){echo 'selected';}{/php}>审核失败</option>
<option value="0" {php}if(input('status') == 0){echo 'selected';}{/php}>待审核</option> <option value="0" {php}if(input('status') === '0'){echo 'selected';}{/php}>待审核</option>
</select> </select>
</div> </div>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<option value="-1">审核状态</option> <option value="-1">审核状态</option>
<option value="1" {php}if(input('status') == 1){echo 'selected';}{/php}>审核通过</option> <option value="1" {php}if(input('status') == 1){echo 'selected';}{/php}>审核通过</option>
<option value="2" {php}if(input('status') == 2){echo 'selected';}{/php}>审核失败</option> <option value="2" {php}if(input('status') == 2){echo 'selected';}{/php}>审核失败</option>
<option value="0" {php}if(input('status') == 0){echo 'selected';}{/php}>待审核</option> <option value="0" {php}if(input('status') === '0'){echo 'selected';}{/php}>待审核</option>
</select> </select>
</div> </div>
......
...@@ -22,16 +22,17 @@ class ShCourse extends BaseController ...@@ -22,16 +22,17 @@ class ShCourse extends BaseController
public function getShCourseList(Request $request) public function getShCourseList(Request $request)
{ {
$parm = $request->param(); $parm = $request->param();
$where = ['is_del' => 0, 'user_id' => $request->userId]; $where = ['sh_course.is_del' => 0, 'user_id' => $request->userId];
$map = []; $map = [];
if (isset($parm['searchKeyWords']) && $parm['searchKeyWords']) { if (isset($parm['searchKeyWords']) && $parm['searchKeyWords']) {
$map[] = ['title', 'like', '%' . $parm['searchKeyWords'] . '%']; $map[] = ['title', 'like', '%' . $parm['searchKeyWords'] . '%'];
} }
if (isset($parm['status']) && $parm['status']) { if (isset($parm['status']) && $parm['status'] || $parm['status'] === '0') {
$map[] = ['status', '=', $parm['status']]; $map[] = ['status', '=', $parm['status']];
} }
if (isset($parm['cate_id']) && $parm['cate_id']) { $hasmap = [];
$map[] = ['cate_id', '=', $parm['cate_id']]; if (isset($parm['cate_name']) && $parm['cate_name']) {
$hasmap[] = ['course_category.title', 'like', '%' . $parm['cate_name'] . '%'];
} }
if (isset($parm['start_time']) && $parm['start_time'] && isset($parm['end_time']) && $parm['end_time']) { if (isset($parm['start_time']) && $parm['start_time'] && isset($parm['end_time']) && $parm['end_time']) {
...@@ -43,10 +44,11 @@ class ShCourse extends BaseController ...@@ -43,10 +44,11 @@ class ShCourse extends BaseController
$page = $request->param('page', 1); $page = $request->param('page', 1);
$pageSize = $request->param('pageSize', 10); $pageSize = $request->param('pageSize', 10);
$list = ShCourseModel::where($where)->where($map) $list = ShCourseModel::where($where)->where($map)->hasWhere('coursecatedata', $hasmap)
->field('id,title,createtime,thumb,tag_ids,price,status,is_sell,is_del,tvclick,click,cate_id,teacher_id') ->field('sh_course.id,sh_course.title,sh_course.createtime,sh_course.thumb,tag_ids,price,status,is_sell,tvclick,click,cate_id,teacher_id')
->order('createtime desc') ->order('createtime desc')
->append(['thumbpath', 'cate_name', 'teacher_name', 'status_text']) ->with(['coursecatedata'])
->append(['thumbpath', 'teacher_name', 'status_text'])
->paginate([ ->paginate([
'page' => $page, 'page' => $page,
'list_rows' => $pageSize 'list_rows' => $pageSize
......
...@@ -94,6 +94,11 @@ class ShCourse extends Model ...@@ -94,6 +94,11 @@ class ShCourse extends Model
return $selltext; return $selltext;
} }
public function coursecatedata()
{
return $this->hasOne(CourseCategory::class, 'id', 'cate_id')
->field('id,title');
}
} }
\ No newline at end of file
...@@ -32,5 +32,5 @@ return [ ...@@ -32,5 +32,5 @@ return [
'error_message' => '页面错误!请稍后再试~', 'error_message' => '页面错误!请稍后再试~',
// 显示错误信息 // 显示错误信息
'show_error_msg' => false, 'show_error_msg' => false,
'file_http_url' => 'http://192.168.4.28:8082', 'file_http_url' => 'http://192.168.4.29:8082',
]; ];
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment