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

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-08-31 09:35:30 +08:00
parent 7028fde296
commit 20728f6e13
10 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BagStation/pages/SeparateProcess/makeOrder.vue
View File

@@ -114,7 +114,6 @@
siteId: id
}
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('这里是获取油站siteinfo 处',res)
if (res.code == 20000) {
this.siteInfo = res.data
}

21
BagStation/pages/SeparateProcess/payResult.vue
View File

@@ -190,16 +190,15 @@
this.getOrderQrCode()
},
getOrderQrCode(){
console.log('这里是获取验证码')
console.log(this.order.orderSerialNumber)
oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then( (res)=>{
console.log(res)
if(res.code == 40000){
console.log('34')
this.showQr = false
this.showtext=true
}else if(res.code == 20000){
console.log('12')
this.showQr = true
this.showtext =false
this.val =res.data.codeStr
@@ -230,7 +229,7 @@
this.tySqRes = res.data
this.tyIntervalCount++
if (res.code == 20000) {
console.log('进入')
this.tySqRes = res.data
this.tyIntervalCount++
if(res.data.otherOrderStatus == 0){
@@ -302,7 +301,7 @@
this.getOrderQrCode()
if(option.payMethod == '1' && option.status == 'success'){
if(option.status == 'success') {
console.log('这里是支付成功')
this.textstatus = '支付成功'
this.status = option.status
console.log(this.oilItem)
@@ -321,21 +320,21 @@
this.ContextAudio(this.audioUrl)
}else{
console.log('这里是支付失败')
this.textstatus = '支付失败'
this.status = option.status
}
return
}
if(option.status == 'fail'){
console.log('fail')
this.textstatus = '支付失败'
this.status = option.status
this.errMsg = option.errMsg
return
}
if (this.order.payMethod && this.order.payMethod == 2) {
console.log('这里是则一')
this.tyPayMethod = 2
this.queryOrderStatusSq()
return
@@ -343,7 +342,7 @@
},
filters: {
moneyFormath(value) {
console.log(value)
if (value != 'xxx.x') {
let number = value.toFixed(2)
return number

3
BagStation/pages/allMap/allMap.vue
View File

@@ -365,17 +365,14 @@
}
})
}
console.log('这里是siteInfo idS',this.siteInfo)
},
//接口筛选
filterRes(res){
console.log(res)
let obj = {
oilProductCode:res.oilProductCode, //油品编号 默认为空
siteChannel:res.channelCode, //油站渠道 默认为空
highSpeedMark:res.highSpeedMark //是否为高速 默认为null
}
console.log("筛选前")
let _that = this
_that.allSiteInfo.oilProductCode = res.oilProductCode
_that.allSiteInfo.siteChannel = res.channelCode

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

@@ -1004,7 +1004,6 @@
this.makerOrder()
},
beforeMake() {
console.log('这里是beforeMake')
if (this.activeChannelCode != 'TY') {
if (this.vol <= 0) {
uni.showToast({

1
BagStation/pages/makeOrder/makeOrder.vue
View File

@@ -111,7 +111,6 @@
siteId: id
}
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('这里是获取油站siteinfo 处',res)
if (res.code == 20000) {
this.siteInfo = res.data;
this.siteInfo = Object.assign(this.siteInfo,{siteId:id})

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

@@ -405,11 +405,9 @@
},
},
onHide() {
console.log('这里是hiden')
this.innerAudioContext.stop()
},
onUnload() {
console.log('这里是卸载页面')
this.innerAudioContext.stop()
},
}

4
BagStation/pages/routePlain/routePlain.vue
View File

@@ -498,7 +498,6 @@
}})
},
orignSelect(val,obj){
console.log('这里是开始点击选中的val',val,arguments)
this.origin.address = val
if(this.destination.address){
let result = this.origin.tips.filter(item=>item.key == val)
@@ -534,7 +533,6 @@
}
},
destinationSelect(val){
console.log('这里是', arguments )
this.destination.address = val
//console.log(this.destination )
//console.log('this.destination结束点回显处 ',this.destination )
@@ -609,8 +607,6 @@
}
},
gotoRoutePlain(){
console.log('%c look↓','font-size:50px;color:red')
console.log(this.origin)
//console.log('+++----++++****++++',destinationTem)
// 获取起点 终点定位
let key = '88f3d3a38da95c4dea388978a76d0b81'

33
BagStation/pages/routePlainMap/routePlainMap.vue
View File

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