更新
This commit is contained in:
@@ -146,11 +146,10 @@
|
|||||||
success: (loginRes) => {
|
success: (loginRes) => {
|
||||||
const code = loginRes.code
|
const code = loginRes.code
|
||||||
this.onceCode = code
|
this.onceCode = code
|
||||||
console.log('这里是code')
|
|
||||||
console.log(this.onceCode)
|
|
||||||
oilIdentityApi.sendCode(this.onceCode).then(res => {
|
oilIdentityApi.sendCode(this.onceCode).then(res => {
|
||||||
if (res.code === 20000) {
|
if (res.code === 20000) {
|
||||||
console.log('这里是sendCode',res)
|
|
||||||
this.sessionKey = res.data.sessionKey
|
this.sessionKey = res.data.sessionKey
|
||||||
uni.setStorageSync('openid', res.data.openId)
|
uni.setStorageSync('openid', res.data.openId)
|
||||||
uni.setStorageSync('unionid', res.data.unionId)
|
uni.setStorageSync('unionid', res.data.unionId)
|
||||||
@@ -223,7 +222,7 @@
|
|||||||
},
|
},
|
||||||
autoLogin() {
|
autoLogin() {
|
||||||
let url = 'loginCompany'
|
let url = 'loginCompany'
|
||||||
console.log('这里是自动登录')
|
|
||||||
// let url = 'loginPersonal'
|
// let url = 'loginPersonal'
|
||||||
oilIdentityApi.autoLogin({
|
oilIdentityApi.autoLogin({
|
||||||
unionId: uni.getStorageSync('unionid')
|
unionId: uni.getStorageSync('unionid')
|
||||||
@@ -274,7 +273,7 @@
|
|||||||
this.TabCur = e;
|
this.TabCur = e;
|
||||||
},
|
},
|
||||||
OtherloginSuccess(res){
|
OtherloginSuccess(res){
|
||||||
console.log('这里是OtherloginSuccess',res)
|
|
||||||
let resData = res.data
|
let resData = res.data
|
||||||
if (resData.authTokenDTO.loginFlag) {
|
if (resData.authTokenDTO.loginFlag) {
|
||||||
uni.setStorageSync('Authorization', resData.authTokenDTO.accessToken)
|
uni.setStorageSync('Authorization', resData.authTokenDTO.accessToken)
|
||||||
|
|||||||
@@ -114,7 +114,6 @@
|
|||||||
siteId: id
|
siteId: id
|
||||||
}
|
}
|
||||||
oilSiteApi.getSiteDetails(data2).then(res => {
|
oilSiteApi.getSiteDetails(data2).then(res => {
|
||||||
console.log('这里是获取油站siteinfo 处',res)
|
|
||||||
if (res.code == 20000) {
|
if (res.code == 20000) {
|
||||||
this.siteInfo = res.data
|
this.siteInfo = res.data
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -190,16 +190,15 @@
|
|||||||
this.getOrderQrCode()
|
this.getOrderQrCode()
|
||||||
},
|
},
|
||||||
getOrderQrCode(){
|
getOrderQrCode(){
|
||||||
console.log('这里是获取验证码')
|
|
||||||
console.log(this.order.orderSerialNumber)
|
|
||||||
oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then( (res)=>{
|
oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then( (res)=>{
|
||||||
console.log(res)
|
|
||||||
if(res.code == 40000){
|
if(res.code == 40000){
|
||||||
console.log('34')
|
|
||||||
this.showQr = false
|
this.showQr = false
|
||||||
this.showtext=true
|
this.showtext=true
|
||||||
}else if(res.code == 20000){
|
}else if(res.code == 20000){
|
||||||
console.log('12')
|
|
||||||
this.showQr = true
|
this.showQr = true
|
||||||
this.showtext =false
|
this.showtext =false
|
||||||
this.val =res.data.codeStr
|
this.val =res.data.codeStr
|
||||||
@@ -230,7 +229,7 @@
|
|||||||
this.tySqRes = res.data
|
this.tySqRes = res.data
|
||||||
this.tyIntervalCount++
|
this.tyIntervalCount++
|
||||||
if (res.code == 20000) {
|
if (res.code == 20000) {
|
||||||
console.log('进入')
|
|
||||||
this.tySqRes = res.data
|
this.tySqRes = res.data
|
||||||
this.tyIntervalCount++
|
this.tyIntervalCount++
|
||||||
if(res.data.otherOrderStatus == 0){
|
if(res.data.otherOrderStatus == 0){
|
||||||
@@ -302,7 +301,7 @@
|
|||||||
this.getOrderQrCode()
|
this.getOrderQrCode()
|
||||||
if(option.payMethod == '1' && option.status == 'success'){
|
if(option.payMethod == '1' && option.status == 'success'){
|
||||||
if(option.status == 'success') {
|
if(option.status == 'success') {
|
||||||
console.log('这里是支付成功')
|
|
||||||
this.textstatus = '支付成功'
|
this.textstatus = '支付成功'
|
||||||
this.status = option.status
|
this.status = option.status
|
||||||
console.log(this.oilItem)
|
console.log(this.oilItem)
|
||||||
@@ -321,21 +320,21 @@
|
|||||||
|
|
||||||
this.ContextAudio(this.audioUrl)
|
this.ContextAudio(this.audioUrl)
|
||||||
}else{
|
}else{
|
||||||
console.log('这里是支付失败')
|
|
||||||
this.textstatus = '支付失败'
|
this.textstatus = '支付失败'
|
||||||
this.status = option.status
|
this.status = option.status
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(option.status == 'fail'){
|
if(option.status == 'fail'){
|
||||||
console.log('fail')
|
|
||||||
this.textstatus = '支付失败'
|
this.textstatus = '支付失败'
|
||||||
this.status = option.status
|
this.status = option.status
|
||||||
this.errMsg = option.errMsg
|
this.errMsg = option.errMsg
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (this.order.payMethod && this.order.payMethod == 2) {
|
if (this.order.payMethod && this.order.payMethod == 2) {
|
||||||
console.log('这里是则一')
|
|
||||||
this.tyPayMethod = 2
|
this.tyPayMethod = 2
|
||||||
this.queryOrderStatusSq()
|
this.queryOrderStatusSq()
|
||||||
return
|
return
|
||||||
@@ -343,7 +342,7 @@
|
|||||||
},
|
},
|
||||||
filters: {
|
filters: {
|
||||||
moneyFormath(value) {
|
moneyFormath(value) {
|
||||||
console.log(value)
|
|
||||||
if (value != 'xxx.x') {
|
if (value != 'xxx.x') {
|
||||||
let number = value.toFixed(2)
|
let number = value.toFixed(2)
|
||||||
return number
|
return number
|
||||||
|
|||||||
@@ -365,17 +365,14 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
console.log('这里是siteInfo idS',this.siteInfo)
|
|
||||||
},
|
},
|
||||||
//接口筛选
|
//接口筛选
|
||||||
filterRes(res){
|
filterRes(res){
|
||||||
console.log(res)
|
|
||||||
let obj = {
|
let obj = {
|
||||||
oilProductCode:res.oilProductCode, //油品编号 默认为空
|
oilProductCode:res.oilProductCode, //油品编号 默认为空
|
||||||
siteChannel:res.channelCode, //油站渠道 默认为空
|
siteChannel:res.channelCode, //油站渠道 默认为空
|
||||||
highSpeedMark:res.highSpeedMark //是否为高速 默认为null
|
highSpeedMark:res.highSpeedMark //是否为高速 默认为null
|
||||||
}
|
}
|
||||||
console.log("筛选前")
|
|
||||||
let _that = this
|
let _that = this
|
||||||
_that.allSiteInfo.oilProductCode = res.oilProductCode
|
_that.allSiteInfo.oilProductCode = res.oilProductCode
|
||||||
_that.allSiteInfo.siteChannel = res.channelCode
|
_that.allSiteInfo.siteChannel = res.channelCode
|
||||||
|
|||||||
@@ -1004,7 +1004,6 @@
|
|||||||
this.makerOrder()
|
this.makerOrder()
|
||||||
},
|
},
|
||||||
beforeMake() {
|
beforeMake() {
|
||||||
console.log('这里是beforeMake')
|
|
||||||
if (this.activeChannelCode != 'TY') {
|
if (this.activeChannelCode != 'TY') {
|
||||||
if (this.vol <= 0) {
|
if (this.vol <= 0) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|||||||
@@ -111,7 +111,6 @@
|
|||||||
siteId: id
|
siteId: id
|
||||||
}
|
}
|
||||||
oilSiteApi.getSiteDetails(data2).then(res => {
|
oilSiteApi.getSiteDetails(data2).then(res => {
|
||||||
console.log('这里是获取油站siteinfo 处',res)
|
|
||||||
if (res.code == 20000) {
|
if (res.code == 20000) {
|
||||||
this.siteInfo = res.data;
|
this.siteInfo = res.data;
|
||||||
this.siteInfo = Object.assign(this.siteInfo,{siteId:id})
|
this.siteInfo = Object.assign(this.siteInfo,{siteId:id})
|
||||||
|
|||||||
@@ -405,11 +405,9 @@
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
onHide() {
|
onHide() {
|
||||||
console.log('这里是hiden')
|
|
||||||
this.innerAudioContext.stop()
|
this.innerAudioContext.stop()
|
||||||
},
|
},
|
||||||
onUnload() {
|
onUnload() {
|
||||||
console.log('这里是卸载页面')
|
|
||||||
this.innerAudioContext.stop()
|
this.innerAudioContext.stop()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -498,7 +498,6 @@
|
|||||||
}})
|
}})
|
||||||
},
|
},
|
||||||
orignSelect(val,obj){
|
orignSelect(val,obj){
|
||||||
console.log('这里是开始点击选中的val',val,arguments)
|
|
||||||
this.origin.address = val
|
this.origin.address = val
|
||||||
if(this.destination.address){
|
if(this.destination.address){
|
||||||
let result = this.origin.tips.filter(item=>item.key == val)
|
let result = this.origin.tips.filter(item=>item.key == val)
|
||||||
@@ -534,7 +533,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
destinationSelect(val){
|
destinationSelect(val){
|
||||||
console.log('这里是', arguments )
|
|
||||||
this.destination.address = val
|
this.destination.address = val
|
||||||
//console.log(this.destination )
|
//console.log(this.destination )
|
||||||
//console.log('this.destination结束点回显处 ',this.destination )
|
//console.log('this.destination结束点回显处 ',this.destination )
|
||||||
@@ -609,8 +607,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
gotoRoutePlain(){
|
gotoRoutePlain(){
|
||||||
console.log('%c look↓','font-size:50px;color:red')
|
|
||||||
console.log(this.origin)
|
|
||||||
//console.log('+++----++++****++++',destinationTem)
|
//console.log('+++----++++****++++',destinationTem)
|
||||||
// 获取起点 终点定位
|
// 获取起点 终点定位
|
||||||
let key = '88f3d3a38da95c4dea388978a76d0b81'
|
let key = '88f3d3a38da95c4dea388978a76d0b81'
|
||||||
|
|||||||
@@ -679,8 +679,7 @@
|
|||||||
this.menuList[3].detailList = this.menuList[3].detailList.concat(channelCodes)
|
this.menuList[3].detailList = this.menuList[3].detailList.concat(channelCodes)
|
||||||
this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes)
|
this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes)
|
||||||
// this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands)
|
// 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)
|
uni.setStorageSync('filterData', this.menuList)
|
||||||
// this.$refs.slFilter.resetMenuList(this.menuList)
|
// this.$refs.slFilter.resetMenuList(this.menuList)
|
||||||
}
|
}
|
||||||
@@ -689,8 +688,6 @@
|
|||||||
markerTap(res) {
|
markerTap(res) {
|
||||||
let that =this
|
let that =this
|
||||||
// that.scale = 16
|
// 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.filter(item => item.id == res.detail.markerId);
|
||||||
let site = this.coverDatas[res.detail.markerId];
|
let site = this.coverDatas[res.detail.markerId];
|
||||||
|
|
||||||
@@ -778,10 +775,10 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
console.log('这里是siteInfo idS', this.siteInfo)
|
|
||||||
},
|
},
|
||||||
updateMarke(e){
|
updateMarke(e){
|
||||||
console.log(this.points)
|
|
||||||
let data = {
|
let data = {
|
||||||
juLi: e.distance?e.distance:20, //分别返回20公里,30公里以及50公里范围内油站数据 默认为20 Number
|
juLi: e.distance?e.distance:20, //分别返回20公里,30公里以及50公里范围内油站数据 默认为20 Number
|
||||||
oilProductCode: e.oilProductCode, //油品,查询条件0#、-10#、-20#、-35# 为空默认查询全部 String
|
oilProductCode: e.oilProductCode, //油品,查询条件0#、-10#、-20#、-35# 为空默认查询全部 String
|
||||||
@@ -964,9 +961,7 @@
|
|||||||
this.covers = tmpCoverDatas
|
this.covers = tmpCoverDatas
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
console.log("筛选后")
|
|
||||||
console.log(this.coverDatas)
|
|
||||||
console.log('这里是筛选后 tmpCoverDatas+++++++++++++++++++++', tmpCoverDatas)
|
|
||||||
// this.$refs.navi_map.clear()
|
// this.$refs.navi_map.clear()
|
||||||
// console.log(this.covers)
|
// console.log(this.covers)
|
||||||
this.covers = []
|
this.covers = []
|
||||||
@@ -1021,30 +1016,27 @@
|
|||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
})
|
})
|
||||||
console.log("筛选过后的数据");
|
|
||||||
console.log(this.covers);
|
|
||||||
// highSpeedMark = []
|
// highSpeedMark = []
|
||||||
// this.$refs.navi_map.removeMarkers()
|
// this.$refs.navi_map.removeMarkers()
|
||||||
// this.$refs.navi_map.addMarkers(this.covers)
|
// this.$refs.navi_map.addMarkers(this.covers)
|
||||||
},
|
},
|
||||||
moveMap(res) {
|
moveMap(res) {
|
||||||
console.log(res)
|
|
||||||
if (res.type == "end") {
|
if (res.type == "end") {
|
||||||
this.northeast = res.detail.region.northeast
|
this.northeast = res.detail.region.northeast
|
||||||
this.southwest = res.detail.region.southwest
|
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 = JSON.parse(JSON.stringify(this.points));
|
||||||
this.tempPoints = this.tempPoints.filter((item, index) => {
|
this.tempPoints = this.tempPoints.filter((item, index) => {
|
||||||
return index % 35 == 0
|
return index % 35 == 0
|
||||||
});
|
});
|
||||||
// this.tempPoints.push( this.northeast )
|
// this.tempPoints.push( this.northeast )
|
||||||
// this.tempPoints.push( this.southwest )
|
// this.tempPoints.push( this.southwest )
|
||||||
console.log('+++++++++++++++++++++++', this.tempPoints)
|
|
||||||
oilSiteApi.getSiteByGeoHash(this.tempPoints).then(ele => {
|
oilSiteApi.getSiteByGeoHash(this.tempPoints).then(ele => {
|
||||||
this.coverDatas = ele.data;
|
this.coverDatas = ele.data;
|
||||||
console.log("当前结果数据")
|
|
||||||
console.log(this.coverDatas)
|
|
||||||
this.tempPoints = JSON.parse(JSON.stringify(this.points))
|
this.tempPoints = JSON.parse(JSON.stringify(this.points))
|
||||||
// 包装成maker
|
// 包装成maker
|
||||||
this.covers = ele.data.map((item, index) => {
|
this.covers = ele.data.map((item, index) => {
|
||||||
@@ -1061,7 +1053,7 @@
|
|||||||
iconPath = '../../static/img/YDJY.png';
|
iconPath = '../../static/img/YDJY.png';
|
||||||
}
|
}
|
||||||
// item.distance= item.distance.toFixed(1);
|
// item.distance= item.distance.toFixed(1);
|
||||||
console.log('这里是id', item.id, typeof(item.id))
|
|
||||||
let result = {
|
let result = {
|
||||||
id: index,
|
id: index,
|
||||||
siteId: item.id,
|
siteId: item.id,
|
||||||
@@ -1081,10 +1073,9 @@
|
|||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
})
|
})
|
||||||
console.log('this.covers', this.covers)
|
|
||||||
if (this.filterCondition != null && this.filterCondition != '') {
|
if (this.filterCondition != null && this.filterCondition != '') {
|
||||||
console.log("过滤数据")
|
|
||||||
console.log(this.filterCondition)
|
|
||||||
// this.filterCondition.distance = 3
|
// this.filterCondition.distance = 3
|
||||||
this.filterRes(this.filterCondition)
|
this.filterRes(this.filterCondition)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -188,7 +188,6 @@ export default {
|
|||||||
this.showSelector = !this.showSelector;
|
this.showSelector = !this.showSelector;
|
||||||
},
|
},
|
||||||
clearSelector() {
|
clearSelector() {
|
||||||
console.log('这里是组件里清除')
|
|
||||||
this.selectItem = { key: '', value: '' };
|
this.selectItem = { key: '', value: '' };
|
||||||
this.inputVal = '';
|
this.inputVal = '';
|
||||||
this.showSelector = false;
|
this.showSelector = false;
|
||||||
@@ -196,7 +195,6 @@ export default {
|
|||||||
this.$emit('clear');
|
this.$emit('clear');
|
||||||
},
|
},
|
||||||
onFocus() {
|
onFocus() {
|
||||||
console.log('这里是是input foucus')
|
|
||||||
if (this.inputVal) {
|
if (this.inputVal) {
|
||||||
this.showSelector = false;
|
this.showSelector = false;
|
||||||
// this.inputVal = '';
|
// this.inputVal = '';
|
||||||
@@ -204,29 +202,29 @@ export default {
|
|||||||
},
|
},
|
||||||
// 组件input失焦
|
// 组件input失焦
|
||||||
onBlur() {
|
onBlur() {
|
||||||
console.log('这里是input失焦')
|
|
||||||
// this.showSelector = !this.showSelector;
|
// this.showSelector = !this.showSelector;
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.selectItem.value) {
|
if (this.selectItem.value) {
|
||||||
console.log('这里是this.selectItem.value',this.selectItem.value)
|
|
||||||
const selectItem = JSON.parse(JSON.stringify(this.selectItem));
|
const selectItem = JSON.parse(JSON.stringify(this.selectItem));
|
||||||
this.inputVal = selectItem.value;
|
this.inputVal = selectItem.value;
|
||||||
} else {
|
} else {
|
||||||
console.log('123')
|
|
||||||
this.inputVal = '';
|
this.inputVal = '';
|
||||||
}
|
}
|
||||||
// this.showSelector = false;
|
// this.showSelector = false;
|
||||||
}, 50);
|
}, 50);
|
||||||
},
|
},
|
||||||
onSelectorClick(item) {
|
onSelectorClick(item) {
|
||||||
console.log('这类似组件内',item)
|
|
||||||
this.selectItem = item;
|
this.selectItem = item;
|
||||||
this.inputVal = item.value;
|
this.inputVal = item.value;
|
||||||
this.showSelector = false;
|
this.showSelector = false;
|
||||||
this.$emit('select', item.key, item);
|
this.$emit('select', item.key, item);
|
||||||
},
|
},
|
||||||
onInput() {
|
onInput() {
|
||||||
console.log('这类似inputchange',this.inputVal)
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.inputVal && this.inputVal!=='') {
|
if (this.inputVal && this.inputVal!=='') {
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user