bug

pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue

@@ -38,7 +38,7 @@
 		</view>
 		<view class="d-bs">
 			<view class="title_h">充值面额</view>
-			<view class="title_lan">充值记录</view>
+			<!-- <view class="title_lan">充值记录</view> -->
 		</view>
 		<view class="wrap-box">
 			<view class="w-box" v-for="(item,index) in numList " :key="index" @click="getindex(index,item)">
@@ -279,9 +279,9 @@
 					method: 'post',
 					data: this.order
 				}).then((res) => {
-					// uni.navigateTo({
+					uni.navigateTo({
-					// 	url: '/pagesHome/PaymentResults/PaymentResults'
+						url: '/pagesHome/PaymentResults/PaymentResults?type=1&orderNo=' + res.data.orderNo
-					// })
+					})
 				})
 
 			},

pos-uni/pagesHome/PaymentResults/PaymentResults.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="container">
+		<view class="container" v-if="oilOrder">
 			<headers :titles="titles"><u-icon name="arrow-left" color="#fff" size="22"></u-icon></headers>
 			<view class="top_">
 				<image src="../../static/imgs/zfcg.png" mode=""></image>
@@ -35,6 +35,41 @@
 				<view class="h-size" v-if="oilOrder.payType=='APPLET_CODE'">小程序码支付</view>
 			</view>
 		</view>
+		<view class="container" v-if="balanceOrder">
+			<headers :titles="titles"><u-icon name="arrow-left" color="#fff" size="22"></u-icon></headers>
+			<view class="top_">
+				<image src="../../static/imgs/zfcg.png" mode=""></image>
+			</view>
+			<view class="title_">支付成功</view>
+			<!-- <view class="top_" v-if="oilOrder.orderStatus!='paid'">
+				<image src="../../static/imgs/zfsb.png" mode=""></image>
+			</view>
+			<view class="title_" v-if="oilOrder.orderStatus!='paid'">支付失败</view> -->
+			<view class="b-bs">
+				<view class="h-size">应收金额</view>
+				<view class="red-size">￥{{balanceOrder.orderAmount}}</view>
+			</view>
+			<view class="b-bs">
+				<view class="h-size">优惠金额</view>
+				<view class="red-size">￥{{balanceOrder.discountAmount}}</view>
+			</view>
+			<view class="b-bs">
+				<view class="h-size">实收金额</view>
+				<view class="red-size">￥{{balanceOrder.payAmount}}</view>
+			</view>
+			<view class="b-bs">
+				<view class="h-size">储值卡消费金额</view>
+				<view class="red-size">￥{{balanceOrder.balanceAmount}}</view>
+			</view>
+			<view class="b-bs">
+				<view class="h-size">支付方式</view>
+				<view class="h-size" v-if="balanceOrder.payType=='ALIPAY'">支付宝支付</view>
+				<view class="h-size" v-if="balanceOrder.payType=='WECHAT'">微信支付</view>
+				<view class="h-size" v-if="balanceOrder.payType=='UNIONPAY'">银联二维码支付</view>
+				<view class="h-size" v-if="balanceOrder.payType=='CASH'">现金支付</view>
+				<view class="h-size" v-if="balanceOrder.payType=='APPLET_CODE'">小程序码支付</view>
+			</view>
+		</view>
 		<view class="p-bottom">
 			<view class="anniu" @click="goback()">
 				返回
@@ -51,17 +86,25 @@
 		data() {
 			return {
 				titles: "支付结果",
-				orderNo:"",
+				orderNo: "",
-				oilOrder:{},
+				oilOrder: {},
+				balanceOrder: {},
 			}
 		},
 		onLoad(e) {
-			this.orderNo = e.orderNo
+			if (e.type && e.type == 1) {
+				this.orderNo = e.orderNo
+				this.getBalanceOrder()
+			} else {
+				this.orderNo = e.orderNo
+				this.getOilOrder()
+			}
+
 		},
 		onShow() {
 			// this.actList = ["1", "1", "1", "1", "1", ]
 			// this.status = "nomore" 底部刷新结束
-			this.getOilOrder()
+
 		},
 		onPullDownRefresh() {
 			console.log("刷新");
@@ -78,18 +121,31 @@
 		},
 		methods: {
 			// 根据订单号查询订单信息
-			getOilOrder(){
+			getOilOrder() {
 				request({
 					url: '/business/oilOrder/orderNo',
 					method: 'post',
-					data:{orderNo:this.orderNo}
+					data: {
+						orderNo: this.orderNo
+					}
 				}).then((res) => {
 					this.oilOrder = res.data
 				})
 			},
+			getBalanceOrder() {
+				request({
+					url: 'business/marketingActivity/activeExchange/cardValueOrders/getOneByOrderNo',
+					method: 'post',
+					data: {
+						orderNo: this.orderNo
+					}
+				}).then((res) => {
+					this.balanceOrder = res.data
+				})
+			},
 			goback() {
 				uni.navigateTo({
-					url:"/pages/index/index"
+					url: "/pages/index/index"
 				})
 			}
 		}