Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -192,6 +192,7 @@ class InfoController extends Controller
      * 删除
      */
     public function destroy(Request $reqeust) {
+
         $dream = DreamInfoModel::find($reqeust->get('id'));
         if($dream) {
             $old_data_pics = $dream->imgs->toArray();
@@ -203,7 +204,9 @@ class InfoController extends Controller
                     }
                     BaseAttachmentModel::where('url',$old_pic)->delete();
                 }
+                BaseAttachmentModel::where('url',$old_pic)->delete();
             }
+
             DreamImages::where('dream_id',$reqeust->get('id'))->delete();
             $this->repository->destroy($reqeust->get('id'));
             return  $this->showMessage('操作成功');

server/resources/views/admin/dream/info/edit.blade.php

@@ -61,7 +61,7 @@
                    <div class="col-sm-9">
                      <textarea name="data[about]" id="editorabout" required="" aria-required="true" class="form-control" rows="10">{{ $data['about'] or ''}}</textarea>
                                        
-                     {!! editor('editorabout', ['position' => 'ali', 'folder' => 'upload/common'], ['themeType' => 'simple', 'height' => '300px']) !!}
+                   {{--  {!! editor('editorabout', ['position' => 'ali', 'folder' => 'upload/common'], ['themeType' => 'simple', 'height' => '300px']) !!}--}}
                                             
                     </div>
                                 
@@ -185,4 +185,20 @@
 	</div>
 </div>
 
+@endsection
+@section('footer')
+    {{--时间插件--}}
+    <link rel="stylesheet" type="text/css" href="/base/css/time/jquery.datetimepicker.css" />
+    <script src="/base/js/time/build/jquery.datetimepicker.full.js"></script>
+    <script src="/base/js/time/jquery.datetimepicker.js"></script>
+    <script>
+        //        时间选择js
+        $(function() {
+            $.datetimepicker.setLocale('ch');
+            $('#data_time').datetimepicker({
+                step:5,
+//                format: 'yyyy-mm-dd hh:ii'
+            });
+        });
+    </script>
 @endsection