diff --git a/pages/escalation/escalation.vue b/pages/escalation/escalation.vue index 339ca1e..25f35c7 100644 --- a/pages/escalation/escalation.vue +++ b/pages/escalation/escalation.vue @@ -126,7 +126,6 @@ onShow() { this.start = this.datefn(); this.single = this.datefn() - console.log(this.start),'+++++++++++++++++++' this.getByPage() }, methods: { diff --git a/pages/home/home.vue b/pages/home/home.vue index 31f2a54..79f1985 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -416,6 +416,7 @@ }, // 获取油站信息 getSiteInfo(channelId) { + console.log('获取油站信息') oliSiteApi.getSiteDetail(channelId).then(res => { // //console.log(res) if (res.code === 20000) { @@ -451,13 +452,7 @@ this.checkList = '' this.checkFirst = false uni.setStorageSync('checkFirst',false) - uni.setStorage({ - key: 'Authorization', - data: res.data.authTokenDTO.accessToken, - success: () => { - //console.log('Authorization成功', res.data.authTokenDTO.accessToken) - } - }) + uni.setStorageSync('Authorization',res.data.authTokenDTO.accessToken) this.checkForE =false uni.setStorageSync('userMenu', res.data.authTokenDTO.loginUser.roleMenus) uni.setStorageSync('loginUser', { @@ -478,6 +473,7 @@ }, //获取油站基本资料 getUserInfo(id) { + console.log('获取油站基本资料') // 获取云站当前登录用户的基础资料 oliSiteApi.getSiteBasicData(id).then(res => { //console.log('用户资料', res) diff --git a/utils/request.js b/utils/request.js index 1b80365..4987c1c 100644 --- a/utils/request.js +++ b/utils/request.js @@ -2,16 +2,16 @@ import axios from 'axios' import utils from '@/utils/encode' // const env = 'test' /* */ - const env = 'test'// 仅用于测试、 -// const env = 'production' +// const env = 'test'// 仅用于测试、 + const env = 'production' //42 洛超 /29 孙志华 /40 阿浩 // 测试日日顺时需要连阿浩 -const testUrl = 'http://192.168.110.208:38080' +const testUrl = 'http://192.168.54:38080' // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产,加密 old // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new -const productionUrl = 'http://uat.xingoil.com/adminapi' // 生产,加密 new -// const productionUrl = 'http://121.196.213.68/adminapi' //预生产 +// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new +const productionUrl = 'http://uat.xingoil.com/adminapi' // const env = process.env.NODE_ENV // 环境 const service = axios.create({ baseURL: env=='production'?productionUrl:testUrl, //