huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

登录等修改

Browse Source
dev_2022-04-07
yujialong 3 years ago
parent 13f701d7d3
commit c95285013d
4 changed files with 101 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/api/index.js
  2. 124
      src/pages/account/login/index.vue
  3. 18
      src/pages/setting/person/info.vue
  4. 4
      src/setting.js

5
src/api/index.js
Unescape View File

@ -5,15 +5,14 @@ const host1 = `http://192.168.31.137:9000/`
const uploadURL = "http://39.108.250.202:9000/"; const uploadURL = "http://39.108.250.202:9000/";
export default { export default {
host,
// 登录
logins: `${host1}users/users/user/login`, logins: `${host1}users/users/user/login`,
verification: `${host1}users/users/user/captcha`,// 验证码图片 verification: `${host1}users/users/user/captcha`,// 验证码图片
logoDetail: `occupationlab/sys/logo/detail`, //查看系统设置信息 logoDetail: `occupationlab/sys/logo/detail`, //查看系统设置信息
isClient: `${host1}users/users/user/isClient`, isClient: `${host1}users/users/user/isClient`,
sendPhoneVerificationCode: `${host1}users/users/user/sendPhoneVerificationCode`, sendPhoneVerificationCode: `${host1}users/users/user/sendPhoneVerificationCode`,
getToken: `${host1}users/users/user/getToken`, getToken: `${host1}users/users/user/getToken`,
getOtherAccountByPhone: `${host1}users/users/user/getOtherAccountByPhone`,
unbindAccounts: `${host1}users/users/user/getOtherAccountunbindAccountsByPhone`,
platformLogList: `nakadai/log/platformLogList`, platformLogList: `nakadai/log/platformLogList`,
logNotification: `nakadai/log/logNotification`, logNotification: `nakadai/log/logNotification`,

124
src/pages/account/login/index.vue
Unescape View File

@ -14,9 +14,6 @@
<el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校"> <el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校">
<el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option> <el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option>
</el-select> </el-select>
<div class="default-check">
<el-checkbox v-model="setDefault">设置为默认学校</el-checkbox>
</div>
</el-form-item> </el-form-item>
<div class="items"> <div class="items">
<el-form-item prop="type" style="width: 35%;margin-right: 15px"> <el-form-item prop="type" style="width: 35%;margin-right: 15px">
@ -73,6 +70,9 @@
<img @click="getVerImg" :src="verificationIMG" class="ver-img" alt=""> <img @click="getVerImg" :src="verificationIMG" class="ver-img" alt="">
</el-form-item> </el-form-item>
</template> </template>
<div v-show="!form.distinguish" class="default-check">
<el-checkbox v-model="setDefault">设置为默认学校</el-checkbox>
</div>
<el-button class="submit" type="primary" @click="submit">登录</el-button> <el-button class="submit" type="primary" @click="submit">登录</el-button>
</el-form> </el-form>
</div> </div>
@ -83,12 +83,12 @@
</div> </div>
<el-form ref="form" label-width="60px"> <el-form ref="form" label-width="60px">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input style="width: 100%;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input> <el-input style="width: 100%;" placeholder="请输入手机号" v-model="phone" maxlength="11" @change="phoneChange"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div style="display: flex;"> <div style="display: flex;">
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input> <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
<el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{ phoneBtnText }} <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode(1)" :disabled="phoneDisabled">{{ phoneBtnText }}
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
@ -174,12 +174,15 @@ export default {
phoneCode: '', phoneCode: '',
phoneDisabled: false, phoneDisabled: false,
phoneTimer: null, phoneTimer: null,
phoneOpener: '',
phoneBtnText: '发送验证码', phoneBtnText: '发送验证码',
selectVisible: false, selectVisible: false,
selectedRole: '', selectedRole: '',
token: '', token: '',
userVisible: false, userVisible: false,
users: [] users: [],
accountIds: [],
binding: true
}; };
}, },
components: { components: {
@ -370,12 +373,37 @@ export default {
sendPhoneCodeLogin() { sendPhoneCodeLogin() {
const phone = this.form.account const phone = this.form.account
if (!this.verifyPhone(phone)) return false if (!this.verifyPhone(phone)) return false
this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}`).then(({ message }) => { this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=0`).then(({ message }) => {
util.successMsg(message) util.successMsg(message)
this.phoneCountdownLogin() this.phoneCountdownLogin()
}).catch(res => {}) }).catch(res => {})
}, },
// 手机号失去焦点回调
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}）`)
})
this.accountIds = list.map(e => e.id)
this.$confirm(`该手机号已与${msg.join('；')}的用户绑定，是否为本人？选择否，则解绑以上用户信息，并授权手机号绑定新用户信息。`, '提示', {
type: 'warning',
confirmButtonText: '是',
cancelButtonText: '否'
}).then(() => {
debugger
this.binding = true
this.sendPhoneCode(1)
}).catch(() => {
debugger
this.binding = false
this.sendPhoneCode(0)
})
}
}).catch(res => {})
},
// 验证码倒计时 // 验证码倒计时
phoneCountdown() { phoneCountdown() {
let count = 60 let count = 60
@ -395,41 +423,66 @@ export default {
} }
}, },
// 发送验证码 // 发送验证码
sendPhoneCode() { sendPhoneCode(bind) {
const { phone } = this const { phone } = this
if (!this.verifyPhone(phone)) return false if (!this.verifyPhone(phone)) return false
this.$post(this.api.sendPhoneOrEmailCode, { // 不解绑发送验证码
platform: Setting.platformId, if (bind) {
phone, this.$post(this.api.sendPhoneOrEmailCode, {
types: 2 platform: Setting.platformId,
}).then(({ message }) => { phone,
if (message.opener) { types: 2
}).then(({ message }) => {
if (message.opener) {
this.phoneCountdown()
this.phoneOpener = message.opener
} else {
util.errorMsg(message)
}
}).catch(res => {})
} else {
this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1`).then(({ message }) => {
this.phoneCountdown() this.phoneCountdown()
this.phoneOpener = message.opener }).catch(res => {})
} else { }
util.errorMsg(message) },
} // 解绑
unbind() {
const { password, platform, schoolId, type, workNumber } = this.form
this.$post(this.api.unbindAccounts, {
accountIds: this.accountIds,
code: this.phoneCode,
password,
phone: this.phone,
platform,
schoolId,
type,
workNumber,
}).then(({ token }) => {
this.token = token
this.setLogin()
}).catch(res => {}) }).catch(res => {})
}, },
// 绑定手机号 // 绑定手机号
phoneSubmit() { phoneSubmit() {
const { phone, phoneCode } = this const { phone, phoneCode } = this
if (!this.verifyPhone(phone)) return false if (!this.verifyPhone(phone)) return false
if (!phoneCode) return util.warningMsg("请输入验证码") if (!phoneCode) return util.warningMsg('请输入验证码')
this.$post(this.api.bindPhoneOrEmail, { if (this.binding) {
phone, this.$post(this.api.bindPhoneOrEmail, {
types: 2, phone,
code: phoneCode, types: 2,
opener: this.phoneOpener, code: phoneCode,
platform: Setting.platformId, opener: this.phoneOpener,
account: this.form.workNumber platform: Setting.platformId,
}).then(({ token }) => { account: this.form.workNumber
util.successMsg("绑定成功") }).then(({ token }) => {
this.form.phone = this.phone this.token = token
this.phoneVisible = false this.setLogin()
this.token = token }).catch(res => {})
this.setLogin() } else {
}).catch(res => {}) this.unbind()
}
} }
} }
}; };
@ -500,9 +553,6 @@ export default {
border: 1px solid #E1E6F2; border: 1px solid #E1E6F2;
border-radius: 4px !important; border-radius: 4px !important;
} }
.school-select {
// margin-bottom: 10px;
}
.default-check { .default-check {
text-align: right; text-align: right;
} }

