|
|
@@ -167,7 +167,7 @@ export default {
|
|
|
created () {
|
|
|
this.permission.cleanPermission()
|
|
|
// fixme prod 环境暂时开启账号登录功能
|
|
|
- this.dev = window.location.href.indexOf('localhost') > -1 || window.location.href.indexOf('https://dev.wutongshucloud.com/') > -1 || window.location.href.indexOf('https://prod.wutongshucloud.com/') > -1
|
|
|
+ this.dev = window.location.href.indexOf('localhost') > -1 || window.location.href.indexOf('https://dev.wutongshucloud.com/') > -1
|
|
|
removeToken()
|
|
|
this.init()
|
|
|
},
|
|
|
@@ -225,8 +225,7 @@ export default {
|
|
|
} else {
|
|
|
res.data.typeName = '服务商'
|
|
|
}
|
|
|
- const data = this.user.info
|
|
|
- this.user.setUserInfo(Object.assign(res.data, data))
|
|
|
+ this.user.setUserInfo(res.data)
|
|
|
this.getPermission()
|
|
|
}
|
|
|
})
|
|
|
@@ -269,7 +268,6 @@ export default {
|
|
|
this.$api.login.qrCodeLogin({ sessionId: this.sessionId }).then(res => {
|
|
|
if (res.code === 200) {
|
|
|
const tmp = res.data
|
|
|
- console.log(Object.prototype.hasOwnProperty.call(tmp, 'phone'))
|
|
|
if (Object.prototype.hasOwnProperty.call(tmp, 'phone')) {
|
|
|
const params = {
|
|
|
tenantId: '000000',
|