Skip to content

A
aserver-ui
Commit 2b84da23 authored by 杨日斐's avatar 杨日斐
Browse files
Options

东方通打包

parent 038f5162
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 79 deletions
src/views/login/Login.vue
View file @ 2b84da23
......@@ -22,8 +22,8 @@
<div class="login-card-productName">欢迎登录</div>
<div class="login-message-panel">
<div
class="login-message"
:class="{ success: isSuccess, error: isError }"
class="login-message"
:class="{ success: isSuccess, error: isError }"
>
<span style="word-break:break-all;whiteSpace:normal">{{ message }}</span>
</div>
......@@ -34,13 +34,13 @@
<div class="form-item-label">用户名</div>
<div class="form-item-input">
<input
type="text"
name="username"
class="form-input"
placeholder="请输入用户名"
v-model="form.username"
@input="handleUsernameInput"
@keyup.enter="handleEnter"
type="text"
name="username"
class="form-input"
placeholder="请输入用户名"
v-model="form.username"
@input="handleUsernameInput"
@keyup.enter="handleEnter"
/>
</div>
<div class="form-item-tooltip" v-show="disabledUsername">
......@@ -51,13 +51,13 @@
<div class="form-item-label">密码</div>
<div class="form-item-input">
<input
type="password"
name="password"
class="form-input"
placeholder="请输入密码"
v-model="form.password"
@input="handlePasswordInput"
@keyup.enter="handleEnter"
type="password"
name="password"
class="form-input"
placeholder="请输入密码"
v-model="form.password"
@input="handlePasswordInput"
@keyup.enter="handleEnter"
/>
</div>
<div class="form-item-tooltip" v-show="disabledPassword">
......@@ -69,13 +69,13 @@
<div class="form-item-label">校验码</div>
<div class="form-item-input">
<input
v-model="code"
placeholder="请输入验证码"
:maxlength="codeMax"
class="form-input"
style="width: 140px;float:left"
@input="compareCode"
@keyup.enter="handleEnter"
v-model="code"
placeholder="请输入验证码"
:maxlength="codeMax"
class="form-input"
style="width: 140px;float:left"
@input="compareCode"
@keyup.enter="handleEnter"
/>
<div class="form-item-tooltip" v-show="disabledCode && codeIsFalse">
验证码错误
......@@ -92,11 +92,11 @@
<div class="form-item-label"></div>
<div class="form-item-submit">
<input
type="button"
value="登录"
class="form-submit"
:class="{ disabled: disabledLogin }"
@click="handleLogin"
type="button"
value="登录"
class="form-submit"
:class="{ disabled: disabledLogin }"
@click="handleLogin"
/>
</div>
</div>
......@@ -111,7 +111,7 @@ import qs from 'qs'
import ModifyModal from './modify-modal'
// import { sm2 } from 'sm-crypto'
import {Encrypt} from './secert'
import { snVerify, ruleValidate, registered,getUserHome,getSystemUrl } from '@/api/login'
import { snVerify, ruleValidate, registered,getUserHome } from '@/api/login'
import Sidentify from './Sidentify.vue'
export default {
name: '',
......@@ -121,7 +121,6 @@ export default {
},
data() {
return {
appUrl: "",
showModifyModal: false,
loginBg: {
backgroundImage: 'url(login-bg.jpg)',
......@@ -270,52 +269,41 @@ export default {
this.isHaveHome = false
}
}).then(()=>{
getSystemUrl({app:params.app}).then((res) => {
console.log(params.app);
if (res.data.state == 'ok') {
console.log(res.data.url);
this.appUrl = res.data.url
} else {
this.$Notice.error({ title: '提示', desc: res.data.msg })
}
})
/**LiuKexin 20210311 根据用户名获取设置的首页 end */
params.username = Encrypt(params.username);
params.password = Encrypt(params.password);
this.login(params).then((res) => {
if (res.data.state === 'ok') {
let verify = res.data.verify
if (verify) {
/**LiuKexin 20210311 区分默认首页和设置首页的callback start */
let callback = res.data.callback
if (callback) {
console.log(this.isHaveHome);
console.log(this.appUrl+callback.split("#")[0] + "?token="+ res.data.token+"#"+callback.split("#")[1]);
console.log(this.appUrl+callback + '?token=' + res.data.token);
document.location.href = this.isHaveHome ?
this.appUrl+callback.split("#")[0] + "?token="+ res.data.token+"#"+callback.split("#")[1]
:
this.appUrl+callback + '?token=' + res.data.token
/**LiuKexin 20210311 区分默认首页和设置首页的callback end */
this.login(params)
.then((res) => {
if (res.data.state === 'ok') {
let verify = res.data.verify
if (verify) {
/**LiuKexin 20210311 区分默认首页和设置首页的callback start */
let callback = res.data.callback
if (callback) {
document.location.href = this.isHaveHome
?
callback.split("#")[0] + "?token="+ res.data.token+"#"+callback.split("#")[1]
:
callback + '?token=' + res.data.token
/**LiuKexin 20210311 区分默认首页和设置首页的callback end */
} else {
document.location.href =
this.form.callback + '?token=' + res.data.token
}
this.setSuccess()
} else {
this.form.token = res.data.token
this.showModifyModal = true
}
} else {
console.log(this.appUrl+this.form.callback + '?token=' + res.data.token);
document.location.href = this.appUrl+this.form.callback + '?token=' + res.data.token
this.setError(res.data.msg ? res.data.msg : '登录失败')
}
this.setSuccess()
} else {
this.form.token = res.data.token
this.showModifyModal = true
}
} else {
this.setError(res.data.msg ? res.data.msg : '登录失败')
}
this.disabledLogin = false
})
.catch(() => {
this.setError('登录失败')
this.disabledLogin = false
})
this.disabledLogin = false
})
.catch(() => {
this.setError('登录失败')
this.disabledLogin = false
})
})
}
},
......@@ -348,7 +336,10 @@ export default {
},
login({ app, callback, username, password }) {
return this.$http.post('/aserver/login', {
app,callback,username,password,
app,
callback,
username,
password,
})
},
setSuccess(msg = '登录成功') {
......
vue.config.js
View file @ 2b84da23
......@@ -17,7 +17,6 @@ const PUBLIC_PATH = process.env.NODE_ENV === 'production' ? '/' : '/'
module.exports = {
publicPath: PUBLIC_PATH,
// publicPath: '/aserver',
chainWebpack: config => {
config.resolve.alias
.set('@', resolve('src')) // key,value自行定义，比如.set('@@', resolve('src/components'))
......@@ -47,12 +46,12 @@ module.exports = {
// 提取出来的通用 chunk 和 vendor chunk。
chunks: ['chunk-vendors', 'chunk-common', 'index']
},
// login: {
// entry: 'src/main-login.js',
// template: 'public/login.html',
// filename: 'login.html',
// tilte: '登录'
// },
login: {
entry: 'src/main-login.js',
template: 'public/login.html',
filename: 'login.html',
tilte: '登录'
},
},
productionSourceMap: false,
devServer: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment