Merge remote-tracking branch 'origin/develop' into develop

src/page/login.vue

@@ -226,8 +226,8 @@ export default {
     return {
       flag: false,
       form: {
-        name: 'adminzj',
-        pass: '123456'
+        name: '',
+        pass: ''
       },
       rules: {
         name: [