Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/api/lov-data.js

@@ -178,6 +178,11 @@ export default {
   qcc: {
     searchUrl: '/qcc/search',
     formDesc: {
+      Status: {
+        label: '状态',
+        type: 'input',
+        layout: 12
+      },
       Name: {
         label: '公司名称',
         type: 'input',
@@ -193,11 +198,6 @@ export default {
         type: 'input',
         layout: 12
       },
-      Status: {
-        label: '状态',
-        type: 'input',
-        layout: 12
-      }
     }
   }
 }

src/views/login/index.vue

@@ -115,8 +115,8 @@ export default {
     }
     return {
       loginForm: {
-        username: 'xzz',
-        password: '123456'
+        username: '',
+        password: ''
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],