Merge branch 'test' into 'master'

test

See merge request !25

resources/views/admin/media/media_edit.blade.php

@@ -43,6 +43,7 @@
                     <br>
                     <form id="newForm">
                         <input type="hidden" name="_token" value="{{csrf_token()}}">
+                        <input type="hidden" name="media_type" value="{{$media["media_type_id"]}}">
                         {{ method_field('PUT')}}
 
                         <div class="form-group">
@@ -177,7 +178,7 @@
 
                 console.log("formdata",formdata)
 
-                fetch_response('POST',"/web/media_manager/{{$media['_id']}}", formdata).then(function (res) {
+                fetch_response('POST',"/web/media_model/{{$media['_id']}}", formdata).then(function (res) {
                     if (res.code == 200) {
                         $('body').toast({
                             position: 'fixed',
@@ -186,7 +187,7 @@
                             top: '50%'
                         });
                         setTimeout(function () {
-                            window.location.href = '/web/media_manager';
+                            window.location.href = '/web/media_model';
                         }, 2000)
 
                     } else {

resources/views/admin/media/media_list.blade.php

@@ -32,7 +32,7 @@
             <div class="row ml20">
                 <div class="xblock">
 
-                    <button class="btn btn-primary" onclick="x_admin_show('/web/media_manager/create')">
+                    <button class="btn btn-primary" onclick="x_admin_show('/web/media_model/create')">
                         添加
                     </button>