diff --git a/Activity/pages/index/index.vue b/Activity/pages/index/index.vue
index 84e5c61..140b43a 100644
--- a/Activity/pages/index/index.vue
+++ b/Activity/pages/index/index.vue
@@ -73,8 +73,8 @@
})
} else {
uni.showModal({
- title: '请您登录',
- content: "登录星油加油才可以加油 |˛˙꒳˙)♡",
+
+ content: "登录后才能查看哦",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {
diff --git a/App.vue b/App.vue
index 7fabfde..21a7389 100644
--- a/App.vue
+++ b/App.vue
@@ -79,7 +79,6 @@
onShareAppMessage(e) {
let that = this
wx.onAppRoute((res) => {
- // console.log(res, '当前页面路由发生变化 触发该事件onShareAppMessage');
const pages = getCurrentPages() //获取加载的页面
const view = pages[pages.length - 1] //获取当前页面的对象
if (!view) return false //如果不存在页面对象 则返回
@@ -91,40 +90,38 @@
}
}
- let white = ['pages/index/startPage/startPage','AppletCode/pages/index/index']
- if(view.route === 'BagStation/pages/stationDetail/stationDetail') {
- uni.removeStorageSync('refuseLogin')
- }
- // console.log('white.includes(view.route)',white.includes(view.route))
- // // 是否跳过登陆
- let isRefuseLogin = uni.getStorageSync('refuseLogin')
- if(isRefuseLogin || white.includes(view.route) || view.route.includes('BagAuth')) return
- // console.log('111111111111111')
- this.getAmount()
+ // let white = ['pages/index/startPage/startPage','AppletCode/pages/index/index']
+ // if(view.route === 'BagStation/pages/stationDetail/stationDetail') {
+ // uni.removeStorageSync('refuseLogin')
+ // }
+ // // // 是否跳过登陆
+ // let isRefuseLogin = uni.getStorageSync('refuseLogin')
+ // if(isRefuseLogin || white.includes(view.route) || view.route.includes('BagAuth')) return
+ // this.getAmount()
})
},
// 是否token过期或ip更改
getAmount() {
// clearTimeout(loginTimer)
accountApi.getTotalOilCardInfo().then(res => {
- if (res.code == 42011) {
- uni.setStorageSync('Authorization',null)
- uni.setStorageSync('openid',null)
+ // if (res.code == 42011) {
+ // uni.setStorageSync('Authorization',null)
+ // uni.setStorageSync('openid',null)
- uni.showModal({
- title: '需要您重新登录',
- content: res.msg,
- duration: '3000',
- showCancel:false,
- success: function(res) {
- if (res.confirm) {
- uni.redirectTo({
- url: '/BagAuth/pages/login/login'
- })
- }
- }
- })
- }
+ // uni.showModal({
+ // title: '需要您重新登录',
+ // content: res.msg,
+ // duration: '3000',
+ // showCancel:false,
+ // success: function(res) {
+ // if (res.confirm) {
+ // uni.redirectTo({
+ // url: '/BagAuth/pages/login/login'
+ // })
+ // }
+ // }
+ // })
+ // }
})
},
},
@@ -142,15 +139,16 @@
// if (token && openid) {
// this.getAmount()
// }
- uni.getLocation({
- type: 'wgs84',
- success: function(res) {
- uni.setStorageSync('location', {
- longitude: res.longitude + '',
- latitude: res.latitude + ''
- })
- }
- });
+
+ // uni.getLocation({
+ // type: 'wgs84',
+ // success: function(res) {
+ // uni.setStorageSync('location', {
+ // longitude: res.longitude + '',
+ // latitude: res.latitude + ''
+ // })
+ // }
+ // });
},
}
diff --git a/BagAuth/pages/login/login.vue b/BagAuth/pages/login/login.vue
index 158989b..3e2c44a 100644
--- a/BagAuth/pages/login/login.vue
+++ b/BagAuth/pages/login/login.vue
@@ -35,9 +35,10 @@
-
+
+ 仅提供给星油能源内部合作用户使用
卡力用户仅支持跳转登录
@@ -207,19 +208,19 @@
})
},
refuseLogin(){
- uni.clearStorageSync()
- uni.setStorageSync('refuseLogin','true')
+ // uni.clearStorageSync()
+ // uni.setStorageSync('refuseLogin','true')
uni.switchTab({
url: '/pages/tabbar/home/home'
})
},
refreshLocation() {
- uni.getLocation({
- type: 'wgs84',
- success: function(res) {
- uni.setStorageSync('location', res)
- }
- });
+ // uni.getLocation({
+ // type: 'wgs84',
+ // success: function(res) {
+ // uni.setStorageSync('location', res)
+ // }
+ // });
},
autoLogin() {
let url = 'loginCompany'
@@ -308,6 +309,13 @@
+
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 050b339..f289df6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,36 +1,32 @@
import axios from 'axios'
import utils from '@/utils/encode'
-// const env = process.env.NODE_ENV
-// const env = 'production'/* */
+
// const env = 'test'
const env = 'production'
-// 45
-const testUrl = 'http://192.168.110.77:38080'
-// const productUrl = 'https://www.xingoil.com/adminapi'
-const productUrl = 'http://uat.xingoil.com/adminapi'
-// const productUrl = 'http://192.168.0.191:38080'
-// const productUrl = 'http://121.196.213.68/adminapi'
+const testUrl = 'http://192.168.110.77:38080'
+// const productUrl = 'http://uat.xingoil.com/adminapi'
+const productUrl = 'https://www.xingoil.com/adminapi'
+
+let whiteList = ['/oil-site/oilSiteOrderInfo/getOrderQrCode']
+
const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl,
// baseURL: testUrl,
timeout: 5000
})
-let closeShowLoading
+let closeShowLoading
var url = ''
service.interceptors.request.use(
config => {
- // 拦截请求
- closeShowLoading = config?.closeShowLoading||false;
- // console.log(closeShowLoading,'isLoadingisLoadingisLoading')
- if(!closeShowLoading){
- //判断是否自动开始请求loading
+ closeShowLoading = config?.closeShowLoading || false;
+ if (!closeShowLoading) {
uni.showLoading({
title: '加载中...',
mask: true
})
}
-
+
const token = uni.getStorageSync('Authorization')
const unionId = uni.getStorageSync('unionid')
const openId = uni.getStorageSync('openid')
@@ -44,35 +40,24 @@ service.interceptors.request.use(
config.headers['dataSources'] = 'MP'
if (env === 'production') {
- // console.log("这里是生产")
- // 生产环境，加密，不输出任何东西
- // 设置jsessionid和token
const JSESSIONID = utils.uuid()
config.headers['JSESSIONID'] = JSESSIONID
config.headers['token'] = utils.md5Salt(JSESSIONID)
- // if ( encryptWhite.indexOf(config.url) < 0) {
- // if (!notEncrypt && encryptWhite.indexOf(config.url) < 0) {
- // 这是定义在哪的
- const data = { // 用于存储加密
- params: '' // 加密后的密文
+
+ const data = {
+ params: ''
}
- // 要加密
data.params = utils.encrypt(JSON.stringify(config.data))
- // console.log('参数', config.url, '参数加密前', config.data, '加密：', data)
config.data = data
// }
} else {
- // console.log("这里是测试")
- // console.log('\n\n-----------------------')
- // console.log('参数', config.url, '参数加密前', config.data)
url = config.url
}
return config
},
error => {
- if(!closeShowLoading){
- //判断是否自动开始请求loading
+ if (!closeShowLoading) {
uni.hideLoading()
}
uni.showToast({
@@ -83,62 +68,50 @@ service.interceptors.request.use(
}
)
service.interceptors.response.use(
- response => {
- // console.log(response.config?.closePrompt,'response.config?.closePrompt')
+ response => {
const res = response.data
if (env === 'production') {
- // 生产环境，进行加密解密，不输出日志
if (res.encrypt == 1) {
- // 加密的数据，需要解密
const dataParam = JSON.parse(utils.decrypt(res.data))
res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
- // console.log(res.data)
- // console.log('返回', response.config.url, '返回结果',res)
}
- } else {
- // console.log('返回', response.config.url, '返回结果未加密', res)
- // console.log('-------------------------------------------\n\n')
}
- if(!closeShowLoading){
- //判断是否自动开始请求loading
+ if (!closeShowLoading) {
uni.hideLoading()
}
- if (response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1) {
- if (response.config.url.indexOf('/oil-site/oilSiteAppInfo/getBSiteDetails') != -1) {
- // console.log('这里是getBSiteDetails 拦截处')
- // if (res.code != 20000&&res.msg!='令牌为空，不允许操作'&&res.msg!='您的ip已经更改，请重新登录'&&res.msg!='登录与操作设备不同') {
- // uni.showToast({
- // title: res.msg,
- // icon: "none"
- // })
- // }
- } else {
- if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同') {
- uni.showToast({
- title: res.msg,
- icon: "none"
- });
- if (response.config.url.indexOf('/oil-user/oilCompanyInfo/getQrCodeType') != -1) {
- setTimeout(() => {
- uni.redirectTo({
- url: '/BagAuth/pages/login/oldLogin'
- })
- }, 2000)
- }
- // return Promise.reject()
- }
+ if (!whiteList.includes(response.config.url)) {
+ if (res.code === 42011) {
+ uni.showModal({
+ title: "提示",
+ content: "登录信息过期，请重新登录哦",
+ confirmText: "去登录",
+ success: function(res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: "/BagAuth/pages/login/login",
+ });
+ }
+ },
+ });
+ return Promise.reject();
+ }
+ if (res.code != 20000) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ });
+ return Promise.reject();
}
}
+
return res
},
error => {
- if(!closeShowLoading){
- //判断是否自动开始请求loading
+ if (!closeShowLoading) {
uni.hideLoading()
}
uni.getNetworkType({
- success: function(res) {
- console.log(res.networkType);
+ success: (res) => {
if (res.networkType === 'none') {
uni.showToast({
title: '没有网啦！',
@@ -149,7 +122,6 @@ service.interceptors.response.use(
title: '请求失败！',
icon: "none"
})
- console.log(error)
}
}
});
@@ -186,4 +158,4 @@ service.defaults.adapter = function(config) {
}
// #endif
-export default service
+export default service
\ No newline at end of file