更新

BagStation/pages/makeOrder/payResult.vue

@@ -20,14 +20,15 @@
 			<view class="qr-container  ">
 				<view class="qrimg">
 					<view class="qrimg" @tap="newQrString">
-						<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx"
+						<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
-							background="#fff" :foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval
+							:foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval
 							:usingComponents="usingComponents" showLoading />
 					</view>
 				</view>
 			</view>
 			<view class="text-center  text-sm  justify-center align-center flex">
-				<image src="../../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm"></image>
+				<image src="../../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;"
+					class="margin-right-sm"></image>
 				<text>壳牌</text>
 			</view>
 			<div class="times">
@@ -48,11 +49,12 @@
 			<view class="bg-gray text-center padding-sm margin-bottom-sm" v-if="status!='success'">
 				{{errMsg}}
 			</view>
-			<view class="padding">
+			<view class="padding" style="padding-bottom: 200px;">
 				<view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
 					<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
 						订单编号：
-						<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text class="cuIcon-copy padding-left-xs"></text></text>
+						<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
+								class="cuIcon-copy padding-left-xs"></text></text>
 
 					</view>
 				</view>
@@ -63,7 +65,8 @@
 				<view class="padding-tb-xs text-left">
 					油品油枪：
 					<text class="fr nowrap">
-						{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
+						{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}
+					</text>
 				</view>
 				<view class="padding-tb-xs  text-left">
 					加油升数：
@@ -92,16 +95,19 @@
 				</view>
 				<view class="padding-tb-xs text-left">
 					星油优惠：
-					<text class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
+					<text
+						class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
 				</view>
 				<view class="padding-tb-xs text-left">
 					优惠券：
-					<text class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text>
+					<text
+						class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text>
 				</view>
 
 				<view class="padding-tb-xs text-left">
 					合计：
-					<text class="text-red text-bold text-lg fr">{{order.realAmount>0?'￥'+order.realAmount:'xxx.x'}}</text>
+					<text
+						class="text-red text-bold text-lg fr">{{order.realAmount>0?'￥'+order.realAmount:'xxx.x'}}</text>
 				</view>
 				<view class="dashed-top margin-top-xs padding-top-sm">
 					<view class="padding-tb-xs text-left">
@@ -121,13 +127,15 @@
 			</view>
 		</view>
 		<view class=" fixed-bottom bg-white padding">
+			<button v-if="oilItems.listTag == '上汽联名卡' || oilItems.listTag == '集卡加油'"
+				class="cu-btn block lg bg-main-oil margin-bottom" @tap="refresh">刷新</button>
 			<button class="cu-btn block lg bg-main-oil" open-type="contact">联系客服</button>
 			<button class="cu-btn block lg margin-top" @tap="backToIndex">关闭</button>
 		</view>
-		<view class="margin-top padding placeholder-hidden bg-white">
+		<!-- 		<view class="margin-top padding placeholder-hidden bg-white">
 			<button class="cu-btn block lg bg-main-oil" open-type="contact">联系客服</button>
 			<button class="cu-btn block lg margin-top" @tap="backToIndex">关闭</button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -167,6 +175,59 @@
 				tyPayMethod: null
 			}
 		},
