diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 90bd86a..6ad01ac 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -167,7 +167,7 @@ export default { }, // 获取日志状态 getLogStatus() { - this.$get(this.api.logNotification).then(({ notification }) => { + this.token && this.$get(this.api.logNotification).then(({ notification }) => { this.SET_LOG() // 把查看日志状态设置为true if (notification) { this.logVisible = true // 返回true，则显示日志弹框 diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index e7d10dd..a7229d0 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -15,7 +15,7 @@ - + @@ -32,9 +32,9 @@ -
+
- {{ phoneBtnTextLogin }} + {{ phoneBtnTextLogin }}
@@ -71,14 +71,14 @@

依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台

- + - + -
+
- {{phoneBtnText}} + {{phoneBtnText}}
@@ -96,6 +96,24 @@ + +
+ + 提示 +
+
+

该手机号已与以下用户绑定

+
    +
  • + {{ user.userName }}（{{ user.schoolName }}） +
    • +
+
+ 是本人，继续绑定 + 不是本人，解绑以上用户并绑定新用户 +
+
+
@@ -163,7 +181,9 @@ export default { userVisible: false, users: [], accountIds: [], - binding: '' + binding: '', + infoVisible: false, + infos: [] }; }, components: {vHead,vFooter}, @@ -332,27 +352,30 @@ export default { this.phoneCountdownLogin() }).catch(res => {}) }, + // 继续绑定 + bindPhone() { + this.infoVisible = false + this.binding = true + this.sendPhoneCode(1) + }, + // 解除绑定 + unbindPhone() { + this.infoVisible = false + this.binding = false + this.sendPhoneCode(0) + }, // 手机号失去焦点回调 phoneChange() { this.$post(`${this.api.getOtherAccountByPhone}?phone=${this.phone}&platform=${Setting.platformId}`).then(({ userAccounts }) => { const list = userAccounts if (list) { - const msg = [] list.map(e => { - msg.push(`${e.userName}（${e.schoolName}，学号${e.workNumber}）`) + const { userName } = e + if (userName.length > 1) e.userName = userName[0] + '*' + userName.substring(2) }) + this.infos = list this.accountIds = list.map(e => e.id) - this.$confirm(`该手机号已与${msg.join('；')}的用户绑定，是否为本人？选择否，则解绑以上用户信息，并授权手机号绑定新用户信息。`, '提示', { - type: 'warning', - confirmButtonText: '是', - cancelButtonText: '否' - }).then(() => { - this.binding = true - this.sendPhoneCode(1) - }).catch(() => { - this.binding = false - this.sendPhoneCode(0) - }) + this.infoVisible = true } else { this.binding = true } @@ -424,6 +447,7 @@ export default { const { phone, phoneCode } = this if (!this.verifyPhone(phone)) return false if (!phoneCode) return util.warningMsg('请输入验证码') + const { workNumber, schoolId } = this.form if (this.binding) { this.$post(this.api.bindPhoneOrEmail, { phone, @@ -431,7 +455,8 @@ export default { code: phoneCode, opener: this.phoneOpener, platform: Setting.platformId, - account: this.form.workNumber + account: workNumber, + schoolId }).then(({ token }) => { this.token = token this.setLogin() @@ -449,6 +474,14 @@ export default { min-height: 100%; background-color: #F3F6FA; } +.ver-code { + position: relative; + .el-button { + position: absolute; + top: 10px; + right: 10px; + } +} .login{ min-height: calc(100vh - 70px); padding-top: calc((100vh - 611px) / 2); diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue index 7bfb857..b86e7e8 100644 --- a/src/pages/setting/person/info.vue +++ b/src/pages/setting/person/info.vue @@ -176,7 +176,7 @@ - +
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index c73819b..ea332aa 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -121,7 +121,7 @@
模板下载 - + 上传文件
@@ -545,10 +545,6 @@ export default { util.errorMsg('导入失败，请下载失败模板查看原因') this.importToken = res.data.token this.uploadFaild = true - }else{ - util.successMsg('上传成功') - this.importVisible = false - this.initData() } }else{ res.data.message ? util.errorMsg(res.data.message) : util.errorMsg('上传失败，请检查数据') @@ -572,7 +568,8 @@ export default { this.uploadList = [] }, confirmImport(){ - this.$refs.import.submit() + this.importVisible = false + this.initData() } } }; diff --git a/src/setting.js b/src/setting.js index faeaa23..9d6f976 100644 --- a/src/setting.js +++ b/src/setting.js @@ -25,7 +25,7 @@ const Setting = { * 正式：http://www.dataforward.cn:9000 * */ // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://39.108.250.202:9000', - apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000/' : `${location.origin}:9000/`, + apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000/' : `${location.origin}:9000/`, // 加密货币接口地址 cryptoBaseURL: `http://159.138.53.111/`, // 接口请求返回错误时，弹窗的持续时间，单位：秒