caoliancun/zhongPin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/zhongPin into caolc

Browse Source
This commit is contained in:
caolc
2023-07-05 18:41:41 +08:00
parent 27694e14f4 ec08020202
commit 47600ad2b5
10 changed files with 178 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pages/tabbar/home/home.vue
View File

@@ -489,26 +489,32 @@
},
getSiteList() {
let data1 = {
let params = {
currentPage: 1,
pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象
<<<<<<< HEAD
clientBelong:'ZHONGPIN',
targetApp:'SAAS',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
=======
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
// longitude: 117.157817, // 必有字段 备注：// 当前位置经度
// latitude: 31.802472, // 必有字段 备注：// 当前位置维度
...uni.getStorageSync('location'),
...this.filterData,
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "0#" // 备注：// 油号选择 ( 0# 92# 92#)
comprehensiveSort:1
clientBelong:'ZHONGPIN',
comprehensiveSort:1,
zpDisable:'ENABLE',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
...uni.getStorageSync('location'),
...this.filterData,
}
}
if (!uni.getStorageSync('user')) {
oilSiteApi.readOnlySites(data1).then(res => {
oilSiteApi.readOnlySites(params).then(res => {
this.getCount++
if (res.code == 20000) {
// console.log(res.data.list)
@@ -543,10 +549,8 @@
}
})
} else {
console.log(data1,'dayindata111111111111')
oilSiteApi.getSiteLists(data1).then(res => {
oilSiteApi.getSiteLists(params).then(res => {
if (res.code == 20000) {
// console.log(res.data.list)
this.siteList = res.data.list
}
})
@@ -554,7 +558,8 @@
},
toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS)
// console.log(uni.getStorageSync('user'))
// return
if (uni.getStorageSync('user')) {
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,

13
pages/tabbar/station/stationList.vue
View File

@@ -387,17 +387,18 @@
siteName: this.siteName,
...uni.getStorageSync('location'),
// ...this.filterData
siteBrand: this.siteName ? '' : this.filterData
.siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
channelCode: this.siteName ? '' : this.filterData
.channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
oilProductCode: this.siteName ? '' : this.filterData
.oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#)
siteBrand: this.siteName ? '' : this.filterData.siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
channelCode: this.siteName ? '' : this.filterData.channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
oilProductCode: this.siteName ? '' : this.filterData.oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#)
provinceCode: this.filterData.provinceCode,
cityCode: this.filterData.cityCode,
areaCode: this.filterData.areaCode,
distance: this.filterData.distance,
<<<<<<< HEAD
juli:this.filterData.distance,
=======
zpDisable:'ENABLE',
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1
}