18
src/pages/setting/person/info.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div class="scroll"> <div class="scroll" v-loading="loading">
<div class="page"> <div class="page">
<h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 基本信息</h6> <h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 基本信息</h6>
<div class="page-content"> <div class="page-content">
@ -134,9 +134,9 @@
<div class="page-content"> <div class="page-content">
<ul class="list"> <ul class="list">
<div class="line info imp"> <div class="line info imp">
<li> <li style="width: 334px;margin-right: 90px">
<label>学号：</label> <label>学号：</label>
<el-input class="m-r-10" style="width: 220px" size="small" v-model="form.workNumber" clearable disabled></el-input> <el-input class="m-r-10" size="small" v-model="form.workNumber" clearable disabled></el-input>
</li> </li>
<li> <li>
<label>手机号：</label> <label>手机号：</label>
@ -188,7 +188,7 @@
<el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'" :visible.sync="phoneVisible" :close-on-click-modal="false" @close="closePhone" width="30%"> <el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'" :visible.sync="phoneVisible" :close-on-click-modal="false" @close="closePhone" width="30%">
<el-form ref="form" :model="form" label-width="60px"> <el-form ref="form" :model="form" label-width="60px">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input style="width: 394px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input> <el-input placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div class="flex"> <div class="flex">
@ -241,6 +241,7 @@ import util from '@/libs/util'
export default { export default {
data() { data() {
return { return {
loading: false,
form: { form: {
name:'', name:'',
workNumber:'', workNumber:'',
@ -356,7 +357,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.getdata() this.getData()
this.getProvince() this.getProvince()
this.getSchoolData() this.getSchoolData()
this.getSubject() this.getSubject()
@ -366,17 +367,18 @@ export default {
...mapActions('user', [ ...mapActions('user', [
'setAvatar','setUserName' 'setAvatar','setUserName'
]), ]),
getdata() { getData() {
this.loading = true
this.$get(this.api.queryUserInfoDetails).then(({ result }) => { this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
const userInfo = result.hrUserInfo const userInfo = result.hrUserInfo
const { userAccount } = result const { userAccount } = result
userInfo.account = userAccount.account userInfo.account = userAccount.account
userInfo.phone = userAccount.phone userInfo.phone = userAccount.phone
userInfo.email = userAccount.email
userInfo.workNumber = userAccount.workNumber userInfo.workNumber = userAccount.workNumber
this.form = userInfo this.form = userInfo
this.originAccount = this.form.account this.originAccount = this.form.account
this.archivesList = result.personalFileList this.archivesList = result.personalFileList
this.loading = false
this.$nextTick(() => { this.$nextTick(() => {
if(this.form.provinceId){ if(this.form.provinceId){
this.getCityData(1) this.getCityData(1)
@ -551,7 +553,7 @@ export default {
}).then(() => { }).then(() => {
this.$get(this.api.unbindMobilePhone).then(res => { this.$get(this.api.unbindMobilePhone).then(res => {
this.$message.success('解绑成功') this.$message.success('解绑成功')
this.getdata() this.getData()
}).catch(res => {}) }).catch(res => {})
}).catch(() => {}) }).catch(() => {})
}, },

4
src/setting.js
Unescape View File

@ -31,8 +31,8 @@ if (isHh) {
// 本地 // 本地
systemPath = `http://192.168.31.125:8093` 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.151:9000/"; // 榕
// host = "http://192.168.31.137:9000"; // 赓 host = "http://192.168.31.137:9000"; // 赓
} }
const Setting = { const Setting = {

Write Preview
Loading…
Cancel
Save