Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev

Author: QM303176530

web/src/view/login/login.vue

@@ -82,7 +82,7 @@
           /></a>
         </div>
         <div class="copyright">
-          Copyright &copy; 2020 💖flipped-aurora
+          Copyright &copy; {{ curYear }} 💖flipped-aurora
         </div>
       </div>
     </div>
@@ -110,8 +110,8 @@ export default {
         callback();
       }
     };
-
     return {
+      curYear: 0,
       lock: "lock",
       loginForm: {
         username: "admin",
@@ -130,6 +130,7 @@ export default {
   },
   created() {
     this.loginVefify();
+    this.curYear = new Date().getFullYear();
   },
   methods: {
     ...mapActions("user", ["LoginIn"]),
@@ -216,6 +217,8 @@ export default {
   }
 
   .container {
+    position: relative;
+    overflow: auto;
     width: 100%;
     min-height: 100%;
     background: #f0f2f5 url(~@/assets/background.svg) no-repeat 50%;
@@ -227,6 +230,7 @@ export default {
 
     .top {
       text-align: center;
+      margin-top: 20px;
       .header {
         height: 44px;
         line-height: 44px;
@@ -271,12 +275,11 @@ export default {
     }
 
     .footer {
-      position: absolute;
+      position: relative;
       width: 100%;
-      padding: 0 16px;
-      margin: 120px 0 24px;
+      padding: 0 20px;
+      margin: 40px 0 10px;
       text-align: center;
-      bottom: 100px;
       .links {
         margin-bottom: 8px;
         font-size: 14px;

web/src/view/login/register.vue

@@ -217,6 +217,7 @@ export default {
 
     .top {
       text-align: center;
+      margin-top: -50px;
       .header {
         height: 44px;
         line-height: 44px;
@@ -261,12 +262,10 @@ export default {
     }
 
     .footer {
-      position: absolute;
+      position: relative;
       width: 100%;
-      padding: 0 16px;
-      margin: 120px 0 24px;
+      margin: 40px 0 0 0;
       text-align: center;
-      bottom: 100px;
       .links {
         margin-bottom: 8px;
         font-size: 14px;