|
|
|
|
@ -679,8 +679,7 @@ |
|
|
|
|
this.menuList[3].detailList = this.menuList[3].detailList.concat(channelCodes) |
|
|
|
|
this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes) |
|
|
|
|
// this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands) |
|
|
|
|
console.log('这里是旧获取菜单信息的地方', this.menuList) |
|
|
|
|
console.log('这里是新获取menus内容 渠道', c, '这里是新获取menus内容 渠道', v) |
|
|
|
|
|
|
|
|
|
uni.setStorageSync('filterData', this.menuList) |
|
|
|
|
// this.$refs.slFilter.resetMenuList(this.menuList) |
|
|
|
|
} |
|
|
|
|
@ -689,8 +688,6 @@ |
|
|
|
|
markerTap(res) { |
|
|
|
|
let that =this |
|
|
|
|
// that.scale = 16 |
|
|
|
|
console.log('这类似点击marker点', res) |
|
|
|
|
console.log('这类似点击marker点匹配', this.coverDatas) |
|
|
|
|
// let site = this.coverDatas.filter(item => item.id == res.detail.markerId); |
|
|
|
|
let site = this.coverDatas[res.detail.markerId]; |
|
|
|
|
|
|
|
|
|
@ -778,10 +775,10 @@ |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
console.log('这里是siteInfo idS', this.siteInfo) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
updateMarke(e){ |
|
|
|
|
console.log(this.points) |
|
|
|
|
|
|
|
|
|
let data = { |
|
|
|
|
juLi: e.distance?e.distance:20, //分别返回20公里,30公里以及50公里范围内油站数据 默认为20 Number |
|
|
|
|
oilProductCode: e.oilProductCode, //油品,查询条件0#、-10#、-20#、-35# 为空默认查询全部 String |
|
|
|
|
@ -964,9 +961,7 @@ |
|
|
|
|
this.covers = tmpCoverDatas |
|
|
|
|
}) |
|
|
|
|
return |
|
|
|
|
console.log("筛选后") |
|
|
|
|
console.log(this.coverDatas) |
|
|
|
|
console.log('这里是筛选后 tmpCoverDatas+++++++++++++++++++++', tmpCoverDatas) |
|
|
|
|
|
|
|
|
|
// this.$refs.navi_map.clear() |
|
|
|
|
// console.log(this.covers) |
|
|
|
|
this.covers = [] |
|
|
|
|
@ -1021,30 +1016,27 @@ |
|
|
|
|
} |
|
|
|
|
return result |
|
|
|
|
}) |
|
|
|
|
console.log("筛选过后的数据"); |
|
|
|
|
console.log(this.covers); |
|
|
|
|
|
|
|
|
|
// highSpeedMark = [] |
|
|
|
|
// this.$refs.navi_map.removeMarkers() |
|
|
|
|
// this.$refs.navi_map.addMarkers(this.covers) |
|
|
|
|
}, |
|
|
|
|
moveMap(res) { |
|
|
|
|
console.log(res) |
|
|
|
|
|
|
|
|
|
if (res.type == "end") { |
|
|
|
|
this.northeast = res.detail.region.northeast |
|
|
|
|
this.southwest = res.detail.region.southwest |
|
|
|
|
console.log('这里是this.northeast ', this.northeast) |
|
|
|
|
console.log('这里是this.southwest ', this.southwest) |
|
|
|
|
|
|
|
|
|
this.tempPoints = JSON.parse(JSON.stringify(this.points)); |
|
|
|
|
this.tempPoints = this.tempPoints.filter((item, index) => { |
|
|
|
|
return index % 35 == 0 |
|
|
|
|
}); |
|
|
|
|
// this.tempPoints.push( this.northeast ) |
|
|
|
|
// this.tempPoints.push( this.southwest ) |
|
|
|
|
console.log('+++++++++++++++++++++++', this.tempPoints) |
|
|
|
|
|
|
|
|
|
oilSiteApi.getSiteByGeoHash(this.tempPoints).then(ele => { |
|
|
|
|
this.coverDatas = ele.data; |
|
|
|
|
console.log("当前结果数据") |
|
|
|
|
console.log(this.coverDatas) |
|
|
|
|
|
|
|
|
|
this.tempPoints = JSON.parse(JSON.stringify(this.points)) |
|
|
|
|
// 包装成maker |
|
|
|
|
this.covers = ele.data.map((item, index) => { |
|
|
|
|
@ -1061,7 +1053,7 @@ |
|
|
|
|
iconPath = '../../static/img/YDJY.png'; |
|
|
|
|
} |
|
|
|
|
// item.distance= item.distance.toFixed(1); |
|
|
|
|
console.log('这里是id', item.id, typeof(item.id)) |
|
|
|
|
|
|
|
|
|
let result = { |
|
|
|
|
id: index, |
|
|
|
|
siteId: item.id, |
|
|
|
|
@ -1081,10 +1073,9 @@ |
|
|
|
|
} |
|
|
|
|
return result |
|
|
|
|
}) |
|
|
|
|
console.log('this.covers', this.covers) |
|
|
|
|
|
|
|
|
|
if (this.filterCondition != null && this.filterCondition != '') { |
|
|
|
|
console.log("过滤数据") |
|
|
|
|
console.log(this.filterCondition) |
|
|
|
|
|
|
|
|
|
// this.filterCondition.distance = 3 |
|
|
|
|
this.filterRes(this.filterCondition) |
|
|
|
|
} |
|
|
|
|
|
xiaozhiyong
2 years ago