Merge branch 'test' into 'master'

Test

See merge request !32

public/xadmin/css/pages/login.css

@@ -11,7 +11,7 @@ License URL: https://creativecommons.org/licenses/by/4.0/
  .overlay {
      position: absolute;
      width: 100%;
-     height: 100vh;
+     height: 94vh;
      z-index: 0;
     background: rgba(0, 0, 0, 0.66); 
     background: linear-gradient(to bottom, rgba(123, 67, 151, 0.35), rgba(33, 150, 243, 0.55));
@@ -31,7 +31,7 @@ License URL: https://creativecommons.org/licenses/by/4.0/
 }
   
  .hero-area {
-     height: 100vh;
+     height: 94vh;
      display: flex;
      justify-content: center;
      align-items: center;

public/xadmin/extra/toast/js/toast.js

@@ -20,7 +20,7 @@
 		}
     }
 
-    loadStyles(baseurl+"/xadmin/extra/toast/css/animate.css");
+    // loadStyles(baseurl+"/xadmin/extra/toast/css/animate.css");
 
 	//显示提示信息    toast
 	$.fn.toast = function(options){

public/xadmin/js/common.js

 //var baseurl = 'http://local.www.nxxadmin.com';
-var baseurl = 'http://39.105.38.33';
+//var baseurl = 'http://39.105.38.33';
 /**
  * fetch提交
  * @param method,url,opts

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

@@ -17,25 +17,28 @@
     </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>
+        <!-- <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>
+            京ICP证161188号
+            {{--        <img src="{{ asset('images/gongbei.png')}}" style="vertical-align:-5px;">--}}
+            {{--<a href="//www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802020664" target="_blank" rel="nofollow">京公网安备11010802020664号</a>--}}
+            <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>
 
 <style>
     .footer{
         margin: auto;
+        padding-top: 8px;
         text-align: center;
-        height: 60px;
-        line-height: 60px;
+        height: 30px;
+        line-height: 30px;
     }
 </style>
 {{--<link rel="stylesheet" href="{{ asset('xadmin/extra/jqueryToast/css/toast.style.css')}}">--}}