caoliancun
/
MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
中小
xiaozhiyong 9 months ago
parent abf4716820
commit d1af8b7ecb
12 changed files with 132 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      BagStation/pages/components/price-select-tab.vue
  2. 2
      BagStation/pages/makeOrder/makeOrder.vue
  3. 12
      BagStation/pages/routePlainMap/routePlainMap.vue
  4. 2
      BagStation/pages/stationDetail/stationDetail.vue
  5. 2
      BagStation/pages/stationDetail/stieQr.vue
  6. 2
      BagStation/pages/stationMap/stationMap.vue
  7. 25
      api/oil-site.js
  8. 45
      pages/tabbar/home/home.vue
  9. 2
      pages/tabbar/qrCenter/qrCenter.vue
  10. 51
      pages/tabbar/station/stationList.vue
  11. 17
      utils/request.js
  12. 30
      yarn.lock

5
BagStation/pages/components/price-select-tab.vue
Unescape View File

@ -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;

2
BagStation/pages/makeOrder/makeOrder.vue
Unescape View File

@ -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
}

12
BagStation/pages/routePlainMap/routePlainMap.vue
Unescape View File

@ -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

2
BagStation/pages/stationDetail/stationDetail.vue
Unescape View File

@ -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 {

2
BagStation/pages/stationDetail/stieQr.vue
Unescape View File

@ -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
}

2
BagStation/pages/stationMap/stationMap.vue
Unescape View File

@ -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
}

25
api/oil-site.js
Unescape View File

@ -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({

45
pages/tabbar/home/home.vue
Unescape View File

@ -169,7 +169,7 @@
</view> -->
<view class=" ">
<view class="" v-if="siteList.length>0">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
<site-item v-for="(item,index) in siteList" :key="index" :site-item="item" :first="index==0"
:listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
</site-item>
</view>
@ -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]

2
pages/tabbar/qrCenter/qrCenter.vue
Unescape View File

@ -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]

51
pages/tabbar/station/stationList.vue
Unescape View File

@ -38,7 +38,7 @@
<!-- <sl-filter reflexTitle ref="slFilter" @result="filterRes" :menuList="menuList"></sl-filter> -->
</view>
<view class="bg-white min-height-50 padding-top" v-if="siteList.length>0">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
<site-item v-for="(item,index) in siteList" :key="index" :site-item="item" :first="index==0"
:listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
</site-item>
<view class="placeholder-hidden">
@ -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) {

17
utils/request.js
Unescape View File

@ -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()

30
yarn.lock
Unescape View File

@ -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==
Write Preview
Loading…
Cancel
Save