Merge branch 'liuxin' into develop

src/pages/login.vue

@@ -55,7 +55,6 @@ export default {
     window.addEventListener('native.keyboardhide', function () {
       document.activeElement.blur()
     })
-
   },
   methods: {
     changeType () {
@@ -87,7 +86,7 @@ export default {
           vm.Jpush._jpush_config(tagOption)
         } else {
           hlsPopup.hideLoading()
-          hlsPopup.showLongCenter('登录失败')
+          hlsPopup.showLongCenter('手机号未注册或密码错误')
         }
         // 极光推送
       })