Merge branch 'liuin' into uat

src/pages/login.vue

@@ -129,7 +129,7 @@ export default {
       let vm = this
       let url = process.env.loginPath + 'appadmin'
       let param = {}
-      vm.hlsPopup.showLoading('请稍等')
+      // vm.hlsPopup.showLoading('请稍等')
       let res = await vm.$post(url, param)
       // vm.hlsPopup.hideLoading()
       if (res) {
@@ -140,15 +140,15 @@ export default {
     async access () {
       document.getElementById('passwordInput').blur()
       document.activeElement.blur()
-      let flag = await this.getAccessToken()
       let vm = this
-      if (flag) {
       if (!vm.username || vm.username === undefined) {
         vm.hlsPopup.showLongCenter('请输入用户名')
       } else if (!vm.password || vm.password === undefined) {
         vm.hlsPopup.showLongCenter('请输入密码')
       } else {
         hlsPopup.showLoading('正在登录')
+        let flag = await this.getAccessToken()
+        if (flag) {
           vm.login()
         }
       }