diff --git a/src/api/index.js b/src/api/index.js index a1c3eac..de88611 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -26,6 +26,7 @@ export default { forgotPreVerification: `users/users/user/forgotPreVerification`, forgotPassword: `users/users/user/forgotPassword`, logout: `users/users/user/logout`, + quickRegistration: `users/users/user/quickRegistration`, // 阿里云文件/视频管理 getPlayAuth: `nakadai/nakadai/oss/getPlayAuth`, // 获取播放凭证 diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index ae48c33..2e9b63f 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -30,9 +30,9 @@
- - {{ + {{ phoneBtnTextLogin }} @@ -54,7 +54,7 @@
{{ verCodeLogin ? '密码' : '验证码' }}登录 - + 没有账号，点击申请
登录 @@ -145,66 +145,48 @@
- - {{ + + {{ phoneBtnText }}
+ :disabled="!diaClientExist"> + :disabled="!diaClientExist"> - 确定 + 确定 取消 - - - - - - - - - - - - - - - + + + + +
+ 该手机号已注册，您可直接点 + 此处登录 +
- - {{ + + {{ phoneBtnText }}
- - - - - - - 申请 + 立即注册 取消 @@ -275,7 +257,7 @@ export default { password: [{ required: true, message: "请输入密码", trigger: "blur" }], code: [{ required: true, message: "请输入验证码", trigger: "blur" }] }, - verFormEnable: true, + verFormEnable: false, verCodeLogin: false, phoneDisabledLogin: false, phoneTimerLogin: null, @@ -299,31 +281,21 @@ export default { infos: [], accountVisible: false, - formEnable: true, + regDisable: true, + regClientExist: false, accountForm: { - schoolId: '', - account: '', code: '', - password: '', - rePassword: '', - phone: '', - userName: '', - workNumber: '', - uniqueIdentification: Date.now() + phoneOrEmail: '', }, accountRules: { - schoolId: [{ required: true, message: "请选择所属院校", trigger: "change" }], - userName: [{ required: true, message: "请输入姓名", trigger: "blur" }], - workNumber: [{ required: true, validator: workNumberPass, trigger: "blur" }], - phone: [{ required: true, validator: phonePass, trigger: "blur" }], - password: [{ required: true, message: "请输入密码", trigger: "blur" }], - rePassword: [{ required: true, message: "请再次输入密码", trigger: "blur" }], + phoneOrEmail: [{ required: true, message: "请输入手机号/邮箱", trigger: "blur" }], code: [{ required: true, message: "请输入验证码", trigger: "blur" }] }, buyVisible: false, resetPwVisible: false, + diaClientExist: false, pwForm: { code: '', newPassword: '', @@ -516,7 +488,7 @@ export default { newPasswordTwo: '', phoneOrEmail: '', } - this.formEnable = true + this.diaClientExist = false this.resetPwVisible = true }, @@ -543,16 +515,15 @@ export default { }) }, - // 手机号输入完回调。有账号才能继续操作 - async checkAccountByPhone (val, isResetPw) { + // 手机号输入完回调。有账号才能继续操作。type：0手机验证码登录，1重置密码 + async checkAccountByPhone (val, type) { if (!this.phoneReg.test(val) && !this.mailReg.test(val)) return false try { - await this.$get(`${this.api.forgotPreVerification}?phoneOrEmail=${val}&platform=${Setting.platformId}`) - this[isResetPw ? 'formEnable' : 'verFormEnable'] = false - } catch (e) { - this.formEnable = true - } + const { message } = await this.$get(`${this.api.forgotPreVerification}?phoneOrEmail=${val}&platform=${Setting.platformId}`) + const exist = message === 'success' // 用户已存在 + this[type ? 'diaClientExist' : 'verFormEnable'] = exist + } catch (e) { } }, // 账号申请 switchType () { @@ -560,74 +531,51 @@ export default { this.$refs.form.clearValidate() this.handleRule() }, + + // 发送验证码 + async sendCode () { + const { phoneOrEmail } = this.accountForm + // 校验用户手机号是否存在 + if (!this.verifyPhone(phoneOrEmail)) return false + const { message } = await this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phoneOrEmail}&loginOrBind=1&platform=6`) + Util.successMsg(message) + this.phoneCountdown() + }, + // 账号申请 toAccount () { + this.accountForm = { + code: '', + phoneOrEmail: '', + } + this.regDisable = true + this.regClientExist = false this.accountVisible = true }, - // 学号输入完回调。学校和学号都输入完后，调这个接口查询是否有存在的学生，如果没有，才能继续输入，如果有，不让添加 - workNumberChange () { - const form = this.accountForm - form.schoolId && form.workNumber && this.$get(`${this.api.enquireAboutSchoolStudents}?schoolId=${form.schoolId}&workNumber=${form.workNumber}&applyFor=1`).then(({ account }) => { - if (account) this.form = account - this.formEnable = !!account - }).catch(res => { - this.formEnable = true - }) - }, - // 学校选择回调 - schoolChange (schoolId) { - this.$get(this.api.getCustomerBySchoolId, { - schoolId - }).then(res => { - if (!res) { - this.accountVisible = false - this.buyVisible = true - } - }).catch(res => { }) - }, + // 注册手机号输入完回调。没有账号才能继续操作 + async checkAccountByPhoneReg (val) { + if (!this.phoneReg.test(val) && !this.mailReg.test(val)) return false - // 发送验证码 - sendCode () { - const { phone } = this.accountForm - // 校验用户手机号是否存在 - phone && this.$get(`${this.api.checkPhoneOrEmailExist}?phone=${phone}&type=1&email=`).then(res => { - if (res) return Util.errorMsg('手机号已存在，请更换手机号！') - if (!this.verifyPhone(phone)) return false - this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1&platform=${Setting.platformId}`).then(({ message }) => { - Util.successMsg(message) - this.phoneCountdown() - }).catch(res => { }) - }).catch(res => { }) + try { + const { message } = await this.$get(`${this.api.forgotPreVerification}?phoneOrEmail=${val}&platform=6`) + const exist = message === 'success' // 用户已存在 + this.regDisable = !exist + this.regClientExist = exist + } catch (e) { } }, // 账号申请提交 accountSubmit () { this.$refs.accountForm.validate(valid => { if (valid) { const form = this.accountForm - if (form.password !== form.rePassword) return Util.errorMsg('两次输入的密码不一致，请重新输入！') - // 平台id-端id-schoolId-workNumber组成账号 - form.account = `${Setting.platformId}-1-${form.schoolId}-${form.workNumber}` - this.$post(this.api.studentAccountApplication, form).then(res => { + form.platform = 6 + this.$post(this.api.quickRegistration, form).then(res => { this.accountVisible = false - Util.successMsg('账号申请已提交，需管理员审核，请10分钟后再登录') + Util.successMsg('注册成功！') }).catch(res => { }) } }) }, - // 账号申请关闭 - accountClose () { - this.accountForm = { - schoolId: '', - account: '', - code: '', - password: '', - rePassword: '', - phone: '', - userName: '', - workNumber: '', - uniqueIdentification: Date.now() - } - }, // 验证码倒计时 phoneCountdownLogin () {