From cb276d7befc2645bc22fe4231ee133f1c8a40445 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 22 Mar 2023 17:25:40 +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 --- App.vue | 1 + BagStation/orderDetail/orderDetail.vue | 4 +++- BagStation/pages/stationDetail/stationDetail.vue | 10 +++++----- components/three-sites.vue | 1 + pages/tabbar/station/stationList.vue | 10 ++++------ utils/request.js | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/App.vue b/App.vue index 32a1711..1393cf9 100644 --- a/App.vue +++ b/App.vue @@ -144,6 +144,7 @@ } // console.log('jumpUrl',jumpUrl) if (token && openid) { + this.getAmount() // if(!white.includes(view.route) ){ // this.getAmount() // } diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue index a34a303..0e1b371 100644 --- a/BagStation/orderDetail/orderDetail.vue +++ b/BagStation/orderDetail/orderDetail.vue @@ -43,7 +43,7 @@ - + 油站： {{order.siteName?order.siteName:''}} @@ -312,6 +312,7 @@ }) }, toDetail(item) { + if(item.zpDisable === 'DISABLE') return var itemS = JSON.stringify(item) uni.setStorageSync('siteInfo',itemS) uni.navigateTo({ @@ -325,6 +326,7 @@ }) }, cancelOrder() { + orderApi.cancelOrder(this.id).then(res => { if (res.code == 20000) { uni.showToast({ diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index 7aa57b8..8231a16 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -201,7 +201,7 @@ let originLink = decodeURIComponent(option.q) let target = this.obtainUrlPathParameterTarget(originLink) console.log('target',target) - if(userInfo && target.siteId) { + if(target.siteId) { this.siteId = target.siteId this.getSiteInfo(target.siteId) } @@ -254,7 +254,7 @@ }); }, backTohome(){ - innerAudioContext && this.innerAudioContext.stop() + this.innerAudioContext && this.innerAudioContext.stop() uni.switchTab({ url:'../../../pages/tabbar/home/home' }) @@ -263,7 +263,7 @@ this.showtitle =false }, gotoPay(){ - innerAudioContext && this.innerAudioContext.stop() + this.innerAudioContext && this.innerAudioContext.stop() uni.navigateTo({ url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}` }) @@ -273,7 +273,7 @@ this.secondChannelCode = sec }, siteQrPay() { - innerAudioContext && this.innerAudioContext.stop() + this.innerAudioContext && this.innerAudioContext.stop() uni.navigateTo({ url: `/BagStation/pages/stationDetail/stieQr?siteId=${this.siteId}&activeChannelCode=${this.activeChannelCode}&secondChannelCode=${this.secondChannelCode}` }) @@ -294,7 +294,7 @@ if(this.siteInfo.juli > 1000 ){ this.showtitle = true }else{ - innerAudioContext && this.innerAudioContext.stop() + this.innerAudioContext && this.innerAudioContext.stop() uni.navigateTo({ url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}` }) diff --git a/components/three-sites.vue b/components/three-sites.vue index f5e9fbf..56eda33 100644 --- a/components/three-sites.vue +++ b/components/three-sites.vue @@ -78,6 +78,7 @@ ...uni.getStorageSync('location'), ...this.filterData, comprehensiveSort:1, + zpDisable:'ENABLE', // siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 ) // channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) // oilProductCode: "" // 备注：// 油号选择 ( 0# 92# 92#) diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index 650649b..e92ac3c 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -384,16 +384,14 @@ siteName: this.siteName, ...uni.getStorageSync('location'), // ...this.filterData - siteBrand: this.siteName ? '' : this.filterData - .siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 ) - channelCode: this.siteName ? '' : this.filterData - .channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) - oilProductCode: this.siteName ? '' : this.filterData - .oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#) + siteBrand: this.siteName ? '' : this.filterData.siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 ) + channelCode: this.siteName ? '' : this.filterData.channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) + oilProductCode: this.siteName ? '' : this.filterData.oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#) provinceCode: this.filterData.provinceCode, cityCode: this.filterData.cityCode, areaCode: this.filterData.areaCode, distance: this.filterData.distance, + zpDisable:'ENABLE', comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1 } diff --git a/utils/request.js b/utils/request.js index e858b0a..3aa35eb 100644 --- a/utils/request.js +++ b/utils/request.js @@ -3,7 +3,7 @@ import utils from '@/utils/encode' // const env = process.env.NODE_ENV // const env = 'production'/* */ -const env = 'product' +const env = 'production' const testUrl = 'http://192.168.110.230:38080' // const productUrl = 'http://121.196.213.68/adminapi' //预生产