diff --git a/.env.development b/.env.development index de583d0..f2ab08f 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,4 @@ ENV = 'development' # base api -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = 'http://mockjs.docway.net/mock/' diff --git a/.env.production b/.env.production index 80c8103..3a02f7d 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = "http://mockjs.docway.net/mock/" diff --git a/src/api/userInfoApi.js b/src/api/userInfoApi.js new file mode 100644 index 0000000..cf97d15 --- /dev/null +++ b/src/api/userInfoApi.js @@ -0,0 +1,98 @@ +import request from '@/utils/request' +// 需要去掉1i1D04JgcdM +//获取剧本分页列表 +export function queryJbInfo(data) { + return request({ + url: '1i1D04JgcdMsce/info/page', + method: 'post', + data + }) +} +//获取剧本列表 +export function queryJbInfos(data) { + return request({ + url: '1i1D04JgcdMsce/info/findList', + method: 'post', + data + }) +} +//获取剧本详情列表 +export function queryJbDetail(id) { + return request({ + url: '1i1D04JgcdMsce/info/detail', + method: 'post', + data:{id} + }) +} +//新增剧本列表 +export function addJbInfo(data) { + return request({ + url: '1i1D04JgcdMsce/info/add', + method: 'post', + data + }) +} +//编辑剧本列表 +export function updateJbInfo(data) { + return request({ + url: '1i1D04JgcdMsce/info/update', + method: 'post', + data + }) +} +//删除剧本列表 +export function deleteJbInfo(id) { + return request({ + url: '1i1D04JgcdMsce/info/delete', + method: 'post', + data:{id} + }) +} +//获取流程列表 +export function queryFindList(data) { + return request({ + url: '1i1D04JgcdMsce/process/findList', + method: 'post', + data + }) +} +//获取Tips列表 +export function queryTipsList(data) { + return request({ + url: '1i1D04JgcdMtips/info/page', + method: 'post', + data + }) +} +//新增Tips列表 +export function addTipsList(data) { + return request({ + url: '1i1D04JgcdMtips/info/add', + method: 'post', + data + }) +} +//编辑Tips列表 +export function updateTipsList(data) { + return request({ + url: '1i1D04JgcdMtips/info/update', + method: 'post', + data + }) +} +//删除Tips列表 +export function deteleTipsList(id) { + return request({ + url: '1i1D04JgcdMtips/info/detele', + method: 'post', + data:{id} + }) +} +//获取Tips详情 +export function queryTipsDetail(id) { + return request({ + url: '1i1D04JgcdMtips/info/detail', + method: 'post', + data:{id} + }) +} diff --git a/src/permission.js b/src/permission.js index fa1ea19..5266624 100644 --- a/src/permission.js +++ b/src/permission.js @@ -18,7 +18,7 @@ router.beforeEach(async(to, from, next) => { document.title = getPageTitle(to.meta.title) // determine whether the user has logged in - const hasToken = getToken() + const hasToken = 4123 if (hasToken) { if (to.path === '/login') { @@ -32,12 +32,12 @@ router.beforeEach(async(to, from, next) => { } else { try { // get user info - await store.dispatch('user/getInfo') + // await store.dispatch('user/getInfo') next() } catch (error) { // remove token and go to login page to re-login - await store.dispatch('user/resetToken') + // await store.dispatch('user/resetToken') Message.error(error || 'Has Error') next(`/login?redirect=${to.path}`) NProgress.done() diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 33e5ab6..ab1c4a5 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,6 @@ @@ -9,11 +9,6 @@ import { mapGetters } from 'vuex' export default { name: 'Dashboard', - computed: { - ...mapGetters([ - 'name' - ]) - } } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1db2464..6a27379 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -106,20 +106,20 @@ export default { }) }, handleLogin() { - this.$refs.loginForm.validate(valid => { - if (valid) { - this.loading = true - this.$store.dispatch('user/login', this.loginForm).then(() => { - this.$router.push({ path: this.redirect || '/' }) - this.loading = false - }).catch(() => { - this.loading = false - }) - } else { - console.log('error submit!!') - return false - } - }) + // this.$refs.loginForm.validate(valid => { + // if (valid) { + // this.loading = true + // this.$store.dispatch('user/login', this.loginForm).then(() => { + this.$router.push({ path:'/nested' }) + // this.loading = false + // }).catch(() => { + // this.loading = false + // }) + // } else { + // console.log('error submit!!') + // return false + // } + // }) } } } diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue index 6ec2569..a384fdd 100644 --- a/src/views/nested/menu1/index.vue +++ b/src/views/nested/menu1/index.vue @@ -5,21 +5,21 @@ @@ -49,10 +49,10 @@
- - - - + + + +