更新

BagStation/orderDetail/orderDetail.vue

@@ -233,7 +233,7 @@
 			getOrderInfo() {
 				orderApi.selOrder(this.id).then(res => {
 					if (res.code == 20000) {
-						uni.setStorageSync('oilItem', res.data)
+						// uni.setStorageSync('oilItem', res.data)
 						this.order = res.data
 						this.getOrderQrCode()
 					}
@@ -270,7 +270,12 @@
 			makePay() {
 				orderApi.getOrderPayInfo(this.id).then(res => {
 					if (res.code == 20000) {
+						// console.log('oilItem',uni.getStorageSync('oilItem'))
+						if(res.data.secondChannelCode === 'SQ' && res.data.sqSiteBelong === 'JKJY') {
+							res.data.listTag = '集卡加油'
+						}
 						uni.setStorageSync('orderMade', res.data)
+						uni.setStorageSync('oilItem', res.data)
 						uni.navigateTo({
 							url: '/BagStation/pages/makeOrder/orderPaying'
 						})

BagStation/pages/makeOrder/orderPaying.vue

@@ -286,12 +286,13 @@
 				this.findUreaAccount()
 			}else{
 				let oilItem = uni.getStorageSync('oilItem')
+				// console.log
 				this.order =  uni.getStorageSync('orderMade')
 				this.type = 'oil'
 				this.showtitles = oilItem.listTag 
 				if(option.payMethod == null){
 					this.payMethod =oilItem.payMethod
-					console.log(this.payMethod )
+					// console.log(this.payMethod )
 				}else {
 					this.payMethod =option.payMethod
 				}

BagStation/pages/stationDetail/stationDetail.vue

@@ -217,9 +217,11 @@
 			this.innerAudioContext?.stop()
 		},
 		onLoad(option) {
-			if(option.siteId) {
+			let siteId = uni.getStorageSync('siteId') || option.siteId
-				this.siteId = option.siteId
+			if(siteId) {
-				this.getSiteInfo(option.siteId) 
+				uni.setStorageSync('siteId',siteId)
+				this.siteId = siteId
+				this.getSiteInfo(siteId) 
 				return 
 			}
 			// console.log(option)

pages/tabbar/order/orderList/orderList.vue

@@ -138,7 +138,7 @@
 			this.getOrder('') 
 		},
 		onPullDownRefresh() {
-			console.log('这里是onPullDownRefresh')
+			// console.log('这里是onPullDownRefresh')
 			this.currentPage = 1 
 			this.list= []
 			if(this.TabHead == 1){
@@ -151,7 +151,7 @@
 			// }, 1000);
 		},
 		onReachBottom() {
-			console.log('这里是onReachBottom')
+			// console.log('这里是onReachBottom')
 			if(this.TabHead == 1){
 				// this.nextPageUrea()
 				if(this.status.loadOrderStatus !='nomore' ){
@@ -169,6 +169,9 @@
 			makePay(id) {
 				orderApi.getOrderPayInfo(id).then(res => {
 					if (res.code == 20000) {
+						if(res.data.secondChannelCode === 'SQ' && res.data.sqSiteBelong === 'JKJY') {
+							res.data.listTag = '集卡加油'
+						}
 						uni.setStorageSync('orderMade', res.data)
 						uni.setStorageSync('oilItem', res.data)
 						uni.navigateTo({
@@ -242,9 +245,9 @@
 			
 			 
 			tabSelectUrea(value,i) {
-				console.log(value,'1564155555666666666666666666')
+				// console.log(value,'1564155555666666666666666666')
 				this.list = []
-				console.log(this.list)
+				// console.log(this.list)
 				this.currentPage = 1
 				this.UreaTabCur = i
 				this.ativeUrea = value