Merge branch 'test' into 'master'

Test

See merge request !9

app/Model/MediaModel.php

@@ -328,14 +328,7 @@ class MediaModel extends Eloquent
         $res = [];
 
         foreach ($tmp as $item){
-            $res[] = $item->groupBy("book_num");
-        }
-
-        /**
-         * 排除res为空
-         */
-        if (!isset($res[0]) || empty($res[0]->first())){
-            return [];
+            $res = $item->groupBy("book_num");
         }
 
         return $res;

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

@@ -85,7 +85,7 @@
                             <label for="mobile">媒资视频链接</label>
                             <div class="input-group ">
                                 <div class="input-group-addon"><i class="iconfont">&#xe746;</i></div>
-                                <input type="text" class="form-control" name="media_url" id="media_url" value="{{$media['media_url']}}"
+                                <input type="text" class="form-control" name="media_url" id="media_url" disabled value="{{$media['media_url']}}"
                                        placeholder="视频链接">
                             </div>
                         </div>
@@ -98,7 +98,7 @@
 
                         <div class="form-group">
                             <label class="secret-key">私钥</label>
-                            <textarea class="form-control" name="secret_key" id="secret-key" rows="5" placeholder="私钥">{{$media['secret_key']}}</textarea>
+                            <textarea disabled class="form-control" name="secret_key" id="secret-key" rows="5" placeholder="私钥">{{$media['secret_key']}}</textarea>
                         </div>
 
                         <button type="submit" onclick="registerUser();" class="btn btn-general btn-blue mr-2">确认</button>