Merge branch 'test' into 'master'

Test

See merge request !30

app/Model/MediaModel.php

@@ -68,6 +68,9 @@ class MediaModel extends Eloquent
                     $aggregate[]['$match']['media_type_id'] = $request->category_id;
                 }
 
+                // status：代表未转码
+                $aggregate[]['$match']['status'] = ["\$ne" => '0'];
+                $aggregate[]['$match']['media_url'] = ["\$ne" => 'null'];
 
 //                $aggregate[]['$match']['_id'] = 'mda-864371b9a82d1e21';
 

resources/views/admin/common/foot.blade.php

@@ -12,12 +12,21 @@
 
 <footer>
 
-    <div class="footer">
-
-
-        中公教育 @2020-2030
-    </div>
+    <!-- <div class="footer">
+        中公教育 @2020-2030 京ICP备10218183号 京ICP证161188号   京公网安备 11010802020593号
+    </div> -->
 
+    <div class="footer">
+	    <!-- <div class="copyright">京ICP备10218183号 京ICP证161188号   京公网安备 11010802020593号</div> -->
+	    <p class="copyright">
+	        <a target="_blank" href="https://beian.miit.gov.cn/" rel="nofollow">京ICP备10218183号-106</a>
+	        <img src="{{ asset('images/gongbei.png')}}" style="vertical-align:-5px;">
+	        京ICP证161188号
+	        <a style="padding-left: 8px;" target="_blank" href="https://zzlz.gsxt.gov.cn/businessCheck/verifKey.do?showType=p&amp;serial=91110108551426892J-SAIC_SHOW_10000091110108551426892J1597816757943&amp;signData=MEYCIQC/42StZW2bD8m5uoQqcZLKqORskB7sTTjUa10R/GZdNgIhAJ0BOPBSmJPKn7/0pIvBKWNxZ2XIn0l5XVNsHFmqCMmS" rel="nofollow">
+	            <img src="https://s.eoffcn.com//zytg/202008/175c14f5-3bf5-63cd-0c61-12627f47775e.png" width="20" height="20" style="vertical-align:-5px;">
+	        </a>
+	    </p>
+	</div>
 
 </footer>
 

resources/views/admin/login.blade.php

@@ -72,6 +72,8 @@
         </div>
     </div>
 </section>
+@include('admin.common.foot')
+
 <!--Global Javascript -->
 <script src="{{ asset('xadmin/js/jquery.min.js')}}"></script>
 <script src="{{ asset('xadmin/js/jquery.cookie.js')}}"></script>