diff --git a/.env.production b/.env.production index c66d5c7..55c7919 100644 --- a/.env.production +++ b/.env.production @@ -2,15 +2,15 @@ ENV = 'production' # base api -VUE_APP_BASE_API = http://192.168.60.99:9004/ -VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file -VUE_APP_OA_URL = http://192.168.60.18:2021 -VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' +#VUE_APP_BASE_API = http://192.168.60.99:9004/ +#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file +#VUE_APP_OA_URL = http://192.168.60.18:2021 +#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' -#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ -#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file -#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net -#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' +VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ +VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file +VUE_APP_OA_URL= http://suzhouhedaooa.langye.net +VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' diff --git a/src/api/user.js b/src/api/user.js index e12d073..86571c4 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -8,6 +8,15 @@ export function login(data) { }) } +export function loginOss(data) { + return request({ + url: '/api/admin/auth/oss-login', + method: 'post', + data, + noloading:true + }) +} + export function getInfo(token) { return request({ url: '/api/admin/auth/me', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c288974..77dd96b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,7 +1,8 @@ import { login, logout, - getInfo + getInfo, + loginOss } from '@/api/user' import { getToken, @@ -42,6 +43,36 @@ const mutations = { } const actions = { + loginskip({ + commit + }, userInfo) { + const { + token, + tp, + loginId + } = userInfo + + return new Promise((resolve, reject) => { + loginOss({ + token: token, + tp: tp, + loginId: loginId + }).then(response => { + + //console.log(response) + + const { + data + } = response; + console.log(response.access_token) + commit('SET_TOKEN', response.access_token) + setToken(response.access_token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, // user login login({ commit @@ -104,7 +135,8 @@ const actions = { commit, state }) { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { + console.log("logout",state.token) logout(state.token).then(() => { removeToken() // must remove token first resetRouter() diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d50357a..febeee1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -46,87 +46,111 @@ const defaultSettings = require('../../../src/settings.js') export default { - name: 'Login', - data() { - const validateUsername = (rule, value, callback) => { - if (!validUsername(value)) { - callback(new Error('请正确输入登录名')) - } else { - callback() - } - } - const validatePassword = (rule, value, callback) => { - if (value.length < 6) { - callback(new Error('密码输入错误')) - } else { - callback() - } - } - return { - title: "", - loginForm: { - username: '', - password: '' - }, - loginRules: { - username: [{ - required: true, - trigger: 'blur', - validator: validateUsername - }], - password: [{ - required: true, - trigger: 'blur', - validator: validatePassword - }] - }, - loading: false, - passwordType: 'password', - redirect: undefined - } - }, - watch: { - $route: { - handler: function(route) { - this.redirect = route.query && route.query.redirect - }, - immediate: true - } - }, - created() { - this.title = defaultSettings.title; - }, - methods: { - showPwd() { - if (this.passwordType === 'password') { - this.passwordType = '' - } else { - this.passwordType = 'password' - } - this.$nextTick(() => { - this.$refs.password.focus() - }) + name: 'Login', + data() { + const validateUsername = (rule, value, callback) => { + if (false) { + callback(new Error('请正确输入登录名')) + } else { + callback() + } + } + const validatePassword = (rule, value, callback) => { + if (false) { + callback(new Error('请正确输入密码')) + } else { + callback() + } + } + return { + showLogin: false, + loginForm: { + username: '', + password: '' + }, + loginRules: { + username: [{ + required: true, + trigger: 'blur', + validator: validateUsername + }], + password: [{ + required: true, + trigger: 'blur', + validator: validatePassword + }] + }, + loading: false, + passwordType: 'password', + redirect: undefined + } + }, + beforeCreate() { + + }, + created() { + this.title = defaultSettings.title; + var query = this.$route.query; + if (query.tp) { + this.showLogin = false; + } else { + this.showLogin = true; + } + if (query.token && query.userid && query.tp) { + this.loading = true + this.$store.dispatch('user/loginskip', { + token: query.token, + tp: query.tp, + loginId: query.loginId + }).then(() => { + this.$router.push({ + path: "/" + }) + this.loading = false + }).catch((error) => { + console.log(error) + this.loading = false + }) + } + }, + watch: { + $route: { + handler: function(route) { + this.redirect = route.query && route.query.redirect + }, + immediate: true + } + }, + methods: { + showPwd() { + if (this.passwordType === 'password') { + this.passwordType = '' + } else { + this.passwordType = 'password' + } + this.$nextTick(() => { + this.$refs.password.focus() + }) }, - //处理登录 - 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 - } - }) - } + handleLogin() { + this.$refs.loginForm.validate(valid => { + if (valid) { + this.loading = true + this.$store.dispatch('user/login', this.loginForm).then(() => { + console.log(this.redirect) + this.$router.push({ + path: this.redirect || '/' + }) + this.loading = false + }).catch(() => { + this.loading = false + }) + } else { + console.log('error submit!!') + return false + } + }) + } } } diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue index f008d51..9d67dac 100644 --- a/src/views/stocks/component/addRuku.vue +++ b/src/views/stocks/component/addRuku.vue @@ -114,7 +114,7 @@
- +