+		onLoad(option) {
+			let _that = this
+			let oilItem = uni.getStorageSync('oilItem')
+			this.oilItem = oilItem
+			this.showtitles = oilItem.listTag
+			if (this.timer) {
+				clearInterval(this.timer)
+			}
+			setInterval(() => {
+				this.getTime()
+			}, 1000) //设置定时器，时时间每隔一秒钟走一次（即每秒）
+			this.timeinterval = setInterval(() => {
+				console.log('1')
+				_that.getOrderQrCode()
+			}, 1000 * 60 * 3);
+			// console.log(option)
+			this.getOrderQrCode()
+			if (option.payMethod == '1' && option.status == 'success') {
+				if (option.status == 'success') {
+					this.textstatus = '支付成功'
+					this.status = option.status
+					let oilItems = this.oilItem
+					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 == '壳牌') {
+						_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3'
+					} else if (oilItems.listTag == '上汽联名卡') {
+						_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
+					} else if (oilItems.listTag == '集卡加油') {
+						_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqijika.mp3'
+					}
+					this.ContextAudio(this.audioUrl)
+				} else {
+					this.textstatus = '支付失败'
+					this.status = option.status
+				}
+				return
+			}
+			if (option.status == 'fail') {
+				this.textstatus = '支付失败'
+				this.status = option.status
+				this.errMsg = option.errMsg
+				return
+			}
+			if (this.order.payMethod && this.order.payMethod == 2) {
+				this.tyPayMethod = 2
+				this.queryOrderStatusSq()
+				return
+			}
+		},
 		methods: {
 			// 创建音频
 			ContextAudio(url) {
@@ -191,21 +252,15 @@
 				this.getOrderQrCode()
 			},
 			getOrderQrCode() {
-				console.log('这里是获取验证码')
-				console.log(this.order.orderSerialNumber)
 				oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then((res) => {
-					console.log(res)
 					if (res.code == 40000) {
-						console.log('34')
 						this.showQr = false
 						this.showtext = true
 					} else if (res.code == 20000) {
-						console.log('12')
 						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')
 					}
 				})
 			},
@@ -213,6 +268,75 @@
 			hideModal() {
 				this.showThirdResult = false
 			},
+
+			onShowThirdResult() {
+				this.showThirdResult = true
+			},
+			refresh() {
+				toilApi.getOrderInfoByOrderSerialNumber(this.order.orderSerialNumber).then(res => {
+					if (res.code === 20000) {
+						if (res.data.otherOrderStatus == 0) {
+							this.textstatus = '支付中'
+						} else if (res.data.otherOrderStatus == 1) {
+							this.textstatus = '支付成功'
+							this.status = "success"
+							if (this.oilItem.listTag == '万金油') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
+							} else if (this.oilItem.listTag == '星油') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3'
+							} else if (this.oilItem.listTag == '壳牌') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3'
+							} else if (this.oilItem.listTag == '上汽联名卡') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
+							} else if (oilItems.listTag == '集卡加油') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqijika.mp3'
+							}
+							this.ContextAudio(this.audioUrl)
+						} else if (res.data.otherOrderStatus == -1) {
+							this.textstatus = '三方支付失败，已退款'
+						}
+					}
+				})
+			},
+			// 上汽联名卡支付状态
+			queryOrderStatusSq() {
+				toilApi.queryOrderStatusSq(this.order.orderSerialNumber).then(res => {
+					if (res.code == 20000) {
+						this.tySqRes = res.data
+						this.tyIntervalCount++
+						if (res.data.otherOrderStatus == 0) {
+							this.textstatus = '支付中'
+						} else if (res.data.otherOrderStatus == 1) {
+							this.textstatus = '支付成功'
+							this.status = "success"
+							if (this.oilItem.listTag == '万金油') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
+							} else if (this.oilItem.listTag == '星油') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3'
+							} else if (this.oilItem.listTag == '壳牌') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3'
+							} else if (this.oilItem.listTag == '上汽联名卡') {
+								this.audioUrl =
+									'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
+							}
+							this.ContextAudio(this.audioUrl)
+						} else if (res.data.otherOrderStatus == -1) {
+							this.textstatus = '三方支付失败，已退款'
+						}
+						// otherOrderStatus //三方支付状态 0：待通知 1：通知成功 -1：通知失败
+						// console.log('联名卡支付结果', res.data)
+						this.getThirdStatus()
+					}
+				})
+			},
 			getThirdStatus() {
 				if (this.tyIntervalCount > 5 || this.tySqRes.otherOrderStatus != 0) {
 					this.onShowThirdResult()
@@ -222,49 +346,6 @@
 					}, 500)
 				}
 			},
