更新

app/Http/Controllers/Admin/ProjectController.php

@@ -53,7 +53,13 @@ class ProjectController extends BaseController
 
     public function get(Request $request)
     {
-        $items = $this->model->where('id','!=','1')->orderBy('id', 'desc')->orderBy('created_at', 'desc');
+        if ($request->input('type')=='index')
+        {
+            $items = $this->model->where('id','!=','1')->where('active',1)->orderBy('id', 'desc')->orderBy('created_at', 'desc');
+        }else
+        {
+            $items = $this->model->where('id','!=','1')->orderBy('id', 'desc')->orderBy('created_at', 'desc');
+        }
         $tmp_items = collect(['name']);
         foreach($tmp_items as $tmp_item) {
             if($request->has($tmp_item) && !empty($request->input($tmp_item))) {

resources/views/admin/orders/index.blade.php

@@ -96,6 +96,7 @@
                         { field: 'status_name', title: '状态', align: 'center' },
                         { field: 'remark', title: '订单备注', align: 'center' },
                         { field: 'created_at', title: '创建时间', align: 'center' },
+                        { field: 'updated_at', title: '创建时间', align: 'center' },
                         // { title: '操作', align:'center', toolbar: '#sg-table-bar' }
                     ]],
                     page: {

resources/views/admin/projects/apply-index.blade.php

@@ -38,6 +38,9 @@
                             <a class="layui-btn layui-btn-xs" lay-event="pass">通过</a>
                             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="reject">拒绝</a>
                         @{{# } }}
+                        @{{# if(d.active == 2) { }}
+                        <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="active">激活</a>
+                        @{{# } }}
                     </div>
                 </div>
             </script>
@@ -140,6 +143,35 @@
                                 }
                             });
                         });
+                    }else if(obj.event === 'active') {
+                        layer.confirm('确定激活吗？', function(index) {
+                            $.ajax({
+                                method: 'POST',
+                                url: '{{ $pre_uri }}' + 'active',
+                                headers: {
+                                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                                },
+                                data: {
+                                    id: data.id
+                                },
+                                success: function (data) {
+                                    if(data.status === 'success') {
+                                        updateTableBySearch()
+                                    } else {
+                                        layer.msg(data.info, {
+                                            icon: 2
+                                        });
+                                    }
+                                    layer.close(index);
+                                },
+                                error: function () {
+                                    layer.close(index);
+                                    layer.msg('操作失败', {
+                                        icon: 2
+                                    });
+                                }
+                            });
+                        });
                     }
                 });
 

resources/views/admin/projects/index.blade.php

@@ -56,6 +56,7 @@
         </div>
         <div class="layui-card-body">
             <form class="layui-form" id="sg-search-form">
+                <input type="hidden" name="type" value="index">
                 <div class="layui-form-item layui-row">
                     <div class="layui-inline">
                         <div class="layui-input-inline">