From adb1b0144549616742543e4b601e852a44c1f147 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Tue, 15 Oct 2024 10:04:51 +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 | 41 +++++---- pages/tabbar/home/home.vue | 90 +++++++++---------- pages/tabbar/station/stationList.vue | 8 +- utils/request.js | 36 ++++---- 4 files changed, 87 insertions(+), 88 deletions(-) diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index 4e9d520..bdf023e 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -278,28 +278,35 @@ }) }, getSiteInfo(id, item) { - let user = uni.getStorageSync('user'); + // let user = uni.getStorageSync('user'); let data2 = { ...uni.getStorageSync('location'), siteId: id, clientBelong: "BAICHUAN" } - if (user) { - oilSiteApi.getSiteDetailsByKA(data2).then(res => { - if (res.code == 20000) { - this.siteInfo = res.data - }else { - setTimeout(()=>{ - uni.showToast({ - title:res.msg, - icon:'none' - }) - },1000) - } - }) - } else { - this.siteInfo = item - } + oilSiteApi.getSiteDetailsByKA(data2).then(res => { + if (res.code == 20000) { + this.siteInfo = res.data + }else { + this.siteInfo = item + } + }) + // if (user) { + // oilSiteApi.getSiteDetailsByKA(data2).then(res => { + // if (res.code == 20000) { + // this.siteInfo = res.data + // }else { + // setTimeout(()=>{ + // uni.showToast({ + // title:res.msg, + // icon:'none' + // }) + // },1000) + // } + // }) + // } else { + // this.siteInfo = item + // } }, makePay() { diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index abfb852..8b5bde1 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -59,13 +59,13 @@ - + 中交风控 - + @@ -153,7 +153,7 @@ - + @@ -179,7 +179,8 @@ - + @@ -200,10 +201,9 @@ }, data() { return { - swiperArray: [ - { - src:this.global.imgURL+'banner-baichuan.png', - link:'' + swiperArray: [{ + src: this.global.imgURL + 'banner-baichuan.png', + link: '' }, // { // src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png', @@ -349,7 +349,7 @@ const openid = uni.getStorageSync('openid') if (token && openid) { this.getAuthInfo() - } + } // else { // uni.showToast({ // title: '您还没有登录哦', @@ -360,7 +360,7 @@ }, methods: { - toActivity(){}, + toActivity() {}, toManagement() { const user = uni.getStorageSync('user'); if (user) { @@ -389,7 +389,7 @@ // uni.navigateTo({ // url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) // }) - if(item?.JumpPage){ + if (item?.JumpPage) { uni.navigateTo({ url: item.JumpPage }) @@ -426,7 +426,7 @@ success: (resSec) => { if (resSec.confirm) { uni.openSetting({ - complete:() => { + complete: () => { // this.getSiteList() // this.realPosition() // this.refreshLocation() @@ -435,10 +435,10 @@ } } }) - }else { + } else { uni.showToast({ - title:'获取定位失败，请稍后再试！', - icon:'none' + title: '获取定位失败，请稍后再试！', + icon: 'none' }) } } @@ -541,12 +541,25 @@ }, showQr() { - // uni.navigateTo({ - // url: '/BagStation/pages/stationDetail/stieQr' - // }) + let user = uni.getStorageSync("user"); + if (!user) { + uni.showToast({ + title: '登录后才能出示付款码哦', + icon: 'none' + }) + return + } this.showThreeSites = true }, toCards() { + let user = uni.getStorageSync("user"); + if (!user) { + uni.showToast({ + title: '登录后才能获取加油卡哦', + icon: 'none' + }) + return + } uni.navigateTo({ url: '/BagMoney/pages/oilCards/oilCards' }) @@ -597,37 +610,14 @@ // } // }) // } else { - + // } }, toDetail(item) { let itemS = encodeURIComponent(JSON.stringify(item)) uni.navigateTo({ - url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, - fail: (err) => {}, - success: () => {} + url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}` }) - // console.log(itemS) - // if (uni.getStorageSync('user')) { - // uni.navigateTo({ - // url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, - // fail: (err) => {}, - // success: () => {} - // }) - // } else { - // uni.showModal({ - // title: '请您登录', - // content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡", - // confirmText: '去登陆', - // success: (res) => { - // if (res.confirm) { - // uni.reLaunch({ - // url: '../../../BagAuth/pages/login/login?loginType=true' - // }) - // } - // } - // }) - // } }, getFilterData() { oilSiteApi.getCheckInfo().then(res => { @@ -727,11 +717,15 @@ } }) }, - scan1() { - // 测试用 - this.getScanRes('fixed_1371293944539422720') - }, openScan() { + let user = uni.getStorageSync("user"); + if (!user) { + uni.showToast({ + title: '登录后才能使用扫一扫哦', + icon: 'none' + }) + return + } uni.scanCode({ scanType: 'qrCode', onlyFromCamera: false, @@ -839,4 +833,4 @@ .my-icon-sm .text-sm { line-height: 1rem; } - + \ No newline at end of file diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index a830936..61bc1c8 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -469,13 +469,7 @@ toDetail(item) { let itemS = encodeURIComponent(JSON.stringify(item)); uni.navigateTo({ - url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, - fail: (err) => { - // console.log(err) - }, - success: () => { - // console.log('err') - } + url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}` }) // if (uni.getStorageSync('user')) { // uni.navigateTo({ diff --git a/utils/request.js b/utils/request.js index 7d7fee3..ac7d778 100644 --- a/utils/request.js +++ b/utils/request.js @@ -2,27 +2,27 @@ import axios from 'axios' import utils from '@/utils/encode' // const env = process.env.NODE_ENV -const env = 'production'/* */ +const env = 'production' /* */ // const env = 'test' 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, timeout: 5000 }) -var url = '' - +var url = '' + service.interceptors.request.use( config => { // 拦截请求 uni.showLoading({ title: '加载中...' }) - const token = uni.getStorageSync('Authorization') + const token = uni.getStorageSync('Authorization') || " " const unionId = uni.getStorageSync('unionid') // console.log(unionId) const openId = uni.getStorageSync('openid') @@ -35,14 +35,17 @@ service.interceptors.request.use( config.headers['accountSources'] = accountSources config.headers['imei'] = unionId config.headers['dataSources'] = 'MP' - + console.log(config) - - if(['/oil-site/oilSiteAppInfo/findKASiteInfoByPage','/oil-site/oilSiteAppInfo/getSiteDetailsByKA','/oil-site/oilSiteAppInfo/getSitePriceKAByBelong'].includes(config.url)) { - let parentCompanyId = config.baseURL === 'https://www.xingoil.com/adminapi' ? '1812649739013771264' : '1810568376122056704' - if(config.data.params) { + + if (['/oil-site/oilSiteAppInfo/findKASiteInfoByPage', '/oil-site/oilSiteAppInfo/getSiteDetailsByKA', + '/oil-site/oilSiteAppInfo/getSitePriceKAByBelong' + ].includes(config.url)) { + let parentCompanyId = config.baseURL === 'https://www.xingoil.com/adminapi' ? '1812649739013771264' : + '1810568376122056704' + if (config.data.params) { config.data.params['parentCompanyId'] = parentCompanyId - }else config.data['parentCompanyId'] = parentCompanyId + } else config.data['parentCompanyId'] = parentCompanyId } if (env === 'production') { @@ -82,11 +85,12 @@ service.interceptors.response.use( const dataParam = JSON.parse(utils.decrypt(res.data)) res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam } - } + } uni.hideLoading() - if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){ - if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同' && res.msg != '用户未登录只可查询前两页油站信息') { + if (response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1) { + if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != + '登录与操作设备不同' && res.msg != '用户未登录只可查询前两页油站信息') { uni.showToast({ title: res.msg, icon: "none" @@ -147,4 +151,4 @@ service.defaults.adapter = function(config) { } // #endif -export default service +export default service \ No newline at end of file