diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue index 8cdddc4..806baed 100644 --- a/BagStation/orderDetail/orderDetail.vue +++ b/BagStation/orderDetail/orderDetail.vue @@ -14,7 +14,7 @@ @@ -164,6 +164,7 @@ export default { data() { return { + foreground:'#000', showQr:false, val:'', id: '', @@ -213,7 +214,8 @@ this.showQr = false }else if(res.code == 20000){ this.showQr = true - this.val =res.data.codeStr + this.val =res.data.codeStr; + this.foreground = this.val.indexOf('SHLFC/V1')==-1?'#000':'#1A487E'; } } ) }, diff --git a/BagStation/pages/makeOrder/payResult.vue b/BagStation/pages/makeOrder/payResult.vue index 4d48af5..bda47c9 100644 --- a/BagStation/pages/makeOrder/payResult.vue +++ b/BagStation/pages/makeOrder/payResult.vue @@ -21,7 +21,7 @@ @@ -144,6 +144,7 @@ data() { const now = new Date() return { + foreground:'#000', oilItem:{}, status:"", showtitles:"", @@ -203,6 +204,8 @@ this.showQr = true this.showtext =false this.val =res.data.codeStr + this.foreground = this.val.indexOf('SHLFC/V1')==-1?'#000':'#1A487E'; + console.log(this.foreground,'foreground') } } ) }, @@ -310,7 +313,6 @@ let _that = this if(oilItems.listTag == '万金油'){ _that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3' - }else if(oilItems.listTag == '星油'){ _that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3' }else if(oilItems.listTag == '壳牌'){ @@ -318,7 +320,6 @@ }else if(oilItems.listTag == '上汽联名卡'){ _that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3' } - this.ContextAudio(this.audioUrl) }else{ console.log('这里是支付失败') diff --git a/components/sl-filter/filter-view.vue b/components/sl-filter/filter-view.vue index d611d32..1b1699c 100644 --- a/components/sl-filter/filter-view.vue +++ b/components/sl-filter/filter-view.vue @@ -475,13 +475,13 @@ }, resetSelected(list, key) { console.log('%c 重置方法第二步resetSelected函数参数↓','color:green;font-size:30px') - console.log(list, key) if (typeof this.result[key] == 'object') { this.result[key] = []; this.selectedTitleObj[key] = list[0].title; } else { this.result[key] = ''; this.selectedTitleObj[key] = list[0].title; + console.log(this.result,'重置之后的数据') } for (let i = 0; i < list.length; i++) { if (i == 0) { @@ -540,7 +540,7 @@ obj.result.provinceCode = this.provinceCode obj.result.cityCode = this.cityCode obj.result.areaCode = this.areaCode - obj.result.distance = this.detailItems + // obj.result.distance = this.detailItems console.log(obj,'look me!') // console.log(this.seleIdex.split('/'),this.productCodeList[this.seleIdex.split('/')[1]][this.seleIdex.split('/')[0]],this.seleIdex.split('/')[2],'dddddddddddddddddd') if(this.seleIdex!==null&&this.seleIdex.split('/')[2]==2){ diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index 039d0e9..fbbdb5d 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -1,9 +1,9 @@