修改问题

master
sunzehua 1 year ago
parent 1bbd76284a
commit dccd4f9bf7

@ -32,18 +32,17 @@ router.beforeEach((to, from, next) => {
// console.log(JSON.stringify(res)) // console.log(JSON.stringify(res))
// console.log('=== 测试跳转页面,获取个人信息 -- end ===') // console.log('=== 测试跳转页面,获取个人信息 -- end ===')
if (res.menus.length < 1) { if (res.menus.length < 1) {
next({ path: '/welcome' }) Modal.error({
// Modal.error({ title: '提示:',
// title: '提示:', content: '无菜单权限,请联系管理员',
// content: '无菜单权限,请联系管理员', okText: '确定',
// okText: '确定', onOk: () => {
// onOk: () => { next({ path: '/welcome' })
// next({ path: '/welcome' }) // store.dispatch('Logout').then(() => {
// // store.dispatch('Logout').then(() => { // window.location.reload()
// // window.location.reload() // })
// // }) }
// } })
// })
return return
} }
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase

@ -116,7 +116,7 @@ const user = {
loginWithCode(userInfo) loginWithCode(userInfo)
.then(response => { .then(response => {
if (!response.success) { if (!response.success) {
reject(response.message) reject(response)
return return
} }
const result = response.data const result = response.data
@ -127,7 +127,7 @@ const user = {
}) })
.catch(error => { .catch(error => {
console.log(error) console.log(error)
reject('后端未启动或代理错误') reject(error)
}) })
}) })
}, },

@ -1,10 +1,20 @@
<template> <template>
<span>{{ msg }}</span> <div class="first-loading-wrp">
<!-- <h1>大简云工作平台</h1> -->
<div class="loading-wrp">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div>
<div style="display: flex; justify-content: center; align-items: center;">大简云工作平台</div>
</div>
</template> </template>
<script> <script>
// import { isLogin, setToken, removelogin } from '@/utils/auth'; // import { isLogin, setToken, removelogin } from '@/utils/auth';
import Logo from '../../components/tools/Logo'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
export default { export default {
components: {
Logo
},
data() { data() {
return { return {
msg: '请等待' msg: '请等待'
@ -19,7 +29,6 @@ export default {
}, },
methods: { methods: {
webset() { webset() {
console.log(111)
const code = this.$route.query.code; const code = this.$route.query.code;
const webid = this.$route.query.webid; const webid = this.$route.query.webid;
if (!webid) { if (!webid) {
@ -41,14 +50,14 @@ export default {
}, },
loginSuccess(webid, res) { loginSuccess(webid, res) {
// console.log(webid) // console.log(webid)
this.$router.push({ path: 'bookingLedger' }) this.$router.push({ path: webid })
// this.isLoginError = false // this.isLoginError = false
// // // //
this.dictTypeData().then(res => {}) this.dictTypeData().then(res => {})
}, },
requestFailed(res) { requestFailed(res) {
console.log(res) console.log(res)
this.$message.error(res) // this.$message.error(res)
} }
} }
}; };

Loading…
Cancel
Save