From 2c07c1ec7b0a7a83fe9371533008561b94e12de9 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Tue, 15 Oct 2024 08:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/stationDetail/stationDetail.vue | 27 ++-- pages/tabbar/home/home.vue | 135 +++++++++--------- pages/tabbar/station/stationList.vue | 30 ++-- utils/request.js | 34 +---- 4 files changed, 107 insertions(+), 119 deletions(-) diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index 2a471ca..4c5093b 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -293,16 +293,23 @@ siteId: item.siteId, clientBelong: "ZHONGPIN" } - let user = uni.getStorageSync('user'); - if (user) { - oilSiteApi.getSiteDetailsByKA(data2).then(res => { - if (res.code == 20000) { - this.siteInfo = Object.assign(item, res.data); - } - }) - } else { - this.siteInfo = item; - } + oilSiteApi.getSiteDetailsByKA(data2).then(res => { + if (res.code == 20000) { + this.siteInfo = Object.assign(item, res.data); + }else { + this.siteInfo = item + } + }) + // let user = uni.getStorageSync('user'); + // if (user) { + // oilSiteApi.getSiteDetailsByKA(data2).then(res => { + // if (res.code == 20000) { + // this.siteInfo = Object.assign(item, res.data); + // } + // }) + // } else { + // this.siteInfo = item; + // } }, makePay() { diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 68e6d0c..224eeab 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -376,18 +376,23 @@ showQr() { let user = uni.getStorageSync("user"); if (!user) { - uni.showModal({ - content: "登录后才能出示付款码哦", - confirmText: "去登录", - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: "/BagAuth/pages/login/login", - }); - } - }, - }); - return; + uni.showToast({ + title:'登录后才能出示付款码哦', + icon:'none' + }) + return + // uni.showModal({ + // content: "登录后才能出示付款码哦", + // confirmText: "去登录", + // success: function(res) { + // if (res.confirm) { + // uni.navigateTo({ + // url: "/BagAuth/pages/login/login", + // }); + // } + // }, + // }); + // return; } this.showThreeSites = true }, @@ -395,18 +400,23 @@ toCards() { let user = uni.getStorageSync("user"); if (!user) { - uni.showModal({ - content: "登录后才能查看哦", - confirmText: "去登录", - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: "/BagAuth/pages/login/login", - }); - } - }, - }); - return; + uni.showToast({ + title:'登录后才能获取加油卡哦', + icon:'none' + }) + return + // uni.showModal({ + // content: "登录后才能获取加油卡哦", + // confirmText: "去登录", + // success: function(res) { + // if (res.confirm) { + // uni.navigateTo({ + // url: "/BagAuth/pages/login/login", + // }); + // } + // }, + // }); + // return; } uni.navigateTo({ url: '/BagMoney/pages/oilCards/oilCards' @@ -414,21 +424,21 @@ }, toOrders() { - let user = uni.getStorageSync("user"); - if (!user) { - uni.showModal({ - content: "登录后才能查看哦", - confirmText: "去登录", - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: "/BagAuth/pages/login/login", - }); - } - }, - }); - return; - } + // let user = uni.getStorageSync("user"); + // if (!user) { + // uni.showModal({ + // content: "登录后才能查看哦", + // confirmText: "去登录", + // success: function(res) { + // if (res.confirm) { + // uni.navigateTo({ + // url: "/BagAuth/pages/login/login", + // }); + // } + // }, + // }); + // return; + // } uni.switchTab({ url: '/pages/tabbar/order/orderList/orderList' }) @@ -466,21 +476,21 @@ toDetail(item) { // console.log('siteList',this.siteList) - let user = uni.getStorageSync("user"); - if (!user) { - uni.showModal({ - content: "登录后才能查看哦", - confirmText: "去登录", - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: "/BagAuth/pages/login/login", - }); - } - }, - }); - return; - } + // let user = uni.getStorageSync("user"); + // if (!user) { + // uni.showModal({ + // content: "登录后才能查看哦", + // confirmText: "去登录", + // success: function(res) { + // if (res.confirm) { + // uni.navigateTo({ + // url: "/BagAuth/pages/login/login", + // }); + // } + // }, + // }); + // return; + // } // console.log('item',item) let itemS = encodeURIComponent(JSON.stringify(item)); uni.navigateTo({ @@ -535,18 +545,11 @@ openScan() { let user = uni.getStorageSync("user"); if (!user) { - uni.showModal({ - content: "登录后才能使用扫一扫哦", - confirmText: "去登录", - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: "/BagAuth/pages/login/login", - }); - } - }, - }); - return; + uni.showToast({ + title:'登录后才能使用扫一扫哦', + icon:'none' + }) + return } uni.scanCode({ scanType: 'qrCode', diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index aff1468..e08489e 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -461,21 +461,21 @@ }) }, toDetail(item) { - let user = uni.getStorageSync("user"); - if (!user) { - uni.showModal({ - content: "登录后才能查看哦", - confirmText: "去登录", - success: function(res) { - if (res.confirm) { - uni.navigateTo({ - url: "/BagAuth/pages/login/login", - }); - } - }, - }); - return; - } + // let user = uni.getStorageSync("user"); + // if (!user) { + // uni.showModal({ + // content: "登录后才能查看哦", + // confirmText: "去登录", + // success: function(res) { + // if (res.confirm) { + // uni.navigateTo({ + // url: "/BagAuth/pages/login/login", + // }); + // } + // }, + // }); + // return; + // } let itemS = encodeURIComponent(JSON.stringify(item)); uni.navigateTo({ url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, diff --git a/utils/request.js b/utils/request.js index d883f7d..88c7487 100644 --- a/utils/request.js +++ b/utils/request.js @@ -7,8 +7,8 @@ const env = 'production'/* */ const testUrl = 'http://192.168.110.77:38080' // const productUrl = 'http://121.196.213.68/adminapi' //预生产 -// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new -const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new +const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new +// const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new const service = axios.create({ baseURL: env == 'production' ? productUrl : testUrl, // baseURL: testUrl, @@ -18,16 +18,13 @@ var url = '' service.interceptors.request.use( config => { - // 拦截请求 uni.showLoading({ title: '加载中...' }) const token = uni.getStorageSync('Authorization') || " " const unionId = uni.getStorageSync('unionid') const openId = uni.getStorageSync('openid') - // const accountSources = 'WE_CHAT_PROGRAM' const accountSources = 'LOGIN_MP_WECHAT' - // console.log('取出来缓存', token, openid) config.headers['openId'] = openId config.headers['Authorization'] = token @@ -40,31 +37,18 @@ service.interceptors.request.use( if(config.data.params) { config.data.params['parentCompanyId'] = parentCompanyId }else config.data['parentCompanyId'] = parentCompanyId - } - - - + if (env === 'production') { - // 生产环境，加密，不输出任何东西 - // 设置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) config.data = data - // } } else { - // console.log('\n\n-----------------------') - // console.log('参数', config.url, '参数加密前', config.data) url = config.url } @@ -85,20 +69,14 @@ service.interceptors.response.use( 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('返回', response.config.url, '返回结果',res) } - } else { - // console.log('返回', response.config.url, '返回结果未加密', res) - // console.log('-------------------------------------------\n\n') } uni.hideLoading() - if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){ + if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') == -1){ if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同') { uni.showToast({ title: res.msg,