-			onShowThirdResult() {
-				this.showThirdResult = true
-			},
-			// 上汽联名卡支付状态
-			queryOrderStatusSq() {
-				toilApi.queryOrderStatusSq(this.order.orderSerialNumber).then(res => {
-					console.log(res)
-					if (res.code == 20000) {
-						this.tySqRes = res.data
-						this.tyIntervalCount++
-						if (res.code == 20000) {
-							console.log('进入')
-							this.tySqRes = res.data
-							this.tyIntervalCount++
-							if(res.data.otherOrderStatus == 0){
-								this.textstatus = '支付中'
-							}else if(res.data.otherOrderStatus == 1){
-								this.textstatus = '支付成功'
-								this.status = "success"
-								if(this.oilItem.listTag == '万金油'){
-									this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
-								}else if(this.oilItem.listTag == '星油'){
-									this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3'
-								}else if(this.oilItem.listTag == '壳牌'){
-									this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3'
-								}else if(this.oilItem.listTag == '上汽联名卡'){
-									this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
-								}
-								this.ContextAudio(this.audioUrl)
-							}else if(res.data.otherOrderStatus == -1){
-								this.textstatus = '三方支付失败，已退款'
-							}
-							// otherOrderStatus //三方支付状态 0：待通知 1：通知成功 -1：通知失败
-							// console.log('联名卡支付结果', res.data)
-							this.getThirdStatus()
-						}
-						// otherOrderStatus //三方支付状态 0：待通知 1：通知成功 -1：通知失败
-						// console.log('联名卡支付结果', res.data)
-						this.getThirdStatus()
-					}
-				})
-			},
-
 			// 三方支付结果弹窗结束
 			backToIndex() {
 				uni.switchTab({
@@ -284,67 +365,9 @@
 				})
 			}
 		},
-		onLoad(option) {
+
-			let  _that = this
-			let oilItem = uni.getStorageSync('oilItem')
-			this.oilItem = oilItem
-			this.showtitles = oilItem.listTag 
-			if (this.timer) {
-				clearInterval(this.timer)
-			}
-			setInterval(() => {
-				this.getTime()
-			},1000)  //设置定时器，时时间每隔一秒钟走一次（即每秒）
-			this.timeinterval = setInterval(() => {
-				console.log('1')
-				_that.getOrderQrCode()
-			}, 1000 * 60 * 3);
-			// this.status = option.status
-			console.log('这里是op')
-			console.log(option)
-			this.getOrderQrCode()
-			if(option.payMethod == '1' && option.status == 'success'){
-				if(option.status == 'success') {
-					console.log('这里是支付成功')
-					this.textstatus = '支付成功'
-					this.status = option.status
-					console.log(this.oilItem)
-					let oilItems = this.oilItem
-					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 == '壳牌'){
-						_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3'
-					}else if(oilItems.listTag == '上汽联名卡'){
-						_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
-					}
-					this.ContextAudio(this.audioUrl)
-				}else{
-					console.log('这里是支付失败')
-					this.textstatus = '支付失败'
-					this.status = option.status
-				}
-				return
-			}
-			if(option.status == 'fail'){
-				console.log('fail')
-				this.textstatus = '支付失败'
-				this.status = option.status
-				this.errMsg = option.errMsg
-				return
-			} 
-			if (this.order.payMethod && this.order.payMethod == 2) {
-				console.log('这里是则一')
-				this.tyPayMethod = 2
-				this.queryOrderStatusSq()
-				return
-			}
-		},
 		filters: {
 			moneyFormath(value) {
-				console.log(value) 
 				if (value != 'xxx.x') {
 					let number = value.toFixed(2)
 					return number
@@ -379,8 +402,7 @@
 					}
 				}
 			},
-		}
+		},
-		,
 		onHide() {
 			console.log('这里是hiden')
 			this.innerAudioContext.stop()
@@ -396,9 +418,11 @@
 	.move-tops {
 		transform: translateY(-17px);
 	}
+
 	.bg-red {
 		background-color: #FF6700;
 	}
+
 	.text-centers {
 		text-align: center;
 		width: 90%;
@@ -406,6 +430,7 @@
 		border-radius: 7px;
 		overflow: hidden;
 	}
+
 	.times {
 		margin-left: 250upx;
 		font-size: 60upx;

api/oil-site.js

@@ -167,4 +167,5 @@ export default {
 			}
 		})
 	},
+
 }

api/toil.js

@@ -17,6 +17,11 @@ export default {
 			method: 'get'
 		})
 	},
-
+	getOrderInfoByOrderSerialNumber(orderSerialNumber) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/getOrderInfoByOrderSerialNumber/${orderSerialNumber}`,
+			method: 'get',
+		})
+	}
 
 }