From 20728f6e13b860b82397dd254264ab6d3e981a58 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 31 Aug 2023 09:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BagAuth/pages/login/login.vue | 9 +++-- .../pages/SeparateProcess/makeOrder.vue | 1 - .../pages/SeparateProcess/payResult.vue | 21 ++++++------ BagStation/pages/allMap/allMap.vue | 3 -- .../pages/components/price-select-tab.vue | 1 - BagStation/pages/makeOrder/makeOrder.vue | 1 - BagStation/pages/makeOrder/payResult.vue | 2 -- BagStation/pages/routePlain/routePlain.vue | 4 --- .../pages/routePlainMap/routePlainMap.vue | 33 +++++++------------ .../taogewan-combox-remote.vue | 12 +++---- 10 files changed, 31 insertions(+), 56 deletions(-) diff --git a/BagAuth/pages/login/login.vue b/BagAuth/pages/login/login.vue index bcf4318..3f64bd1 100644 --- a/BagAuth/pages/login/login.vue +++ b/BagAuth/pages/login/login.vue @@ -146,11 +146,10 @@ success: (loginRes) => { const code = loginRes.code this.onceCode = code - console.log('这里是code') - console.log(this.onceCode) + oilIdentityApi.sendCode(this.onceCode).then(res => { if (res.code === 20000) { - console.log('这里是sendCode',res) + this.sessionKey = res.data.sessionKey uni.setStorageSync('openid', res.data.openId) uni.setStorageSync('unionid', res.data.unionId) @@ -223,7 +222,7 @@ }, autoLogin() { let url = 'loginCompany' - console.log('这里是自动登录') + // let url = 'loginPersonal' oilIdentityApi.autoLogin({ unionId: uni.getStorageSync('unionid') @@ -274,7 +273,7 @@ this.TabCur = e; }, OtherloginSuccess(res){ - console.log('这里是OtherloginSuccess',res) + let resData = res.data if (resData.authTokenDTO.loginFlag) { uni.setStorageSync('Authorization', resData.authTokenDTO.accessToken) diff --git a/BagStation/pages/SeparateProcess/makeOrder.vue b/BagStation/pages/SeparateProcess/makeOrder.vue index b97333c..2e4edb7 100644 --- a/BagStation/pages/SeparateProcess/makeOrder.vue +++ b/BagStation/pages/SeparateProcess/makeOrder.vue @@ -114,7 +114,6 @@ siteId: id } oilSiteApi.getSiteDetails(data2).then(res => { - console.log('这里是获取油站siteinfo 处',res) if (res.code == 20000) { this.siteInfo = res.data } diff --git a/BagStation/pages/SeparateProcess/payResult.vue b/BagStation/pages/SeparateProcess/payResult.vue index 9dc11f3..adbe6f2 100644 --- a/BagStation/pages/SeparateProcess/payResult.vue +++ b/BagStation/pages/SeparateProcess/payResult.vue @@ -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 diff --git a/BagStation/pages/allMap/allMap.vue b/BagStation/pages/allMap/allMap.vue index 239e3fe..2d88a9d 100644 --- a/BagStation/pages/allMap/allMap.vue +++ b/BagStation/pages/allMap/allMap.vue @@ -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 diff --git a/BagStation/pages/components/price-select-tab.vue b/BagStation/pages/components/price-select-tab.vue index 44f8592..5ee9568 100644 --- a/BagStation/pages/components/price-select-tab.vue +++ b/BagStation/pages/components/price-select-tab.vue @@ -1004,7 +1004,6 @@ this.makerOrder() }, beforeMake() { - console.log('这里是beforeMake') if (this.activeChannelCode != 'TY') { if (this.vol <= 0) { uni.showToast({ diff --git a/BagStation/pages/makeOrder/makeOrder.vue b/BagStation/pages/makeOrder/makeOrder.vue index fe1b9f9..744dff4 100644 --- a/BagStation/pages/makeOrder/makeOrder.vue +++ b/BagStation/pages/makeOrder/makeOrder.vue @@ -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}) diff --git a/BagStation/pages/makeOrder/payResult.vue b/BagStation/pages/makeOrder/payResult.vue index 2f28362..17b29f2 100644 --- a/BagStation/pages/makeOrder/payResult.vue +++ b/BagStation/pages/makeOrder/payResult.vue @@ -405,11 +405,9 @@ }, }, onHide() { - console.log('这里是hiden') this.innerAudioContext.stop() }, onUnload() { - console.log('这里是卸载页面') this.innerAudioContext.stop() }, } diff --git a/BagStation/pages/routePlain/routePlain.vue b/BagStation/pages/routePlain/routePlain.vue index 7b5d0dd..1e64026 100644 --- a/BagStation/pages/routePlain/routePlain.vue +++ b/BagStation/pages/routePlain/routePlain.vue @@ -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' diff --git a/BagStation/pages/routePlainMap/routePlainMap.vue b/BagStation/pages/routePlainMap/routePlainMap.vue index cc0db13..386abfc 100644 --- a/BagStation/pages/routePlainMap/routePlainMap.vue +++ b/BagStation/pages/routePlainMap/routePlainMap.vue @@ -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) } diff --git a/components/taogewan-combox-remote/taogewan-combox-remote.vue b/components/taogewan-combox-remote/taogewan-combox-remote.vue index 6d76d55..2fc81f8 100644 --- a/components/taogewan-combox-remote/taogewan-combox-remote.vue +++ b/components/taogewan-combox-remote/taogewan-combox-remote.vue @@ -188,7 +188,6 @@ export default { this.showSelector = !this.showSelector; }, clearSelector() { - console.log('这里是组件里清除') this.selectItem = { key: '', value: '' }; this.inputVal = ''; this.showSelector = false; @@ -196,7 +195,6 @@ export default { this.$emit('clear'); }, onFocus() { - console.log('这里是是input foucus') if (this.inputVal) { this.showSelector = false; // this.inputVal = ''; @@ -204,29 +202,29 @@ export default { }, // 组件input失焦 onBlur() { - console.log('这里是input失焦') + // this.showSelector = !this.showSelector; setTimeout(() => { if (this.selectItem.value) { - console.log('这里是this.selectItem.value',this.selectItem.value) + const selectItem = JSON.parse(JSON.stringify(this.selectItem)); this.inputVal = selectItem.value; } else { - console.log('123') + this.inputVal = ''; } // this.showSelector = false; }, 50); }, onSelectorClick(item) { - console.log('这类似组件内',item) + this.selectItem = item; this.inputVal = item.value; this.showSelector = false; this.$emit('select', item.key, item); }, onInput() { - console.log('这类似inputchange',this.inputVal) + setTimeout(() => { if (this.inputVal && this.inputVal!=='') { this.isLoading = true;