master
lion 8 months ago
parent 8ccd204819
commit 6c0be78d07

@ -1,6 +1,6 @@
# just a flag
ENV='development'
VUE_APP_BASE_API = http://jintancanlian-test.ali251.langye.net/
VUE_APP_UPLOAD_API = http://jintancanlian-test.ali251.langye.net/api/admin/upload-file
VUE_APP_BASE_API = https://jintancanlian-test.ali251.langye.net/
VUE_APP_UPLOAD_API = https://jintancanlian-test.ali251.langye.net/api/admin/upload-file

@ -2,5 +2,5 @@
ENV = 'production'
# base api
VUE_APP_BASE_API = http://jintancanlian-test.ali251.langye.net/
VUE_APP_UPLOAD_API =http://jintancanlian-test.ali251.langye.net/api/admin/upload-file
VUE_APP_BASE_API = https://jintancanlian-test.ali251.langye.net/
VUE_APP_UPLOAD_API =https://jintancanlian-test.ali251.langye.net/api/admin/upload-file

@ -23,6 +23,7 @@
"echarts": "^4.2.1",
"element-ui": "^2.15.13",
"file-saver": "^2.0.5",
"js-base64": "^3.7.7",
"js-cookie": "2.2.0",
"less": "^3.13.1",
"less-loader": "^5.0.0",

@ -43,7 +43,7 @@
import {
validUsername
} from '@/utils/validate'
import {Base64} from 'js-base64'
const defaultSettings = require('../../../src/settings.js')
export default {
name: 'Login',
@ -114,7 +114,10 @@
this.loading = true
console.log("this.redirect",this.redirect)
// return
this.$store.dispatch('user/login', this.loginForm).then(() => {
this.$store.dispatch('user/login', {
username: this.loginForm.username,
password: Base64.encode(this.loginForm.password)
}).then(() => {
this.$router.push({
path: '/jsc'

Loading…
Cancel
Save