Commit 3549c0c4 by 展昭

uninstall vconsole

parent 38d6a6a6
...@@ -10868,11 +10868,6 @@ ...@@ -10868,11 +10868,6 @@
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
"dev": true "dev": true
}, },
"vconsole": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.3.4.tgz",
"integrity": "sha512-9yihsic96NPoMLQx/lCQwH9d89H0bbMW3LZPzo/t4yGQcS1X+vTCe9OHm1XSH7WNxzGDmcSwBiKLsFGwvJpQBg=="
},
"vendors": { "vendors": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz?cache=0&sync_timestamp=1579857106626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvendors%2Fdownload%2Fvendors-1.0.4.tgz", "resolved": "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz?cache=0&sync_timestamp=1579857106626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvendors%2Fdownload%2Fvendors-1.0.4.tgz",
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
"oidc-client": "^1.10.1", "oidc-client": "^1.10.1",
"postcss-px2rem": "^0.3.0", "postcss-px2rem": "^0.3.0",
"vant": "^2.6.0", "vant": "^2.6.0",
"vconsole": "^3.3.4",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-router": "^3.1.6", "vue-router": "^3.1.6",
"vuex": "^3.1.3", "vuex": "^3.1.3",
......
...@@ -53,10 +53,10 @@ Vue.prototype.setPageNavState = function () { ...@@ -53,10 +53,10 @@ Vue.prototype.setPageNavState = function () {
Vue.prototype.$bridge = bridge; Vue.prototype.$bridge = bridge;
if (process.env.NODE_ENV === 'development') { // if (process.env.NODE_ENV === 'development') {
const VConsole = require('vconsole') // const VConsole = require('vconsole')
const my_console = new VConsole(); // const my_console = new VConsole();
} // }
new Vue({ new Vue({
......
...@@ -27,6 +27,7 @@ const router = new VueRouter({ ...@@ -27,6 +27,7 @@ const router = new VueRouter({
return { x: 0, y: 0 } return { x: 0, y: 0 }
} }
}) })
//自动登录 //自动登录
function autoLogin(payload = { autoCode, redirectPath }) { function autoLogin(payload = { autoCode, redirectPath }) {
store.dispatch("authenticateOidc", { store.dispatch("authenticateOidc", {
...@@ -86,6 +87,9 @@ router.beforeEach((to, from, next) => { ...@@ -86,6 +87,9 @@ router.beforeEach((to, from, next) => {
store.dispatch("signOutOidc") store.dispatch("signOutOidc")
}else{ }else{
//如果登录用户与当前登录用户不匹配,则保存登录参数,退出 //如果登录用户与当前登录用户不匹配,则保存登录参数,退出
console.log('userId=',userId);
console.log('oidcUser.profile.sub=',oidcUser.profile.sub);
console.log('oidcUser.profile.sub==userId:',oidcUser.profile.sub==userId);
if (userId > 0 && oidcUser.profile.sub != userId) { if (userId > 0 && oidcUser.profile.sub != userId) {
setAutoLogin({ autoCode: authcode, redirectPath: toPath }) setAutoLogin({ autoCode: authcode, redirectPath: toPath })
store.dispatch("signOutOidc") store.dispatch("signOutOidc")
......
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 sign in to comment