更新

App.vue

@@ -144,6 +144,7 @@
 						}
 						 // console.log('jumpUrl',jumpUrl)
 						if (token && openid) {
+							this.getAmount()
 							// if(!white.includes(view.route) ){
 							// 	this.getAmount()
 							// }

BagStation/orderDetail/orderDetail.vue

@@ -43,7 +43,7 @@
 					</view>
 				</view>
 				<view class="cu-list menu solid-bottom">
-					<view class="cu-item arrow" @tap="toDetail(order)">
+					<view class="cu-item " :class="order.zpDisable === 'DISABLE' ? '' :'arrow'" @tap="toDetail(order)">
 						油站：
 						<text class="fr">{{order.siteName?order.siteName:''}}</text>
 					</view>
@@ -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({

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}`
 					})

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#)

pages/tabbar/station/stationList.vue

@@ -384,16 +384,14 @@
 						siteName: this.siteName,
 						...uni.getStorageSync('location'),
 						// ...this.filterData
-						siteBrand: this.siteName ? '' : this.filterData
+						siteBrand: this.siteName ? '' : this.filterData.siteBrand, //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
-							.siteBrand, //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
+						channelCode: this.siteName ? '' : this.filterData.channelCode, //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						channelCode: this.siteName ? '' : this.filterData
+						oilProductCode: this.siteName ? '' : this.filterData.oilProductCode, //   备注：// 油号选择 ( 0# 92# 92#)
-							.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
 					}
 

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' //预生产