From d1af8b7ecbfcda35ac6a0ba2439655c2fc77d09e Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 17 Jul 2024 16:20:43 +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/components/price-select-tab.vue | 5 +- BagStation/pages/makeOrder/makeOrder.vue | 2 +- .../pages/routePlainMap/routePlainMap.vue | 12 ++--- .../pages/stationDetail/stationDetail.vue | 2 +- BagStation/pages/stationDetail/stieQr.vue | 2 +- BagStation/pages/stationMap/stationMap.vue | 2 +- api/oil-site.js | 25 +++++++++ pages/tabbar/home/home.vue | 45 ++++++++-------- pages/tabbar/qrCenter/qrCenter.vue | 2 +- pages/tabbar/station/stationList.vue | 51 ++++++++++--------- utils/request.js | 17 +++++-- yarn.lock | 30 +++++++++++ 12 files changed, 132 insertions(+), 63 deletions(-) create mode 100644 yarn.lock diff --git a/BagStation/pages/components/price-select-tab.vue b/BagStation/pages/components/price-select-tab.vue index 7edcd28..5078599 100644 --- a/BagStation/pages/components/price-select-tab.vue +++ b/BagStation/pages/components/price-select-tab.vue @@ -945,7 +945,10 @@ // 获取渠道下价格等信息 getNewSitePrice(channelId) { this.oilSitePriceDetailsVo = [] - oilSiteApi.getNewSitePrice(channelId).then(res => { + oilSiteApi.getSitePriceKAByBelong({ + channelId: channelId, + clientBelong: "BAICHUAN" + }).then(res => { if (res.code == 20000) { this.plateNumbers = res.data.plateNumbers this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo; diff --git a/BagStation/pages/makeOrder/makeOrder.vue b/BagStation/pages/makeOrder/makeOrder.vue index a173881..133db43 100644 --- a/BagStation/pages/makeOrder/makeOrder.vue +++ b/BagStation/pages/makeOrder/makeOrder.vue @@ -144,7 +144,7 @@ ...location, siteId: id } - oilSiteApi.getSiteDetails(data2).then(res => { + oilSiteApi.getSiteDetailsByKA(data2).then(res => { if (res.code == 20000) { this.siteInfo = res.data } diff --git a/BagStation/pages/routePlainMap/routePlainMap.vue b/BagStation/pages/routePlainMap/routePlainMap.vue index 75e0a10..fb43a6f 100644 --- a/BagStation/pages/routePlainMap/routePlainMap.vue +++ b/BagStation/pages/routePlainMap/routePlainMap.vue @@ -497,10 +497,10 @@ }) }, markerTap(res){ - console.log('这类似点击marker点',res) - console.log('这类似点击marker点匹配',this.coverDatas) + // console.log('这类似点击marker点',res) + // console.log('这类似点击marker点匹配',this.coverDatas) let site = this.coverDatas.filter(item=>Number(item.id.substr(0,8)) == res.detail.markerId ); - console.log('*++++++++++++++++++++++++++++++*',site) + // console.log('*++++++++++++++++++++++++++++++*',site) this.siteInfo = site[0] if(this.siteInfo){ let userLocation = uni.getStorageSync('userLocation') @@ -512,10 +512,10 @@ latitude:latitude , longitude: longitude , } - console.log('点击获取obj',obj) - oilSiteApi.getSiteDetails(obj).then(res=>{ + // console.log('点击获取obj',obj) + oilSiteApi.getSiteDetailsByKA(obj).then(res=>{ if(res.code == 20000){ - console.log(res) + // console.log(res) this.oliSiteInfo = res.data this.oliSiteInfo.distance = res.data.juli /1000 this.showSiteDetail=true diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index fdc477f..4e9d520 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -285,7 +285,7 @@ clientBelong: "BAICHUAN" } if (user) { - oilSiteApi.getSiteDetails(data2).then(res => { + oilSiteApi.getSiteDetailsByKA(data2).then(res => { if (res.code == 20000) { this.siteInfo = res.data }else { diff --git a/BagStation/pages/stationDetail/stieQr.vue b/BagStation/pages/stationDetail/stieQr.vue index 5e58179..d2c3706 100644 --- a/BagStation/pages/stationDetail/stieQr.vue +++ b/BagStation/pages/stationDetail/stieQr.vue @@ -283,7 +283,7 @@ ...uni.getStorageSync('location'), siteId: this.siteId } - oilSiteApi.getSiteDetails(data2).then(res => { + oilSiteApi.getSiteDetailsByKA(data2).then(res => { if (res.code == 20000) { this.siteInfo = res.data } diff --git a/BagStation/pages/stationMap/stationMap.vue b/BagStation/pages/stationMap/stationMap.vue index ca71f1f..31d3a6b 100644 --- a/BagStation/pages/stationMap/stationMap.vue +++ b/BagStation/pages/stationMap/stationMap.vue @@ -152,7 +152,7 @@ export default { ...uni.getStorageSync('location'), siteId: id } - oilSiteApi.getSiteDetails(data2).then(res => { + oilSiteApi.getSiteDetailsByKA(data2).then(res => { if (res.code == 20000) { this.siteInfo = res.data } diff --git a/api/oil-site.js b/api/oil-site.js index 1c23b96..77b3436 100644 --- a/api/oil-site.js +++ b/api/oil-site.js @@ -38,6 +38,14 @@ export default { data: data }) }, + // 中小客户调度管理系统 + findKASiteInfoByPage(data) { + return request({ + url: `/oil-site/oilSiteAppInfo/findKASiteInfoByPage`, + method: 'post', + data: data + }) + }, getBCSitesByActivity(data) { return request({ url: `/${service_name}/${group_name}/getBCSitesByActivity`, @@ -52,6 +60,15 @@ export default { data: data }) }, + // 中小客户调度系统 + getSiteDetailsByKA(data) { + return request({ + url: `/${service_name}/${group_name}/getSiteDetailsByKA`, + method: 'post', + data: data + }) + }, + // 未登录查询油站 readOnlySites(data) { return request({ @@ -89,6 +106,14 @@ export default { method: 'get' }) }, + // 中小企业 + getSitePriceKAByBelong(data) { + return request({ + url: `/${service_name}/${group_name}/getSitePriceKAByBelong`, + method: 'post', + data:data + }) + }, //根据地址获取详细地址信息 getGeoByAddress(address) { return request({ diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 0624e98..4d859f9 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -169,7 +169,7 @@ --> - @@ -564,26 +564,27 @@ bcDisable: 'ENABLE' } } - if (!uni.getStorageSync('user')) { - oilSiteApi.readOnlySites(data1).then(res => { - this.getCount++ - if (res.code == 20000) { - this.siteList = res.data.list - } else { - if (this.getCount == 1) { - setTimeout(() => { - this.getSiteList() - }, 1000) - } - } - }) - } else { - oilSiteApi.getSiteLists(data1).then(res => { - if (res.code == 20000) { - this.siteList = res.data.list - } - }) - } + oilSiteApi.findKASiteInfoByPage(data1).then(res => { + if (res.code == 20000) { + this.siteList = res.data.list + } + }) + // if (!uni.getStorageSync('user')) { + // oilSiteApi.readOnlySites(data1).then(res => { + // this.getCount++ + // if (res.code == 20000) { + // this.siteList = res.data.list + // } else { + // if (this.getCount == 1) { + // setTimeout(() => { + // this.getSiteList() + // }, 1000) + // } + // } + // }) + // } else { + + // } }, toDetail(item) { let itemS = encodeURIComponent(JSON.stringify(item)) @@ -682,7 +683,7 @@ ...uni.getStorageSync('location'), siteId: id } - oilSiteApi.getSiteDetails(data2).then(res => { + oilSiteApi.getSiteDetailsByKA(data2).then(res => { if (res.code == 20000) { this.siteInfo = res.data if (res.data.oilSiteChannelDetailsVos.length == 1 && res.data.oilSiteChannelDetailsVos[0] diff --git a/pages/tabbar/qrCenter/qrCenter.vue b/pages/tabbar/qrCenter/qrCenter.vue index af237df..e900098 100644 --- a/pages/tabbar/qrCenter/qrCenter.vue +++ b/pages/tabbar/qrCenter/qrCenter.vue @@ -89,7 +89,7 @@ ...uni.getStorageSync('location'), siteId: id } - oilSiteApi.getSiteDetails(data2).then(res => { + oilSiteApi.getSiteDetailsByKA(data2).then(res => { if (res.code == 20000) { this.siteInfo = res.data if (res.data.oilSiteChannelDetailsVos.length == 1 && res.data.oilSiteChannelDetailsVos[0] diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index 49ff28c..d47a2d5 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -38,7 +38,7 @@ - @@ -396,31 +396,32 @@ } } - if (!uni.getStorageSync('Authorization')) { - oilSiteApi.readOnlySites(data1).then(res => { - if (res.code == 20000) { - this.siteList = this.siteList.concat(res.data.list) - if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 - this.loadStatus = 'nomore' - } else { - this.currentPage++ - this.loadStatus = 'load' - } - } - }) - } else { - oilSiteApi.getSiteLists(data1).then(res => { - if (res.code == 20000) { - this.siteList = this.siteList.concat(res.data.list) - if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 - this.loadStatus = 'nomore' - } else { - this.currentPage++ - this.loadStatus = 'load' - } + oilSiteApi.findKASiteInfoByPage(data1).then(res => { + if (res.code == 20000) { + this.siteList = this.siteList.concat(res.data.list) + if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 + this.loadStatus = 'nomore' + } else { + this.currentPage++ + this.loadStatus = 'load' } - }) - } + } + }) + // if (!uni.getStorageSync('Authorization')) { + // oilSiteApi.readOnlySites(data1).then(res => { + // if (res.code == 20000) { + // this.siteList = this.siteList.concat(res.data.list) + // if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 + // this.loadStatus = 'nomore' + // } else { + // this.currentPage++ + // this.loadStatus = 'load' + // } + // } + // }) + // } else { + + // } }, toDetail(item) { diff --git a/utils/request.js b/utils/request.js index 21a1888..7d7fee3 100644 --- a/utils/request.js +++ b/utils/request.js @@ -4,11 +4,11 @@ import utils from '@/utils/encode' // const env = process.env.NODE_ENV const env = 'production'/* */ // const env = 'test' -const testUrl = 'http://192.168.0.254:38080' +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, @@ -24,7 +24,7 @@ service.interceptors.request.use( }) const token = uni.getStorageSync('Authorization') const unionId = uni.getStorageSync('unionid') - console.log(unionId) + // console.log(unionId) const openId = uni.getStorageSync('openid') // const accountSources = 'WE_CHAT_PROGRAM' const accountSources = 'LOGIN_MP_WECHAT' @@ -35,6 +35,15 @@ 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) { + config.data.params['parentCompanyId'] = parentCompanyId + }else config.data['parentCompanyId'] = parentCompanyId + } if (env === 'production') { const JSESSIONID = utils.uuid() diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..bb8f475 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,30 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +axios@^0.21.3: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + +crypto-js@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== + +follow-redirects@^1.14.0: + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + +js-cookie@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" + integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== + +js-md5@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2" + integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==