Merge branch 'ISV'

src/api/generateOrRefreshToken.js

@@ -71,9 +71,10 @@ function getToken () {
           if (res.data.resultCode === 0) {
             // 有权限登录，返回用户信息
             let mingUserId = res.data.data.mingUserId
+            let username = res.data.data.username
             let loginData = qs.stringify({
-              username: mingUserId,
-              password: mingUserId,
+              username: username,
+              password: username,
               scope: 'server',
               grant_type: 'password'
             })

src/components/pages/PaymentManagement/AccountManagement.vue

@@ -487,7 +487,7 @@ export default {
           this.visible2 = false
           this.updateBindCardStatusForm.resetFields()
           this.$message.success('操作成功')
-        } else if (res.data.resultCode === 10010009) {
+        } else if (res.data.resultCode === 10105) {
           this.$message.error('该卡片已被占用')
         } else {
           this.$message.error(res.data.message)