pull/1/head^2
caolc 2 years ago
parent f145737091
commit e8b3d0f49b
  1. 1
      pages/escalation/escalation.vue
  2. 45
      pages/home/home.vue
  3. 6
      utils/request.js

@ -126,7 +126,6 @@
onShow() { onShow() {
this.start = this.datefn(); this.start = this.datefn();
this.single = this.datefn() this.single = this.datefn()
console.log(this.start),'+++++++++++++++++++'
this.getByPage() this.getByPage()
}, },
methods: { methods: {

@ -416,6 +416,7 @@
}, },
// //
getSiteInfo(channelId) { getSiteInfo(channelId) {
console.log('获取油站信息')
oliSiteApi.getSiteDetail(channelId).then(res => { oliSiteApi.getSiteDetail(channelId).then(res => {
// //console.log(res) // //console.log(res)
if (res.code === 20000) { if (res.code === 20000) {
@ -450,14 +451,41 @@
this.accountName = items.otherSiteName this.accountName = items.otherSiteName
this.checkList = '' this.checkList = ''
this.checkFirst = false this.checkFirst = false
uni.setStorageSync('checkFirst',false) uni.setStorageSync('checkFirst',false);
uni.setStorage({ console.log(uni.getStorageSync('Authorization'),'更新前Authorization')
key: 'Authorization', uni.setStorageSync('Authorization',res.data.authTokenDTO.accessToken)
data: res.data.authTokenDTO.accessToken, console.log(uni.getStorageSync('Authorization'),'更新后Authorization')
success: () => { // uni.setStorage({
//console.log('Authorization', res.data.authTokenDTO.accessToken) // key:'Authorization',
} // data:res.data.authTokenDTO.accessToken,
}) // success: function () {
// console.log('accessToken');
// },
// fail(){
// console.log('accessToken')
// }
// })
// uni.setStorage({
// key: 'Authorization',
// data: res.data.authTokenDTO.accessToken,
// success: () => {
// console.log('Authorization', res.data.authTokenDTO.accessToken)
// },
// fail(e){
// console.log(e,'Authorization')
// }
// })
// uni.setStorageSync({
// key: 'Authorization',
// data: res.data.authTokenDTO.accessToken,
// success: () => {
// console.log('Authorization', res.data.authTokenDTO.accessToken)
// },
// fail(e){
// console.log(e,'11111111111111')
// }
// })
this.checkForE =false this.checkForE =false
uni.setStorageSync('userMenu', res.data.authTokenDTO.loginUser.roleMenus) uni.setStorageSync('userMenu', res.data.authTokenDTO.loginUser.roleMenus)
uni.setStorageSync('loginUser', { uni.setStorageSync('loginUser', {
@ -478,6 +506,7 @@
}, },
// //
getUserInfo(id) { getUserInfo(id) {
console.log('获取油站基本资料')
// //
oliSiteApi.getSiteBasicData(id).then(res => { oliSiteApi.getSiteBasicData(id).then(res => {
//console.log('', res) //console.log('', res)

@ -7,11 +7,11 @@ import utils from '@/utils/encode'
//42 洛超 /29 孙志华 /40 阿浩 //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.51xingka.net/oilApp' // 生产,加密 old
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
const productionUrl = 'http://uat.xingoil.com/adminapi' // 生产,加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
// const productionUrl = 'http://121.196.213.68/adminapi' //预生产 const productionUrl = 'http://uat.xingoil.com/adminapi'
// const env = process.env.NODE_ENV // 环境 // const env = process.env.NODE_ENV // 环境
const service = axios.create({ const service = axios.create({
baseURL: env=='production'?productionUrl:testUrl, // baseURL: env=='production'?productionUrl:testUrl, //

Loading…
Cancel
Save