diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index 7b76445..e420fe5 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -112,7 +112,7 @@ 加 {{itm.oilsCode}} {{itm.volume}}L 节省 ¥{{itm.discountAmount}} - + 暂无 @@ -185,11 +185,11 @@ }, onHide() { // console.log('这里是hiden') - this.innerAudioContext.stop() + this.innerAudioContext?.stop() }, onUnload() { // console.log('这里是卸载页面') - this.innerAudioContext.stop() + this.innerAudioContext?.stop() }, data() { return { @@ -214,7 +214,7 @@ } }, onHide() { - this.innerAudioContext.stop() + this.innerAudioContext?.stop() }, onLoad(option) { if(option.siteId) { @@ -223,15 +223,17 @@ return } // console.log(option) - if(option.channerCode == 'TY'){ - var oilItem = uni.getStorageSync('OtherSiteInfo') - // console.log(oilItem) - }else{ - let obj = option.item, - jss= JSON.parse(obj) - // console.log( '+++++++++',obj,jss,'----------') - var oilItem = JSON.parse(option.item) - } + // if(option.channerCode == 'TY'){ + // var oilItem = uni.getStorageSync('OtherSiteInfo') + // // console.log(oilItem) + // }else{ + // let obj = option.item, + // var oilItem = JSON.parse(option.item) + // } + let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : JSON.parse(option.item) + if(oilItem.secondChannelCode === 'SQ' && oilItem.sqSiteBelong === 'JKJY') { + oilItem.listTag = '集卡加油' + } uni.setStorageSync('oilItem',oilItem) this.getSiteInfo(oilItem.siteId) this.siteId = oilItem.siteId @@ -246,7 +248,7 @@ this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3' }else if(oilItem.listTag == '壳牌'){ this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3' - }else if(oilItem.listTag == '上汽联名卡'){ + }else if(oilItem.listTag == '上汽联名卡' || oilItem.listTag == '集卡加油'){ this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3' } this.ContextAudio(this.audioUrl) @@ -292,7 +294,7 @@ if(this.siteInfo.juli > 1000 ){ this.showtitle = true }else{ - this.innerAudioContext.stop() + this.innerAudioContext?.stop() uni.navigateTo({ url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}` }) @@ -304,7 +306,7 @@ this.secondChannelCode = sec }, siteQrPay() { - this.innerAudioContext.stop() + this.innerAudioContext?.stop() // let siteId = uni.navigateTo({ url: `/BagStation/pages/stationDetail/stieQr?siteId=${this.siteId}&activeChannelCode=${this.activeChannelCode}&secondChannelCode=${this.secondChannelCode}` @@ -349,7 +351,7 @@ }) }, gotoPay() { - this.innerAudioContext.stop() + this.innerAudioContext?.stop() uni.navigateTo({ url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}` }) @@ -375,10 +377,8 @@ }) }, goBack() { - this.innerAudioContext.stop() - uni.navigateBack({ - - }) + this.innerAudioContext?.stop() + uni.navigateBack() }, selectRadio() { this.radio === 'A' ? this.radio = '' : this.radio = 'A'