diff --git a/src/api/index.js b/src/api/index.js index 22064ca..07ca1d5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,18 +1,17 @@ import Setting from "@/setting"; const host = Setting.apiBaseURL; -const host1 = `http://192.168.31.137:9000/` const uploadURL = "http://39.108.250.202:9000/"; export default { - logins: `${host1}users/users/user/login`, - verification: `${host1}users/users/user/captcha`,// 验证码图片 + logins: `users/users/user/login`, + verification: `${host}users/users/user/captcha`,// 验证码图片 logoDetail: `occupationlab/sys/logo/detail`, //查看系统设置信息 - isClient: `${host1}users/users/user/isClient`, - sendPhoneVerificationCode: `${host1}users/users/user/sendPhoneVerificationCode`, - getToken: `${host1}users/users/user/getToken`, - getOtherAccountByPhone: `${host1}users/users/user/getOtherAccountByPhone`, - unbindAccounts: `${host1}users/users/user/getOtherAccountunbindAccountsByPhone`, + isClient: `${host}users/users/user/isClient`, + sendPhoneVerificationCode: `users/users/user/sendPhoneVerificationCode`, + getToken: `users/users/user/getToken`, + getOtherAccountByPhone: `users/users/user/getOtherAccountByPhone`, + unbindAccounts: `users/users/user/unbindAccounts`, platformLogList: `nakadai/log/platformLogList`, logNotification: `nakadai/log/logNotification`, @@ -83,7 +82,7 @@ export default { queryProvince: `nakadai/nakadai/province/queryProvince`, //查询省份 queryCity: `nakadai/nakadai/city/queryCity`, //查询城市 - querySchool: `${host1}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息 + querySchool: `nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息 queryCourseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //查询课程学科 queryCourseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类 queryCourseProfessional: `nakadai/nakadai/subject/courseProfessional`, //查询专业 diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index a16c55f..884dd45 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -88,7 +88,7 @@
- {{ phoneBtnText }} + {{ phoneBtnText }}
@@ -113,8 +113,8 @@

该手机号已绑定以下用户信息

@@ -182,7 +182,7 @@ export default { userVisible: false, users: [], accountIds: [], - binding: true + binding: '' }; }, components: { @@ -206,16 +206,27 @@ export default { ...mapActions("user", [ "setInfo" ]), + // 赋值学校列表及id + setSchool(list) { + this.schoolList = list + // 取本地缓存里的学校id + const schoolId = util.local.get('schoolId') + if (schoolId) this.form.schoolId = schoolId + }, + // 获取学校列表 getSchool() { - this.$get(this.api.querySchool, { - provinceId: '', - cityId: '' - }).then(res => { - this.schoolList = res.list - // 取本地缓存里的学校id - const schoolId = util.local.get('schoolId') - if (schoolId) this.form.schoolId = schoolId - }).catch(res => {}) + const schoolList = util.local.get('schoolList') + if (schoolList && schoolList.length) { + this.setSchool(schoolList) + } else { + this.$get(this.api.querySchool, { + provinceId: '', + cityId: '' + }).then(({ list }) => { + this.setSchool(list) + util.local.set('schoolList', list) + }).catch(res => {}) + } }, getVerImg() { // 获取验证码图片 this.form.random = Math.floor(Math.random() * 999999999); @@ -259,7 +270,7 @@ export default { }, // 选择用户回调 chooseUser(user) { - this.$post(`${this.api.getToken}?id=${user.id}`).then(({ data }) => { + user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}`).then(({ data }) => { this.queryClient(data.token) }).catch(res => {}) }, @@ -373,7 +384,7 @@ export default { sendPhoneCodeLogin() { const phone = this.form.account if (!this.verifyPhone(phone)) return false - this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=0`).then(({ message }) => { + this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=0&platform=${Setting.platformId}`).then(({ message }) => { util.successMsg(message) this.phoneCountdownLogin() }).catch(res => {}) @@ -393,14 +404,14 @@ export default { confirmButtonText: '是', cancelButtonText: '否' }).then(() => { - debugger this.binding = true this.sendPhoneCode(1) }).catch(() => { - debugger this.binding = false this.sendPhoneCode(0) }) + } else { + this.binding = true } }).catch(res => {}) }, @@ -441,7 +452,8 @@ export default { } }).catch(res => {}) } else { - this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1`).then(({ message }) => { + this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1&platform=${Setting.platformId}`).then(({ message }) => { + util.successMsg(message) this.phoneCountdown() }).catch(res => {}) } @@ -458,8 +470,8 @@ export default { schoolId, type, workNumber, - }).then(({ token }) => { - this.token = token + }).then(({ data }) => { + this.token = data.token this.setLogin() }).catch(res => {}) }, @@ -669,6 +681,11 @@ export default { font-size: 14px; background-color: #ebeef5; cursor: pointer; + &.isEnable { + color: #c0c4cc; + background-color: #f5f7fa; + cursor: not-allowed; + } &:last-child { margin-bottom: 0; } diff --git a/src/setting.js b/src/setting.js index 28479ad..8627759 100644 --- a/src/setting.js +++ b/src/setting.js @@ -30,9 +30,9 @@ if (isHh) { } else if (isDev) { // 本地 systemPath = `http://192.168.31.125:8093` - // host = "http://39.108.250.202:9000/"; // 中台测试服 + host = "http://39.108.250.202:9000/"; // 中台测试服 // host = "http://192.168.31.151:9000/"; // 榕 - host = "http://192.168.31.137:9000"; // 赓 + // host = "http://192.168.31.137:9000/"; // 赓 } const Setting = {